Added patch to compile with vdr-1.5.4

Package-Manager: portage-2.1.3_rc5

5 files changed, 48 insertions, 18 deletions

diff --git a/media-plugins/vdr-dvdswitch/ChangeLog b/media-plugins/vdr-dvdswitch/ChangeLog
index 8ef03b5828f3..5f1d387ca22b 100644
--- a/media-plugins/vdr-dvdswitch/ChangeLog
+++ b/media-plugins/vdr-dvdswitch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-dvdswitch
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvdswitch/ChangeLog,v 1.12 2007/05/28 09:06:59 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvdswitch/ChangeLog,v 1.13 2007/06/26 08:27:24 zzam Exp $
+
+  26 Jun 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/0.1.3/vdr-1.5.4-compatibility.diff, files/0.1.3/series,
+  vdr-dvdswitch-0.1.3-r1.ebuild:
+  Added patch to compile with vdr-1.5.4
 
 *vdr-dvdswitch-0.1.3-r1 (28 May 2007)
 
diff --git a/media-plugins/vdr-dvdswitch/Manifest b/media-plugins/vdr-dvdswitch/Manifest
index b8fcc8baa14e..7cf08364c822 100644
--- a/media-plugins/vdr-dvdswitch/Manifest
+++ b/media-plugins/vdr-dvdswitch/Manifest
@@ -5,10 +5,14 @@ AUX 0.1.3/no-files-crash.diff 554 RMD160 9f941fae22fe5d285d28dab9598f4def67b3ee4
 MD5 63743a1b90bfb2004042a34a92c7653b files/0.1.3/no-files-crash.diff 554
 RMD160 9f941fae22fe5d285d28dab9598f4def67b3ee48 files/0.1.3/no-files-crash.diff 554
 SHA256 a5b39fb18dedc4296d6259af31eae163f00aa099447f4fb80f229448c726c219 files/0.1.3/no-files-crash.diff 554
-AUX 0.1.3/series 20 RMD160 67cf9f4f4b2043760fe0d62d026dbbc69715ae8e SHA1 d51b485b84fed9facf82d526dd6bb6eea4008933 SHA256 b34308686f33c1e5026db00bb216aee03c5541a8808bebfad152a7c2babc3f89
-MD5 5988923457f5537dab0cf7f7ef4bde9b files/0.1.3/series 20
-RMD160 67cf9f4f4b2043760fe0d62d026dbbc69715ae8e files/0.1.3/series 20
-SHA256 b34308686f33c1e5026db00bb216aee03c5541a8808bebfad152a7c2babc3f89 files/0.1.3/series 20
+AUX 0.1.3/series 49 RMD160 fd9c31f975e0cccb882950ba218a813706b6c02c SHA1 33a99a56d06f57c3ed6f714d9ffa22a76602f7ad SHA256 3aaeed0d7dce11eea65d523582ccd3b1d33f724c6cea2e162860e31772c75f4a
+MD5 3bff60863b1c40a5c1f1c53c3bf976f6 files/0.1.3/series 49
+RMD160 fd9c31f975e0cccb882950ba218a813706b6c02c files/0.1.3/series 49
+SHA256 3aaeed0d7dce11eea65d523582ccd3b1d33f724c6cea2e162860e31772c75f4a files/0.1.3/series 49
+AUX 0.1.3/vdr-1.5.4-compatibility.diff 632 RMD160 8cdf90fd4c208f1d07b2eecfd824e83deed1f535 SHA1 83f5194596324bc84e8118158d1803241babe966 SHA256 f797ad90b985b07dfe0c51310de98964d55256a1f73ad2ed77ff84804ccc29fc
+MD5 4a8fa9fba594390a45e8df3b671f77e7 files/0.1.3/vdr-1.5.4-compatibility.diff 632
+RMD160 8cdf90fd4c208f1d07b2eecfd824e83deed1f535 files/0.1.3/vdr-1.5.4-compatibility.diff 632
+SHA256 f797ad90b985b07dfe0c51310de98964d55256a1f73ad2ed77ff84804ccc29fc files/0.1.3/vdr-1.5.4-compatibility.diff 632
 AUX confd 438 RMD160 03278d125bc7383855b829452e1821f118b9787e SHA1 04f980dbe389ad10e508fb7c55ffedc5eb84eeb7 SHA256 8e1ffbe3e2bba72f7aed1799bd15b5b55220f6a68ce2d2da5274add699e8703c
 MD5 9e9f28f1db0fc474d6b6031552a37292 files/confd 438
 RMD160 03278d125bc7383855b829452e1821f118b9787e files/confd 438
