Make it compile with vdr-1.5

Package-Manager: portage-2.1.3_rc5

5 files changed, 108 insertions, 8 deletions

diff --git a/media-plugins/vdr-osdpip/ChangeLog b/media-plugins/vdr-osdpip/ChangeLog
index d461191332f4..5e6c7fc5e585 100644
--- a/media-plugins/vdr-osdpip/ChangeLog
+++ b/media-plugins/vdr-osdpip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-osdpip
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/ChangeLog,v 1.2 2007/06/19 12:02:40 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/ChangeLog,v 1.3 2007/06/24 12:24:06 zzam Exp $
+
+*vdr-osdpip-0.0.8-r2 (24 Jun 2007)
+
+  24 Jun 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-osdpip-0.0.8-vdr-1.5.0.diff, +vdr-osdpip-0.0.8-r2.ebuild:
+  Make it compile with vdr-1.5
 
   19 Jun 2007; Matthias Schwarzott <zzam@gentoo.org>
   vdr-osdpip-0.0.8-r1.ebuild:
diff --git a/media-plugins/vdr-osdpip/Manifest b/media-plugins/vdr-osdpip/Manifest
index 710a06db7221..7d69ceabe5ba 100644
--- a/media-plugins/vdr-osdpip/Manifest
+++ b/media-plugins/vdr-osdpip/Manifest
@@ -9,15 +9,23 @@ AUX vdr-osdpip-0.0.8-includes.diff 349 RMD160 edfc99be9fb3da10225c5419ea988279f4
 MD5 2e65cf6503f1f4e05ff9408fdd8b2bec files/vdr-osdpip-0.0.8-includes.diff 349
 RMD160 edfc99be9fb3da10225c5419ea988279f40c5b1c files/vdr-osdpip-0.0.8-includes.diff 349
 SHA256 befa1ebcedeaff573826e83605666eb5d67270417128402bd87761866b02e0d3 files/vdr-osdpip-0.0.8-includes.diff 349
+AUX vdr-osdpip-0.0.8-vdr-1.5.0.diff 1503 RMD160 8d4ecdeb35a5b19ef2425682b8f34d1746156ffb SHA1 dc8fad3f654a1e0e0aed49d7c2febacacc3e762f SHA256 4e8772de9f23ee806a96ff84d3ef503134ae9e52f95031665e72ed832211b741
+MD5 15c8309c5d338a1f9f8077700b472ed1 files/vdr-osdpip-0.0.8-vdr-1.5.0.diff 1503
+RMD160 8d4ecdeb35a5b19ef2425682b8f34d1746156ffb files/vdr-osdpip-0.0.8-vdr-1.5.0.diff 1503
+SHA256 4e8772de9f23ee806a96ff84d3ef503134ae9e52f95031665e72ed832211b741 files/vdr-osdpip-0.0.8-vdr-1.5.0.diff 1503
 DIST vdr-osdpip-0.0.8.tgz 25918 RMD160 58752d70a5ca01e3cbfec0f533162f9b5cc0abbf SHA1 e733360390da351d52c53138a975db2bc8994858 SHA256 4901aad58b75662dcf58388f8636c96ea7a31efd195f1dce6af21c6653ee9a67
 EBUILD vdr-osdpip-0.0.8-r1.ebuild 816 RMD160 458387b18c64d87d3dd85ad93874fe45ae01b6a5 SHA1 25aa76c065a83cf59c18edc1ba2e0605c190351d SHA256 72725d1ba8c1bb905e9e7ee0d08a03b498b0ede20e7144c00a2e8986eb1e6c73
 MD5 69a9b7908a814170e5282a2baf361829 vdr-osdpip-0.0.8-r1.ebuild 816
 RMD160 458387b18c64d87d3dd85ad93874fe45ae01b6a5 vdr-osdpip-0.0.8-r1.ebuild 816
 SHA256 72725d1ba8c1bb905e9e7ee0d08a03b498b0ede20e7144c00a2e8986eb1e6c73 vdr-osdpip-0.0.8-r1.ebuild 816
