Changed check for yaepg patched vdr. Added uint64 and vdr-1.5.3 patch.

Package-Manager: portage-2.1.3_rc6

6 files changed, 116 insertions, 10 deletions

diff --git a/media-plugins/vdr-yaepg/ChangeLog b/media-plugins/vdr-yaepg/ChangeLog
index 73cab1394aef..461858b016fc 100644
--- a/media-plugins/vdr-yaepg/ChangeLog
+++ b/media-plugins/vdr-yaepg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-yaepg
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-yaepg/ChangeLog,v 1.7 2006/08/18 10:25:03 zzam Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-yaepg/ChangeLog,v 1.8 2007/07/02 08:41:06 zzam Exp $
+
+*vdr-yaepg-0.0.2.1-r1 (02 Jul 2007)
+
+  02 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-yaepg-0.0.2.1-uint64.diff,
+  +files/vdr-yaepg-0.0.2.1-vdr-1.5.3.diff, +vdr-yaepg-0.0.2.1-r1.ebuild:
+  Changed check for yaepg patched vdr. Added uint64 and vdr-1.5.3 patch.
 
   18 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> metadata.xml:
   Changed herd to media-tv.
diff --git a/media-plugins/vdr-yaepg/Manifest b/media-plugins/vdr-yaepg/Manifest
index cfa3c89e786b..dee32b4fdab7 100644
--- a/media-plugins/vdr-yaepg/Manifest
+++ b/media-plugins/vdr-yaepg/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX vdr-yaepg-0.0.2.1-uint64.diff 538 RMD160 38d879c14403623c8edcb59602443faed319e2da SHA1 afa24eace946d0427e7e4ecd81784e7d8fe98592 SHA256 489102ec36310330a2b5759dc909a46beb2c2870ca8634b1a93629cf4dfe8a1f
+MD5 677fef0fdfab7e69f2aaea5b0a412dd5 files/vdr-yaepg-0.0.2.1-uint64.diff 538
+RMD160 38d879c14403623c8edcb59602443faed319e2da files/vdr-yaepg-0.0.2.1-uint64.diff 538
+SHA256 489102ec36310330a2b5759dc909a46beb2c2870ca8634b1a93629cf4dfe8a1f files/vdr-yaepg-0.0.2.1-uint64.diff 538
+AUX vdr-yaepg-0.0.2.1-vdr-1.5.3.diff 437 RMD160 e83370ff2cea485d7cf70258fe64c44d37069165 SHA1 dcce016d7bfc209f5dfe5928bf95a62839c31944 SHA256 84d61724fb4acb58c3beaf68dd5cc25de4efb83c07b562ebb37ab89830acaac7
+MD5 6e27ee42fd04f4e3d402ce426ac9ae34 files/vdr-yaepg-0.0.2.1-vdr-1.5.3.diff 437
+RMD160 e83370ff2cea485d7cf70258fe64c44d37069165 files/vdr-yaepg-0.0.2.1-vdr-1.5.3.diff 437
+SHA256 84d61724fb4acb58c3beaf68dd5cc25de4efb83c07b562ebb37ab89830acaac7 files/vdr-yaepg-0.0.2.1-vdr-1.5.3.diff 437
 DIST yaepg-0.0.2.1-rev2.patch 1852 RMD160 9b871f2041e7c8eaeff06adc1080df2a66ea8429 SHA1 a01ec62d9278c4b1688f10c91cde648960150ee2 SHA256 568406b4b59f056750ea06dbd808b559433474abc863edb735a208d365141cd2
 DIST yaepg-0.0.2.1-rev2.tar.bz2 27384 RMD160 1a6764ac4c729d42054184b0d77ce7d75247c794 SHA1 6eecedc48f6580b2248fe954082c0a1750951bf5 SHA256 f3d60fab7ba8c508ceb4e04e4878569d3542ff9b8d0ae88c44c35aa4477df037
+EBUILD vdr-yaepg-0.0.2.1-r1.ebuild 1169 RMD160 979db05d785345b157043312ed035a79d00327ea SHA1 3eb735aa00db566871ce18cf2c1b03034e10d425 SHA256 b9e10163862ca8ec92dfea818185079fd94929bedc25ff44dffe87972c5e545a
+MD5 05af03ef31be3311f4a7dedd3df5135f vdr-yaepg-0.0.2.1-r1.ebuild 1169
+RMD160 979db05d785345b157043312ed035a79d00327ea vdr-yaepg-0.0.2.1-r1.ebuild 1169
+SHA256 b9e10163862ca8ec92dfea818185079fd94929bedc25ff44dffe87972c5e545a vdr-yaepg-0.0.2.1-r1.ebuild 1169
 EBUILD vdr-yaepg-0.0.2.1.ebuild 1024 RMD160 3b3d3d9d7483639eccacd7beaa6b80786dad4c64 SHA1 4f2a66574814db1def4028a9b3d5fab33e4dffc3 SHA256 e87fa26481463f168e5d1d8218d9af1cf16e960489c84c9da0261d6848b9cc23
 MD5 e38060d0b082352d12698caaea981650 vdr-yaepg-0.0.2.1.ebuild 1024
 RMD160 3b3d3d9d7483639eccacd7beaa6b80786dad4c64 vdr-yaepg-0.0.2.1.ebuild 1024
 SHA256 e87fa26481463f168e5d1d8218d9af1cf16e960489c84c9da0261d6848b9cc23 vdr-yaepg-0.0.2.1.ebuild 1024