@@ -18,18 +22,18 @@ MD5 3d97b03d38696c185d034231185670d7 files/rc-addon.sh 313
 RMD160 e8245058b712a9703db7550c12d533c5902a57c9 files/rc-addon.sh 313
 SHA256 3f379f1fdf4356b5d38fe1c33612b9a7f003693709abdbd618e90b82a32a3a87 files/rc-addon.sh 313
 DIST vdr-dvdswitch-0.1.3.tar.bz2 35924 RMD160 5bf060b534c07bf44ffccc00d18394381609aeb1 SHA1 4db05c44cc648f4fe1bbf3e81debbfe3cdd81af4 SHA256 39b04003ea10439ca92b638ca4be13d56b0afb474e72ea3cffdb84355274240b
-EBUILD vdr-dvdswitch-0.1.3-r1.ebuild 850 RMD160 4b05edf5240c9ed1c79b8ab9fe5fd2feb876b4f3 SHA1 f98cfdec3fd46a4cd834186761d8fdd711db4f13 SHA256 3626adafda164e5926db1e3e4474b70df2b5ff7f681f0f02bbb27b320d3897e1
-MD5 4cb4ee29eef8bff018910c536b8cffe2 vdr-dvdswitch-0.1.3-r1.ebuild 850
-RMD160 4b05edf5240c9ed1c79b8ab9fe5fd2feb876b4f3 vdr-dvdswitch-0.1.3-r1.ebuild 850
-SHA256 3626adafda164e5926db1e3e4474b70df2b5ff7f681f0f02bbb27b320d3897e1 vdr-dvdswitch-0.1.3-r1.ebuild 850
+EBUILD vdr-dvdswitch-0.1.3-r1.ebuild 898 RMD160 32009e013dbb72f7e73beeeee6e636063868836d SHA1 89c31ab14a12bf73911eee138ba9223df690812a SHA256 d6e3388d127f186425e4ca6224c992927dae35e738e9363dabc6c520ad4f3bfe
+MD5 50e4094bd587efa023dd7dadf424f0df vdr-dvdswitch-0.1.3-r1.ebuild 898
+RMD160 32009e013dbb72f7e73beeeee6e636063868836d vdr-dvdswitch-0.1.3-r1.ebuild 898
+SHA256 d6e3388d127f186425e4ca6224c992927dae35e738e9363dabc6c520ad4f3bfe vdr-dvdswitch-0.1.3-r1.ebuild 898
 EBUILD vdr-dvdswitch-0.1.3.ebuild 797 RMD160 83b48a666aeffb5ce6a97a5876416bb492e9af81 SHA1 391fba40a702bea52afaed9b585696e5a9cd3dae SHA256 596055ac57129894744bfce8ffad811c1feb9fb7df718620256cad6949041d2d
 MD5 a28e00d2c87a9433253cb7e13e47342a vdr-dvdswitch-0.1.3.ebuild 797
 RMD160 83b48a666aeffb5ce6a97a5876416bb492e9af81 vdr-dvdswitch-0.1.3.ebuild 797
 SHA256 596055ac57129894744bfce8ffad811c1feb9fb7df718620256cad6949041d2d vdr-dvdswitch-0.1.3.ebuild 797
