Make it compile with vdr-1.5

Package-Manager: portage-2.1.2.4

diff --git a/media-plugins/vdr-vcd/ChangeLog b/media-plugins/vdr-vcd/ChangeLog
index fbf948579afe4ec4bef65f9503be894015a617b2..beab5ca9c576456edca11025b259a2c50b47df63 100644 (file)
--- a/media-plugins/vdr-vcd/ChangeLog
+++ b/media-plugins/vdr-vcd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-vcd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vcd/ChangeLog,v 1.5 2007/04/17 09:44:24 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vcd/ChangeLog,v 1.6 2007/04/17 13:36:08 zzam Exp $
+
+  17 Apr 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-vcd-0.7-vdr-1.5.diff, vdr-vcd-0.7.ebuild:
+  Make it compile with vdr-1.5
 
   17 Apr 2007; Matthias Schwarzott <zzam@gentoo.org> files/rc-addon.sh:
   Removed bash specific stuff.

diff --git a/media-plugins/vdr-vcd/Manifest b/media-plugins/vdr-vcd/Manifest
index b3e14cb726f385d4c62f040d0a6ec685df5e9645..adbd1f697cce1a8f35ec60cd4b46a08be7bdd81d 100644 (file)
--- a/media-plugins/vdr-vcd/Manifest
+++ b/media-plugins/vdr-vcd/Manifest
@@ -9,16 +9,20 @@ AUX rc-addon.sh 231 RMD160 c8805e383cfe3b99d39502cb359b6e37aacc59b7 SHA1 b1ed0da
 MD5 fec7986b07b187c867dbd2ce4a8656c9 files/rc-addon.sh 231
 RMD160 c8805e383cfe3b99d39502cb359b6e37aacc59b7 files/rc-addon.sh 231
 SHA256 12b0f3549a5c1bb1807f72b68c5afd3cdd29b478cef811a7dde0222d3d4e11d7 files/rc-addon.sh 231
+AUX vdr-vcd-0.7-vdr-1.5.diff 1004 RMD160 44b7d5c733efaa9af9ff672b7318c31b6a805d81 SHA1 4ce9210fbf0de8de6a55ef390784f646e9991570 SHA256 033df7976ca51cdb3c5d2e4b0b91b9afb3cb6962ea051c577b2d9c2c0ccf9b0a
+MD5 f6408ef5c7e85b99d212a96d9672579a files/vdr-vcd-0.7-vdr-1.5.diff 1004
+RMD160 44b7d5c733efaa9af9ff672b7318c31b6a805d81 files/vdr-vcd-0.7-vdr-1.5.diff 1004
+SHA256 033df7976ca51cdb3c5d2e4b0b91b9afb3cb6962ea051c577b2d9c2c0ccf9b0a files/vdr-vcd-0.7-vdr-1.5.diff 1004
 DIST vcd-0.7.patch 1661 RMD160 bf8300228d3e56457c107538572065ed67b52250 SHA1 30069f3c761cd7970068b2825118c7e21f09ea3c SHA256 1d238289bbf59bdd69a8c8b43608d0f3845b5b43e6bd2d4bfc90291d59495c9d
 DIST vdr-vcd-0.7.tgz 33510 RMD160 7fa73b30279f192a14558f0d88b95ee3b326507e SHA1 183ca127953f50c0456cd36ad6c92b1200bc0b14 SHA256 6896e4ae0e67dc548ef854e725d151b20507ea1f45c73032453bdf2c91a72f60
