Added patch to compile also with vdr-1.4.4_p1

Package-Manager: portage-2.1.2_rc2-r4

4 files changed, 57 insertions, 22 deletions

diff --git a/media-plugins/vdr-console/ChangeLog b/media-plugins/vdr-console/ChangeLog
index c8c23e388211..40c6d363c88f 100644
--- a/media-plugins/vdr-console/ChangeLog
+++ b/media-plugins/vdr-console/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-console
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-console/ChangeLog,v 1.3 2006/08/15 10:20:00 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-console/ChangeLog,v 1.4 2006/12/03 14:33:00 zzam Exp $
+
+  03 Dec 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-console-0.6.0-uint64.diff, vdr-console-0.6.0.ebuild:
+  Added patch to compile also with vdr-1.4.4_p1
 
   15 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> metadata.xml:
   Assigned to Gentoo VDR Project.
diff --git a/media-plugins/vdr-console/Manifest b/media-plugins/vdr-console/Manifest
index 194d14e53900..33b04ed7a4b1 100644
--- a/media-plugins/vdr-console/Manifest
+++ b/media-plugins/vdr-console/Manifest
@@ -1,19 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX vdr-console-0.6.0-uint64.diff 1140 RMD160 3dce01ae9f4899374a3c4250bca9e81390f1e6fa SHA1 e1f22b809c4072cd2822b068534b85d6a195775b SHA256 bc2bcdcb5ec45cbfbe848d9063f411934ce17817ca76674c667f45b19903af99
+MD5 43b84aaa68645daf18adfc606a6151b0 files/vdr-console-0.6.0-uint64.diff 1140
+RMD160 3dce01ae9f4899374a3c4250bca9e81390f1e6fa files/vdr-console-0.6.0-uint64.diff 1140
+SHA256 bc2bcdcb5ec45cbfbe848d9063f411934ce17817ca76674c667f45b19903af99 files/vdr-console-0.6.0-uint64.diff 1140
 AUX vdr-console-0.6.0-vdr-1.3.18.diff 1784 RMD160 f55b957987198730cab64931e8490aa87b91e2a3 SHA1 6d26a7f86a5dfa8b68a6492805a8b283dd6ee461 SHA256 fb8e2a6e0c9a06ad0f6fc803403f21178298f561950d22dcd1a2ea9dad2b135a
 MD5 9859872d4edd9e490b1036d7e004b818 files/vdr-console-0.6.0-vdr-1.3.18.diff 1784
 RMD160 f55b957987198730cab64931e8490aa87b91e2a3 files/vdr-console-0.6.0-vdr-1.3.18.diff 1784
 SHA256 fb8e2a6e0c9a06ad0f6fc803403f21178298f561950d22dcd1a2ea9dad2b135a files/vdr-console-0.6.0-vdr-1.3.18.diff 1784
 DIST vdr-console-0.6.0.tgz 47133 RMD160 eebad2c7289e3b3fc4c988d151a19a7fa44e0167 SHA1 4f6ca0f85c806e245c1ce21c2a090dfa36fedf65 SHA256 34809cb7df4728b15dca1de10e66d8cafb12f1d175a8f929b8da273a62e36261
-EBUILD vdr-console-0.6.0.ebuild 635 RMD160 568ff6a44dacec3a19efd37cbe22eea8cd9be951 SHA1 2cef8ca5b68cd89e5e1bfb7bfcfa0db0944a2bd4 SHA256 44dfcba654f26877c099765764c34277771d9e4f5e6f2c0522006d5277a1ecdf
-MD5 72968ea4fa542d4a13580d4843edf02f vdr-console-0.6.0.ebuild 635
-RMD160 568ff6a44dacec3a19efd37cbe22eea8cd9be951 vdr-console-0.6.0.ebuild 635
-SHA256 44dfcba654f26877c099765764c34277771d9e4f5e6f2c0522006d5277a1ecdf vdr-console-0.6.0.ebuild 635
-MISC ChangeLog 653 RMD160 3961f63ec3d341dd320149517e8cdb75dc187dbf SHA1 0498c3a6cd118f555981fcae18a169d530410db2 SHA256 05b6798084b3fcafff99215a80ecbe3fa7e7605dc9abbb6f61bf0826e4858bea
-MD5 fdfe3c32b88b3d59098d2ead431e71cd ChangeLog 653
-RMD160 3961f63ec3d341dd320149517e8cdb75dc187dbf ChangeLog 653
-SHA256 05b6798084b3fcafff99215a80ecbe3fa7e7605dc9abbb6f61bf0826e4858bea ChangeLog 653
+EBUILD vdr-console-0.6.0.ebuild 561 RMD160 60931e9e47be99fb2ee2a0f5e7f117b3bd9ef1ad SHA1 8b7c9c70e88e192bc30c256c1ee205db91fb8729 SHA256 5f57d0bad25e2aff5285f62f6b736edb10f7b24c3f91c0eab39455c996327ad4
+MD5 553e0110a3e7e584afc4462bf9cea3c1 vdr-console-0.6.0.ebuild 561
+RMD160 60931e9e47be99fb2ee2a0f5e7f117b3bd9ef1ad vdr-console-0.6.0.ebuild 561
+SHA256 5f57d0bad25e2aff5285f62f6b736edb10f7b24c3f91c0eab39455c996327ad4 vdr-console-0.6.0.ebuild 561
+MISC ChangeLog 821 RMD160 e0277018ac467b9290d7125308fd67363e601bb5 SHA1 2e4c748f81b11b48d0ff7bbcfa4905719ca0501f SHA256 fa41696f3e7ec5b6c094ea28e0a9d461dbe831beec77dd2448e141d5e9fe9075
+MD5 b51712e3a41de5c5bc36a982e5d35940 ChangeLog 821
+RMD160 e0277018ac467b9290d7125308fd67363e601bb5 ChangeLog 821
+SHA256 fa41696f3e7ec5b6c094ea28e0a9d461dbe831beec77dd2448e141d5e9fe9075 ChangeLog 821
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 MD5 116de98355049ce943c3b6fedc00b4a3 metadata.xml 257
 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 metadata.xml 257