-MISC ChangeLog 1955 RMD160 072ed5fac405a8d05de922baf8059bc832666ba2 SHA1 79e43e4270ab1054ebed1dd8e1cde9222d349db2 SHA256 b4638e3d516b6d754c5c7964b339729e6c433d61c846cbd2f33f0c77819e747e
-MD5 bf1467e65acf23183d05824e92290c27 ChangeLog 1955
-RMD160 072ed5fac405a8d05de922baf8059bc832666ba2 ChangeLog 1955
-SHA256 b4638e3d516b6d754c5c7964b339729e6c433d61c846cbd2f33f0c77819e747e ChangeLog 1955
+MISC ChangeLog 2147 RMD160 1e88c78ecbc12bdf9f5226e7f2f71eaa3880b1b4 SHA1 d5ae27c987fdccf1f480ddcbbcddd51502481a21 SHA256 abdf721675a44d8fb287bba643f0a5660ef1d44fb7539f44719380441a6400b6
+MD5 6dcd752e5f8d93d29da304091b6fc4bc ChangeLog 2147
+RMD160 1e88c78ecbc12bdf9f5226e7f2f71eaa3880b1b4 ChangeLog 2147
+SHA256 abdf721675a44d8fb287bba643f0a5660ef1d44fb7539f44719380441a6400b6 ChangeLog 2147
 MISC metadata.xml 346 RMD160 c617e8253cefe0178391d5057c0ed6db2cc45277 SHA1 88f165ed1f70a82d1a36d4ba22c34879466cdeef SHA256 b8ae743804b148b5482d83ef1ba9d65c2c58e3db422a3d7a144c8568bdadae65
 MD5 b6ed62d536a825fcce5afeeb4244fd14 metadata.xml 346
 RMD160 c617e8253cefe0178391d5057c0ed6db2cc45277 metadata.xml 346
@@ -43,7 +47,7 @@ SHA256 69525529a876021abea9a0aadc0ad4ce8c1f9bba6438d76a306ba0507e3d144d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGWpwyt2vP6XvVdOcRArlqAKCLyr1dS5h5HHu7WQRGpyfB/X+rdQCg2Bvc
-Ei3RxnNc0mpxtVgqwHHeOeM=
-=057Y
+iD8DBQFGgM31t2vP6XvVdOcRAia4AKDIfVnkbC/yyq8C6EiOh1PpDq3ncgCdGOjy
+Tk7UmUPIS/d/dVI56BGsQkg=
+=uqRj
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-dvdswitch/files/0.1.3/series b/media-plugins/vdr-dvdswitch/files/0.1.3/series
index b08c2759a7c9..9ea7da857b53 100644
--- a/media-plugins/vdr-dvdswitch/files/0.1.3/series
+++ b/media-plugins/vdr-dvdswitch/files/0.1.3/series
@@ -1 +1,2 @@
 no-files-crash.diff
+vdr-1.5.4-compatibility.diff
diff --git a/media-plugins/vdr-dvdswitch/files/0.1.3/vdr-1.5.4-compatibility.diff b/media-plugins/vdr-dvdswitch/files/0.1.3/vdr-1.5.4-compatibility.diff
new file mode 100644
index 000000000000..301df7e5bbcc
--- /dev/null
+++ b/media-plugins/vdr-dvdswitch/files/0.1.3/vdr-1.5.4-compatibility.diff
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_dvdswitch-0.1.3-1.5.4.dpatch by Thomas Günther <tom@toms-cafe.de>
+## http://toms-cafe.de/vdr/download/dvdswitch-0.1.3-1.5.4.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.4.
+
+@DPATCH@
+--- dvdswitch-0.1.3/helpers.h
++++ dvdswitch-0.1.3/helpers.h
+@@ -80,7 +80,7 @@ class cStringListItem : public cListObje
+     char *Value(void) { return String; }
+ };
+ 
+-class cStringList : public cList<cStringListItem> {};
++//class cStringList : public cList<cStringListItem> {};
+ 
+ // --- cTokenizer ---------------------------------------
+ 
diff --git a/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild b/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild
index 49cf0f2a8cf3..546aa792dfa9 100644
--- a/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild
+++ b/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild,v 1.2 2007/05/28 09:08:59 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild,v 1.3 2007/06/26 08:27:24 zzam Exp $
 
 inherit vdr-plugin
 
@@ -19,7 +19,8 @@ RDEPEND="media-plugins/vdr-dvd
 
 DEFAULT_IMAGE_DIR="/var/vdr/video/dvd-images"
 
-PATCHES="${FILESDIR}/${PV}/no-files-crash.diff"
+PATCHES="${FILESDIR}/${PV}/no-files-crash.diff
+	${FILESDIR}/${PV}/vdr-1.5.4-compatibility.diff"
 
 src_unpack() {
 	vdr-plugin_src_unpack