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

(Portage version: 2.1.3_rc6)

5 files changed, 93 insertions, 2 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/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
+}
+