-MISC ChangeLog 1006 RMD160 5d7f7f7db39a495f49044544579d3aa032f5ca10 SHA1 2b7ccf114ed80b4a9453ca3a93b2fc7b5675524b SHA256 0b0f86d1ca2897adf956b618a2c237ca0232744eebebe78250902c6c257c4bac
-MD5 c2451ead47d4fce270bfc37dec327257 ChangeLog 1006
-RMD160 5d7f7f7db39a495f49044544579d3aa032f5ca10 ChangeLog 1006
-SHA256 0b0f86d1ca2897adf956b618a2c237ca0232744eebebe78250902c6c257c4bac ChangeLog 1006
+MISC ChangeLog 1283 RMD160 d5dedd1e8789d4f01e07f8d0a3da4ef8f8d343df SHA1 4e0637a5c8207a5b7450946659638b46de63edcb SHA256 6f7d37d88604126d8ec2daecf2a6271bd3adcfbb7d9666229f2ec11b9f709214
+MD5 25a357aa1154ff0e8c2d40e8eeb61e20 ChangeLog 1283
+RMD160 d5dedd1e8789d4f01e07f8d0a3da4ef8f8d343df ChangeLog 1283
+SHA256 6f7d37d88604126d8ec2daecf2a6271bd3adcfbb7d9666229f2ec11b9f709214 ChangeLog 1283
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -18,10 +30,13 @@ SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 metadata
 MD5 5791deb5ff9c71986d95a769e0a3dfce files/digest-vdr-yaepg-0.0.2.1 503
 RMD160 e83247f8168706d268c9843b86372d50cedeecbb files/digest-vdr-yaepg-0.0.2.1 503
 SHA256 323ac33af90024ec0934d616dfb0d9465c78d1c59db9b57961886542a86a216a files/digest-vdr-yaepg-0.0.2.1 503