-EBUILD vdr-vcd-0.7.ebuild 573 RMD160 1133a4f2c48b3d6ac23098c068a29f75026c9e1b SHA1 3c0c5e18d101ef1bc82082542d55a3c3982e7546 SHA256 7c1cb819142dab42a5ae4da99458e61f01e825bef92ae58999ddd9eb057ba4dd
-MD5 42b9a21c9c7b8d4798f65be1d60f6f20 vdr-vcd-0.7.ebuild 573
-RMD160 1133a4f2c48b3d6ac23098c068a29f75026c9e1b vdr-vcd-0.7.ebuild 573
-SHA256 7c1cb819142dab42a5ae4da99458e61f01e825bef92ae58999ddd9eb057ba4dd vdr-vcd-0.7.ebuild 573
-MISC ChangeLog 796 RMD160 f8d37a9d1dc5e487ad5b21cc22d061bbe46db28e SHA1 b21b3100810297ec1f3a70a59f3c9e08b9e4b71b SHA256 11e38117f691d8921a6834f89f6b92f9d10cfc3c4125e25be11d59ba15272d45
-MD5 3f39cc55b7f8670a37ac5c9242aa9d60 ChangeLog 796
-RMD160 f8d37a9d1dc5e487ad5b21cc22d061bbe46db28e ChangeLog 796
-SHA256 11e38117f691d8921a6834f89f6b92f9d10cfc3c4125e25be11d59ba15272d45 ChangeLog 796
+EBUILD vdr-vcd-0.7.ebuild 716 RMD160 0bf15dcc783a945a0483b76697a067d5942716c2 SHA1 f9d34aec04297ec9195973937f103b6f2fbd02cf SHA256 a1c8d3449fcbb7e5355cddf12507c320ae466a9f2910666676d622c7d909074c
+MD5 ee459bdd7d3c72acb11c07319101539d vdr-vcd-0.7.ebuild 716
+RMD160 0bf15dcc783a945a0483b76697a067d5942716c2 vdr-vcd-0.7.ebuild 716
+SHA256 a1c8d3449fcbb7e5355cddf12507c320ae466a9f2910666676d622c7d909074c vdr-vcd-0.7.ebuild 716
+MISC ChangeLog 936 RMD160 94a17468c013a42e91b24ccf4aa019f1e4fcc47f SHA1 b199e3b6a73d5337fa595e24f5a7efd1c5637357 SHA256 4372f4a7cd369d9b930da68a307febfb79a8cc06f051ab3b04919c6118da4c00
+MD5 74eb5bced21107b55572283bcd494761 ChangeLog 936
+RMD160 94a17468c013a42e91b24ccf4aa019f1e4fcc47f ChangeLog 936
+SHA256 4372f4a7cd369d9b930da68a307febfb79a8cc06f051ab3b04919c6118da4c00 ChangeLog 936
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -29,7 +33,7 @@ SHA256 714155275232f5830f82371eecdb7ddff2d35007e943dd9dcc54dd8acc13a2f7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGJJb+t2vP6XvVdOcRAvGAAJ0XnhjhnLzS9z6EEuA9qrXvGE3HFQCgrCOv
-t71JLu2PzcClVcEuK7NffLI=
-=GwUs
+iD8DBQFGJM1Qt2vP6XvVdOcRAvmhAKC0LDmNfwGN+kzPPFT51px9+/rL3gCgkiyR
+RhcLmUYY2jthSHcevXYF//k=
+=3hWM
 -----END PGP SIGNATURE-----

diff --git a/media-plugins/vdr-vcd/files/vdr-vcd-0.7-vdr-1.5.diff b/media-plugins/vdr-vcd/files/vdr-vcd-0.7-vdr-1.5.diff
new file mode 100644 (file)
index 0000000..1daefef
--- /dev/null
+++ b/media-plugins/vdr-vcd/files/vdr-vcd-0.7-vdr-1.5.diff
@@ -0,0 +1,33 @@
+diff -NaurwB vcd-0.7-1.4.5/menucontrol.c vcd-0.7-1.5.0/menucontrol.c
+--- vcd-0.7-1.4.5/menucontrol.c        2006-07-05 15:09:23.000000000 +0200
++++ vcd-0.7-1.5.0/menucontrol.c        2007-01-19 11:10:51.000000000 +0100
+@@ -63,7 +63,8 @@
+ {
+   if (visible) {
+      delete displayReplay;
+-     needsFastResponse = visible = false;
++     visible = false;
++     SetNeedsFastResponse(visible);
+      modeOnly = false;
+      }
+ }
+@@ -170,7 +171,8 @@
+ {
+   if (visible) {
+      delete displayReplay;
+-     needsFastResponse = visible = false;
++     visible = false;
++     SetNeedsFastResponse(visible);
+      modeOnly = false;
+      lastPlay = lastForward = false;
+      lastSpeed = -1;
+@@ -210,7 +212,8 @@
+   if (GetIndex(Current, Total) && Total > 0) {
+      if (!visible) {
+         displayReplay = Skins.Current()->DisplayReplay(modeOnly);
+-        needsFastResponse = visible = true;
++        visible = true;
++        SetNeedsFastResponse(visible);
+         }
+      if (Initial) {
+         lastCurrent = lastTotal = -1;

diff --git a/media-plugins/vdr-vcd/vdr-vcd-0.7.ebuild b/media-plugins/vdr-vcd/vdr-vcd-0.7.ebuild
index 7c3eff3480959920f0b8f4bc9a1e9bb3b275af59..84786ffe7df7c088a66ef9542ad1e7db106de0be 100644 (file)
--- a/media-plugins/vdr-vcd/vdr-vcd-0.7.ebuild
+++ b/media-plugins/vdr-vcd/vdr-vcd-0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vcd/vdr-vcd-0.7.ebuild,v 1.3 2006/04/17 13:26:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vcd/vdr-vcd-0.7.ebuild,v 1.4 2007/04/17 13:36:08 zzam Exp $
 
 inherit eutils vdr-plugin
 
@@ -19,3 +19,11 @@ DEPEND=">=media-video/vdr-1.3.18"
 
 PATCHES="${DISTDIR}/vcd-0.7.patch"
 
+src_unpack() {
+       vdr-plugin_src_unpack
+       cd "${S}"
+       if has_version ">=media-video/vdr-1.5"; then
+               epatch "${FILESDIR}/${P}-vdr-1.5.diff"
+       fi
+}
+