-MISC ChangeLog 609 RMD160 11404c268d585fbda52d0188f06bcd22e0036507 SHA1 26cf94f79e444bf4774727a9e802817f99e7c3c6 SHA256 fa7702c15610ac13da04fe0648b3eb40647f670ac3ccd5d472335bfc2de552c3
-MD5 edfc9f614c5afe7420039d1b9efd2a20 ChangeLog 609
-RMD160 11404c268d585fbda52d0188f06bcd22e0036507 ChangeLog 609
-SHA256 fa7702c15610ac13da04fe0648b3eb40647f670ac3ccd5d472335bfc2de552c3 ChangeLog 609
+EBUILD vdr-osdpip-0.0.8-r2.ebuild 851 RMD160 6a62497a039af20d8a37ae0d55caec491aab5074 SHA1 c00c240d9cc9422c84ccde118464e94d2df7ab50 SHA256 dd78bde423990c3c734863e1c25a18d481b1d435420ac5e46d3ffeedffd3c5ab
+MD5 967511f765d4ec545c80e62c1116b8f5 vdr-osdpip-0.0.8-r2.ebuild 851
+RMD160 6a62497a039af20d8a37ae0d55caec491aab5074 vdr-osdpip-0.0.8-r2.ebuild 851
+SHA256 dd78bde423990c3c734863e1c25a18d481b1d435420ac5e46d3ffeedffd3c5ab vdr-osdpip-0.0.8-r2.ebuild 851
+MISC ChangeLog 801 RMD160 2b4c58ddd7d9b3413726975ea6b39374a1dff622 SHA1 d43175ae03bfb0a5b72f910d01da9f75afec3715 SHA256 0a349b93552b740fc9d355704655c629a5c0cfdc443a5057156512c767fe33c4
+MD5 c81406c0280309cbf86d82771f97f6e0 ChangeLog 801
+RMD160 2b4c58ddd7d9b3413726975ea6b39374a1dff622 ChangeLog 801
+SHA256 0a349b93552b740fc9d355704655c629a5c0cfdc443a5057156512c767fe33c4 ChangeLog 801
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -25,10 +33,13 @@ SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 metadata
 MD5 f64a2c4bcb5a5acd9bedde4c5f51336b files/digest-vdr-osdpip-0.0.8-r1 238
 RMD160 baa97e6354363554b7813b9d129ff82c7f0419ae files/digest-vdr-osdpip-0.0.8-r1 238
 SHA256 b4492025f46e855865503fea160ddd92604c1c3ba5366da50ba940b7a095e359 files/digest-vdr-osdpip-0.0.8-r1 238
