Add vdr-1.5 compatibility

Package-Manager: portage-2.1.5_rc2

4 files changed, 40 insertions, 9 deletions

diff --git a/media-plugins/vdr-taste/ChangeLog b/media-plugins/vdr-taste/ChangeLog
index 339bc1412808..69d789de9d04 100644
--- a/media-plugins/vdr-taste/ChangeLog
+++ b/media-plugins/vdr-taste/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-taste
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-taste/ChangeLog,v 1.3 2006/12/03 14:50:11 zzam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-taste/ChangeLog,v 1.4 2008/04/13 14:04:56 zzam Exp $
+
+  13 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-taste-0.0.2d-vdr-1.5.diff, vdr-taste-0.0.2d.ebuild:
+  Add vdr-1.5 compatibility
 
   03 Dec 2006; Matthias Schwarzott <zzam@gentoo.org>
   +files/vdr-taste-0.0.2d-uint64.diff, vdr-taste-0.0.2d.ebuild:
diff --git a/media-plugins/vdr-taste/Manifest b/media-plugins/vdr-taste/Manifest
index 80dfebb5188c..692642c80610 100644
--- a/media-plugins/vdr-taste/Manifest
+++ b/media-plugins/vdr-taste/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vdr-taste-0.0.2d-uint64.diff 443 RMD160 d008664d54b60b00dd627cd2b19c5c50b2239fc7 SHA1 98d8658ff03a684fd8d842f4a4df6967ce81b45b SHA256 353379eb2da540d912623c0226f68ed3c03378edcc60789fe540d6e862004b8b
+AUX vdr-taste-0.0.2d-vdr-1.5.diff 387 RMD160 e6ece2abaafa534181cc48a1953fbf7d27c25b07 SHA1 53fb6355775564fb3615f9108ad0f4deb90b4508 SHA256 b7b5491e4bc2dff43ab395fe92976e9712c87e02781ffd4544baa3a128924e25
 DIST taste-0.0.2d.patch 1536 RMD160 86c74c1eff479340b2f272b4dc469e5831a142e4 SHA1 def6e667e0853e025a5bc8df73d6d93ff22b059d SHA256 3af5f4e0c567368b9d3feb0e731b1a830ba2e3103ea8111f4f707353d4d12ebf
 DIST vdr-taste-0.0.2d.tgz 14941 RMD160 acaefe747f4e2209f1c1167ff7d27fcdca7e76a9 SHA1 028eaeabb8c000b79cc5c53149e0af214dd9c1cc SHA256 f3584f5a2ccaf41d20f75fb90d7f2bea5707f7bf401eff25f8a7a5619191832f
-EBUILD vdr-taste-0.0.2d.ebuild 629 RMD160 4635b25ede4a79a13026ab572dd6aba13117a55d SHA1 1419ddb507c4d0a866c84e81dca557cedba893af SHA256 4a6146cf044cafcb8121830a421fd053809c6b7a3f74a09de3429416edb993be
-MISC ChangeLog 648 RMD160 f6f356c33bad9f4414b86dc539bd63d38c9d3ed3 SHA1 4642234380b0e3d98c86d949364ac1bec16a1cf6 SHA256 4d39e5ea2d8064b67f1e754d2cc22b16717af371c561baf991daa192aabd03d9
+EBUILD vdr-taste-0.0.2d.ebuild 661 RMD160 5b465057e138b47262a267507b63ba3140853601 SHA1 05b2059af46f037d77df44652dc5ed24d8eb8e28 SHA256 6c74eb398b104fad919402074d9b347cbd21bea0482251fe64ec55791e7965a2
+MISC ChangeLog 795 RMD160 06e04594f4ee42388c743d5f9510a39bd2dcbdfe SHA1 0868f66b1f16d8f66ea7a8801f3d223f0bf7b9e0 SHA256 c94a926f2759a1ee825c68adb3111ed50bbb76c2d2a1bfa3d532a52c6839f237
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgCExYACgkQt2vP6XvVdOcWRACgsECiHXVSKIiRl2G5GX8qqo5Y
+qNgAoLh7q3TZVKWTXaAvWIWsxEIqIxHO
+=iO/a
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-taste/files/vdr-taste-0.0.2d-vdr-1.5.diff b/media-plugins/vdr-taste/files/vdr-taste-0.0.2d-vdr-1.5.diff
new file mode 100644
index 000000000000..9e4f5c7ffd5a
--- /dev/null
+++ b/media-plugins/vdr-taste/files/vdr-taste-0.0.2d-vdr-1.5.diff
@@ -0,0 +1,15 @@
+diff -ru taste-0.0.2d-orig/control.c taste-0.0.2d/control.c
+--- taste-0.0.2d-orig/control.c	2008-04-13 15:56:51.128176152 +0200
++++ taste-0.0.2d/control.c	2008-04-13 15:57:32.248233187 +0200
+@@ -22,7 +22,11 @@
+ 		mSwitch(true),
+ 		mOsd(NULL)
+ {
++#if APIVERSNUM >= 10500
++	SetNeedsFastResponse(true);
++#else
+ 	needsFastResponse = true;
++#endif
+ 	cRemote::Put(kOk, true); // Hide OSD
+ }
+ 
diff --git a/media-plugins/vdr-taste/vdr-taste-0.0.2d.ebuild b/media-plugins/vdr-taste/vdr-taste-0.0.2d.ebuild
index d4a8f1c6d6c5..6c016aba68ee 100644
--- a/media-plugins/vdr-taste/vdr-taste-0.0.2d.ebuild
+++ b/media-plugins/vdr-taste/vdr-taste-0.0.2d.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2004-2006 Gentoo Foundation
+# Copyright 2004-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-taste/vdr-taste-0.0.2d.ebuild,v 1.3 2007/07/10 23:09:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-taste/vdr-taste-0.0.2d.ebuild,v 1.4 2008/04/13 14:04:56 zzam Exp $
 
 IUSE=""
 inherit vdr-plugin
@@ -9,11 +9,12 @@ DESCRIPTION="Video Disk Recorder Taste PlugIn"
 HOMEPAGE="http://www.magoa.net/linux/index.php?view=taste"
 SRC_URI="http://www.magoa.net/linux/files/${P}.tgz
 		mirror://vdrfiles/${PN}/${VDRPLUGIN}-${PV}.patch"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND=">=media-video/vdr-1.3.7"
 
-PATCHES="${DISTDIR}/${VDRPLUGIN}-${PV}.patch
-	${FILESDIR}/${P}-uint64.diff"
+PATCHES=("${DISTDIR}/${VDRPLUGIN}-${PV}.patch"
+	"${FILESDIR}/${P}-uint64.diff"
+	"${FILESDIR}/${P}-vdr-1.5.diff")