@@ -24,7 +28,7 @@ SHA256 79883be377027a23499a2660faa537c73db560f940124e7561c1fb9cda869531 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE4Z/Wt2vP6XvVdOcRAnIdAJ9m1QIDXqPE9Vv4RzOUnIZEJdFCvACeOdGx
-TBvElosVWObx5Lasw8mdOm8=
-=UTBH
+iD8DBQFFcuAit2vP6XvVdOcRAr/uAJ0byTwZaHPbkRFzQ9kkbm7HafBQpACZAXqM
+hfAoVXdjTGizT4TzJs5hux0=
+=8Obe
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-console/files/vdr-console-0.6.0-uint64.diff b/media-plugins/vdr-console/files/vdr-console-0.6.0-uint64.diff
new file mode 100644
index 000000000000..922fce25cb64
--- /dev/null
+++ b/media-plugins/vdr-console/files/vdr-console-0.6.0-uint64.diff
@@ -0,0 +1,33 @@
+diff -ru console-0.6.0-orig/menu.c console-0.6.0/menu.c
+--- console-0.6.0-orig/menu.c	2006-12-03 15:28:31.522732562 +0100
++++ console-0.6.0/menu.c	2006-12-03 15:29:04.026492765 +0100
+@@ -1193,7 +1193,7 @@
+ 
+     switch (BASICKEY(Key)) {
+ 
+-    case kKbd:{     uint64 buf = cKbdRemote::MapFuncToCode(KEYKBD(Key));
++    case kKbd:{     uint64_t buf = cKbdRemote::MapFuncToCode(KEYKBD(Key));
+                     WriteToConsole(buf);
+ 
+                     // On every key press, we show the cursor immediately
+@@ -1425,7 +1425,7 @@
+ 
+ 
+ 
+-void cMenuConsole::WriteToConsole(const uint64& code) {
++void cMenuConsole::WriteToConsole(const uint64_t& code) {
+ 
+   unsigned char* data = (unsigned char*)(void*)&code;
+ 
+diff -ru console-0.6.0-orig/menu.h console-0.6.0/menu.h
+--- console-0.6.0-orig/menu.h	2006-12-03 15:28:31.526733517 +0100
++++ console-0.6.0/menu.h	2006-12-03 15:28:44.925932704 +0100
+@@ -102,7 +102,7 @@
+ private:
+   void CaptureKeyboard();
+   void ReleaseKeyboard();
+-  void WriteToConsole(const uint64& code);
++  void WriteToConsole(const uint64_t& code);
+   bool TerminateConsole();
+ 
+   void AddSubMenu(cOsdObject* pSubMenu);
diff --git a/media-plugins/vdr-console/vdr-console-0.6.0.ebuild b/media-plugins/vdr-console/vdr-console-0.6.0.ebuild
index 83e1f8ecb189..7ebf8ae938a8 100644
--- a/media-plugins/vdr-console/vdr-console-0.6.0.ebuild
+++ b/media-plugins/vdr-console/vdr-console-0.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-console/vdr-console-0.6.0.ebuild,v 1.2 2006/04/17 17:17:25 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-console/vdr-console-0.6.0.ebuild,v 1.3 2006/12/03 14:33:00 zzam Exp $
 
 inherit vdr-plugin eutils
 
@@ -14,13 +14,7 @@ LICENSE="GPL-2"
 
 KEYWORDS="~x86"
 
-DEPEND=">=media-video/vdr-1.3.7"
+DEPEND=">=media-video/vdr-1.3.36"
 
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	if has_version ">=media-video/vdr-1.3.18"; then
-		cd "${S}"
-		epatch ${FILESDIR}/${P}-vdr-1.3.18.diff
-	fi
-}
+PATCHES="${FILESDIR}/${P}-vdr-1.3.18.diff
+	${FILESDIR}/${P}-uint64.diff"