+MD5 f64a2c4bcb5a5acd9bedde4c5f51336b files/digest-vdr-osdpip-0.0.8-r2 238
+RMD160 baa97e6354363554b7813b9d129ff82c7f0419ae files/digest-vdr-osdpip-0.0.8-r2 238
+SHA256 b4492025f46e855865503fea160ddd92604c1c3ba5366da50ba940b7a095e359 files/digest-vdr-osdpip-0.0.8-r2 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGd8X7t2vP6XvVdOcRAmPcAJ9V4+npkBuXgk9aqh+T8H7xuUERGACfXEZ8
-Ph5z0wiWODwzZHB3t+iBbjc=
-=zUf2
+iD8DBQFGfmJtt2vP6XvVdOcRAnc3AJ9oyqTraoUHk3ip6pOnxNr1APH9UACfeAAj
+B7PwWuK0RA5TNgbA8QNT4GE=
+=W3I3
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-osdpip/files/digest-vdr-osdpip-0.0.8-r2 b/media-plugins/vdr-osdpip/files/digest-vdr-osdpip-0.0.8-r2
new file mode 100644
index 000000000000..11b69ddea2bb
--- /dev/null
+++ b/media-plugins/vdr-osdpip/files/digest-vdr-osdpip-0.0.8-r2
@@ -0,0 +1,3 @@
+MD5 d3baa1b58be91aa03a93e0030f2012da vdr-osdpip-0.0.8.tgz 25918
+RMD160 58752d70a5ca01e3cbfec0f533162f9b5cc0abbf vdr-osdpip-0.0.8.tgz 25918
+SHA256 4901aad58b75662dcf58388f8636c96ea7a31efd195f1dce6af21c6653ee9a67 vdr-osdpip-0.0.8.tgz 25918
diff --git a/media-plugins/vdr-osdpip/files/vdr-osdpip-0.0.8-vdr-1.5.0.diff b/media-plugins/vdr-osdpip/files/vdr-osdpip-0.0.8-vdr-1.5.0.diff
new file mode 100644
index 000000000000..29115870d5f7
--- /dev/null
+++ b/media-plugins/vdr-osdpip/files/vdr-osdpip-0.0.8-vdr-1.5.0.diff
@@ -0,0 +1,47 @@
+Index: osdpip-0.0.8/osd.c
+===================================================================
+--- osdpip-0.0.8.orig/osd.c
++++ osdpip-0.0.8/osd.c
+@@ -71,7 +71,11 @@ void cOsdPipObject::SwapChannels(void)
+ 	if (chan) {
+ 		Stop();
+ 		Channels.SwitchTo(m_Channel->Number());
++#if VDRVERSNUM >= 10500
++		cDevice *dev = cDevice::GetDevice(chan, 1, false);
++#else
+ 		cDevice *dev = cDevice::GetDevice(chan, 1);
++#endif
+ 		if (dev) {
+ 			DELETENULL(m_Receiver);
+ 			m_Channel = chan;
+Index: osdpip-0.0.8/osdpip.c
+===================================================================
+--- osdpip-0.0.8.orig/osdpip.c
++++ osdpip-0.0.8/osdpip.c
+@@ -89,7 +89,11 @@ cOsdObject *cPluginOsdpip::MainMenuActio
+ 	chan = cDevice::CurrentChannel() != 0 
+ 		? Channels.GetByNumber(cDevice::CurrentChannel()) : NULL;
+ 	if (chan != NULL) {
++#if VDRVERSNUM >= 10500
++		dev = cDevice::GetDevice(chan, 1, false);
++#else
+ 		dev = cDevice::GetDevice(chan, 1); 
++#endif
+ 		if (dev)
+ 			return new cOsdPipObject(dev, chan);
+ 	}
+Index: osdpip-0.0.8/receiver.c
+===================================================================
+--- osdpip-0.0.8.orig/receiver.c
++++ osdpip-0.0.8/receiver.c
+@@ -14,7 +14,9 @@
+ 
+ cOsdPipReceiver::cOsdPipReceiver(const cChannel *Channel,
+ 	cRingBufferFrame *ESBuffer):
+-#if VDRVERSNUM >= 10319
++#if VDRVERSNUM >= 10500
++	cReceiver(Channel->GetChannelID(), 0, Channel->Vpid())
++#elif VDRVERSNUM >= 10319
+ 	cReceiver(Channel->Ca(), 0, Channel->Vpid())
+ #else
+ 	cReceiver(Channel->Ca(), 0, 1, Channel->Vpid())
diff --git a/media-plugins/vdr-osdpip/vdr-osdpip-0.0.8-r2.ebuild b/media-plugins/vdr-osdpip/vdr-osdpip-0.0.8-r2.ebuild
new file mode 100644
index 000000000000..72d00c2bd31d
--- /dev/null
+++ b/media-plugins/vdr-osdpip/vdr-osdpip-0.0.8-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2003-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/vdr-osdpip-0.0.8-r2.ebuild,v 1.1 2007/06/24 12:24:06 zzam Exp $
+
+inherit vdr-plugin
+
+DESCRIPTION="VDR plugin: Show another channel in the OSD"
+HOMEPAGE="http://www.magoa.net/linux"
+SRC_URI="http://www.magoa.net/linux/files/${P}.tgz"
+
+KEYWORDS="~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.3.7
+	>=media-libs/libmpeg2-0.4.0
+	>=media-video/ffmpeg-0.4.8
+	"
+
+PATCHES="${FILESDIR}/${P}-includes.diff
+	${FILESDIR}/${P}-gcc4.diff
+	${FILESDIR}/${P}-vdr-1.5.0.diff"
+
+src_unpack() {
+	vdr-plugin_src_unpack
+
+	/bin/sed -i Makefile \
+	  -e 's+^FFMDIR.*$+FFMDIR = /usr/include/ffmpeg+' \
+	  -e 's+-I\$(FFMDIR)/libavcodec+-I$(FFMDIR)+' \
+	  -e 's+-L\$(FFMDIR)/libavcodec++'
+}
+