Add vdr-1.4 compatibility.

Package-Manager: portage-2.1.4.4

4 files changed, 30 insertions, 7 deletions

diff --git a/media-plugins/vdr-iptv/ChangeLog b/media-plugins/vdr-iptv/ChangeLog
index ab72c042ccad..9513c75a7734 100644
--- a/media-plugins/vdr-iptv/ChangeLog
+++ b/media-plugins/vdr-iptv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-iptv
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-iptv/ChangeLog,v 1.3 2008/02/19 19:12:35 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-iptv/ChangeLog,v 1.4 2008/03/17 15:09:18 zzam Exp $
+
+  17 Mar 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-iptv-0.0.7-vdr-1.4.diff, vdr-iptv-0.0.7.ebuild:
+  Add vdr-1.4 compatibility.
 
 *vdr-iptv-0.0.7 (19 Feb 2008)
 
diff --git a/media-plugins/vdr-iptv/Manifest b/media-plugins/vdr-iptv/Manifest
index 50611d152525..c91086ad7122 100644
--- a/media-plugins/vdr-iptv/Manifest
+++ b/media-plugins/vdr-iptv/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX vdr-iptv-0.0.7-vdr-1.4.diff 727 RMD160 b113881e5c76886d9ea69fa27471e9b2d04107f8 SHA1 6d2d1c364b6bf93b32ecfa245ce8e7da9468e90f SHA256 404b22677813fd364d6d86d03baf6487e76eb08d838f08683aea95859dee5d80
 DIST vdr-iptv-0.0.3.tgz 46046 RMD160 f731f9324d174455f697f2cd23e5b7b662d7b151 SHA1 e7579c3e80d62022b605342ed50dbef4b992ff01 SHA256 cdcbb77cb2cdd8e7ed6778942077038ae8d84fbf447f450f13f01fe09bf76026
 DIST vdr-iptv-0.0.6.tgz 50010 RMD160 89ddedf916be24ef77e406bbcc86f6bc0a99927c SHA1 1fe80d39b890b8ea986d3a9167c6683f624acd43 SHA256 8ee7f3d99c7da652064ee1d9567e43d3127c31bb3c16028a595cf93305ac7494
 DIST vdr-iptv-0.0.7.tgz 54402 RMD160 b67f7483f53bca3dc6eda7475cf58a6c41d5f539 SHA1 7b23f62b5576d065abe14424d8d3883a8f0204d7 SHA256 ccf0fcb8c22166a096f5b3a0a66b096d55b9a7486acf5ebc3bf1f0f6be16f7c8
 EBUILD vdr-iptv-0.0.3.ebuild 627 RMD160 2915fed03a40c2ba631f1c410002b739d4d41e07 SHA1 89b79ef1cfc59838808ad4c46f2209a5acce23e7 SHA256 915c82ec11d686c213ebe0043b3c8e8d6054f9309e8725cb98bf4da099b3d166
 EBUILD vdr-iptv-0.0.6.ebuild 865 RMD160 fa8422775c7e77f8ff6eb8e281aabcf8178311e0 SHA1 4755f997fa40de49fb5742ff554a40042951094b SHA256 55678e90ee683391560f508aee25de901251eb885f349a56203d22b041f023c7
-EBUILD vdr-iptv-0.0.7.ebuild 865 RMD160 1eccb573a0c8a9f88e400eb54a531fd28e348cf5 SHA1 05a5313ee13d30a85e4c88c4e41b2ccd7f94f6df SHA256 46702669b24de518df06a49e6248e0c4565218d0d85cb9e5397e30e7e4d25361
-MISC ChangeLog 690 RMD160 fa63054f7c28b617dcee50e24fbe01a8b28e498a SHA1 cc18866da6d3a8d657c8d1c6d72464eef541b394 SHA256 16c4a00a807baacc18654d56e3059c8f93b28c21932f5de0abc330f936eb94e3
+EBUILD vdr-iptv-0.0.7.ebuild 906 RMD160 3c2b97589027e5fe4345452475ad6939e6cf47dd SHA1 3ca0feb2a3eb07f7e9bed1ffa5b75a64af3a845f SHA256 d717ead14c4b63fe5420dd56e8f1bdb0651d1822acb591b044babe1f70d96218
+MISC ChangeLog 834 RMD160 e088a391f5554fd295afa7c970ba7b77d40ffcb9 SHA1 57583d553bd8372b0e302bd4a1da5649ed1f3d82 SHA256 e748e4471834b6c4afe8dc9dcb45fb615825c5ce8688b2d5dc4aef96bed1bd76
 MISC metadata.xml 251 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 SHA1 6e174f6e4395999a9dafd53f523e079766c0b094 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHuyovt2vP6XvVdOcRAjRBAKC5YOjBiHgOqBnA+0R4G59hswQItQCgkZLC
-ndBdRPJYVFj5BbPwuRXe5lU=
-=CmAg
+iD8DBQFH3omnt2vP6XvVdOcRAosiAKCx3PIDqP8f6MsbCJgXyhdbstxAEgCeJrO8
+P2C6AwAgm/0krOLyXaicC2w=
+=+BAl
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-iptv/files/vdr-iptv-0.0.7-vdr-1.4.diff b/media-plugins/vdr-iptv/files/vdr-iptv-0.0.7-vdr-1.4.diff
new file mode 100644
index 000000000000..31447c7af4da
--- /dev/null
+++ b/media-plugins/vdr-iptv/files/vdr-iptv-0.0.7-vdr-1.4.diff
@@ -0,0 +1,16 @@
+Index: iptv-0.0.7/pidscanner.c
+===================================================================
+--- iptv-0.0.7.orig/pidscanner.c
++++ iptv-0.0.7/pidscanner.c
+@@ -146,7 +146,11 @@ void cPidScanner::Process(const uint8_t*
+            for (unsigned int i = 0; i < MAXSPIDS; ++i)
+                Spids[i] = IptvChannel->Spid(i);
+            debug("cPidScanner::Process(): Vpid=0x%04X, Apid=0x%04X\n", Vpid, Apid);
++#if defined(APIVERSNUM) && APIVERSNUM < 10510
++           IptvChannel->SetPids(Vpid, Ppid, Apids, ALangs, Dpids, DLangs, Tpid);
++#else
+            IptvChannel->SetPids(Vpid, Ppid, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
++#endif
+            Channels.Unlock();
+            process = false;
+            }
diff --git a/media-plugins/vdr-iptv/vdr-iptv-0.0.7.ebuild b/media-plugins/vdr-iptv/vdr-iptv-0.0.7.ebuild
index 1ddac5065f13..d1778d30b9f2 100644
--- a/media-plugins/vdr-iptv/vdr-iptv-0.0.7.ebuild
+++ b/media-plugins/vdr-iptv/vdr-iptv-0.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-iptv/vdr-iptv-0.0.7.ebuild,v 1.1 2008/02/19 19:12:35 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-iptv/vdr-iptv-0.0.7.ebuild,v 1.2 2008/03/17 15:09:18 zzam Exp $
 
 inherit vdr-plugin eutils
 
@@ -15,6 +15,8 @@ IUSE=""
 
 DEPEND=">=media-video/vdr-1.4.7-r7"
 
+PATCHES="${FILESDIR}/${P}-vdr-1.4.diff"
+
 pkg_setup() {
 	vdr-plugin_pkg_setup