+MD5 5791deb5ff9c71986d95a769e0a3dfce files/digest-vdr-yaepg-0.0.2.1-r1 503
+RMD160 e83247f8168706d268c9843b86372d50cedeecbb files/digest-vdr-yaepg-0.0.2.1-r1 503
+SHA256 323ac33af90024ec0934d616dfb0d9465c78d1c59db9b57961886542a86a216a files/digest-vdr-yaepg-0.0.2.1-r1 503
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFE5ZWFt2vP6XvVdOcRAsSaAKCEnog6+hCHI3DYQLYBbLvTGvGIwgCeOYbo
-PHnjswHXy9ZdZAkiLfQ3TeM=
-=d2Bm
+iD8DBQFGiLopt2vP6XvVdOcRApdUAKDmJeYaoF5BUMNHpFHtiXCNiPJk5QCfX9Ni
+qWg9SqgN614OpoJP6cCDD+o=
+=UJFV
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-yaepg/files/digest-vdr-yaepg-0.0.2.1-r1 b/media-plugins/vdr-yaepg/files/digest-vdr-yaepg-0.0.2.1-r1
new file mode 100644
index 000000000000..9ab43b561e03
--- /dev/null
+++ b/media-plugins/vdr-yaepg/files/digest-vdr-yaepg-0.0.2.1-r1
@@ -0,0 +1,6 @@
+MD5 c9deed752074aa6c266639008f39bcd7 yaepg-0.0.2.1-rev2.patch 1852
+RMD160 9b871f2041e7c8eaeff06adc1080df2a66ea8429 yaepg-0.0.2.1-rev2.patch 1852
+SHA256 568406b4b59f056750ea06dbd808b559433474abc863edb735a208d365141cd2 yaepg-0.0.2.1-rev2.patch 1852
+MD5 3dd2cc1e3856480dbecd3fc20fff9b23 yaepg-0.0.2.1-rev2.tar.bz2 27384
+RMD160 1a6764ac4c729d42054184b0d77ce7d75247c794 yaepg-0.0.2.1-rev2.tar.bz2 27384
+SHA256 f3d60fab7ba8c508ceb4e04e4878569d3542ff9b8d0ae88c44c35aa4477df037 yaepg-0.0.2.1-rev2.tar.bz2 27384
diff --git a/media-plugins/vdr-yaepg/files/vdr-yaepg-0.0.2.1-uint64.diff b/media-plugins/vdr-yaepg/files/vdr-yaepg-0.0.2.1-uint64.diff
new file mode 100644
index 000000000000..9f6c4a776b98
--- /dev/null
+++ b/media-plugins/vdr-yaepg/files/vdr-yaepg-0.0.2.1-uint64.diff
@@ -0,0 +1,21 @@
+diff -ru yaepg-0.0.2.1-rev2-orig/yaepg.c yaepg-0.0.2.1-rev2/yaepg.c
+--- yaepg-0.0.2.1-rev2-orig/yaepg.c	2007-07-02 10:37:25.934194467 +0200
++++ yaepg-0.0.2.1-rev2/yaepg.c	2007-07-02 10:37:46.436137435 +0200
+@@ -1209,7 +1209,7 @@
+ 	cDateBox		*datebox;
+ 
+ 	cRecDlgBox		*recDlgBox;
+-	uint64			msgboxStart;
++	uint64_t		msgboxStart;
+ 	cMessageBox		*msgbox;
+ 
+ 	/*
+@@ -1235,7 +1235,7 @@
+ 	 * Direct Channel Change
+ 	 */
+ 	int			currChan;
+-	uint64			lastInput;
++	uint64_t		lastInput;
+ 
+ 	/*
+ 	 * The last possible starting channel for the grid.
diff --git a/media-plugins/vdr-yaepg/files/vdr-yaepg-0.0.2.1-vdr-1.5.3.diff b/media-plugins/vdr-yaepg/files/vdr-yaepg-0.0.2.1-vdr-1.5.3.diff
new file mode 100644
index 000000000000..52d56a3ea1e5
--- /dev/null
+++ b/media-plugins/vdr-yaepg/files/vdr-yaepg-0.0.2.1-vdr-1.5.3.diff
@@ -0,0 +1,12 @@
+diff -ru yaepg-0.0.2.1/yaepg.c yaepg-0.0.2.2/yaepg.c
+--- yaepg-0.0.2.1/yaepg.c	2007-06-11 18:26:37.000000000 -0700
++++ yaepg-0.0.2.2/yaepg.c	2007-06-11 15:56:31.000000000 -0700
+@@ -17,6 +17,7 @@
+ static const tColor highlight		= (tColor) 0xFF505050;
+ static const tColor lightgrey		= (tColor) 0xFFAAAAAA;
+ 
++#define fontYaepg			fontSml
+ #define fontChanBox			fontYaepg
+ #define fontTimeBox			fontYaepg
+ #define fontEventBox			fontYaepg
+
diff --git a/media-plugins/vdr-yaepg/vdr-yaepg-0.0.2.1-r1.ebuild b/media-plugins/vdr-yaepg/vdr-yaepg-0.0.2.1-r1.ebuild
new file mode 100644
index 000000000000..53bfe30a147e
--- /dev/null
+++ b/media-plugins/vdr-yaepg/vdr-yaepg-0.0.2.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-yaepg/vdr-yaepg-0.0.2.1-r1.ebuild,v 1.1 2007/07/02 08:41:06 zzam Exp $
+
+inherit vdr-plugin eutils
+
+
+MY_P=${VDRPLUGIN}-${PV}-rev2
+
+DESCRIPTION="Video Disk Recorder ${VDRPLUGIN} Plugin"
+HOMEPAGE="http://www.hoochvdr.info/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+		mirror://gentoo/${MY_P}.patch"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.2.6"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	vdr-plugin_pkg_setup
+
+	einfo "Checking driver"
+	grep -q OSD_OpenRaw /usr/include/linux/dvb/*.h
+	eend $? "You need to update your DVB-Driver!" || die "Too old DVB-Driver installed!"
+
+	einfo "Checking for patched vdr"
+	grep -q "tArea vidWin" /usr/include/vdr/osd.h
+	eend $? "You need to emerge vdr with use-flag yaepg set!" || die "Unpatched vdr detected!"
+}
+
+src_unpack() {
+	vdr-plugin_src_unpack
+	epatch "${DISTDIR}/${VDRPLUGIN}-${PV}-rev2.patch"
+	epatch "${FILESDIR}/${P}-uint64.diff"
+
+	if has_version ">=media-video/vdr-1.5.3"; then
+		epatch "${FILESDIR}/${P}-vdr-1.5.3.diff"
+	fi
+}
+