diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2006-12-03 14:33:00 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2006-12-03 14:33:00 +0000 |
| commit | 0a038a389fccf7624b927b8c3128e752de12c6df (patch) | |
| tree | 6b1fec1f66c66320420f6dad217478c16aceccf6 /media-plugins/vdr-console | |
| parent | Added patch to compile also with vdr-1.4.4_p1. (diff) | |
| download | gentoo-2-0a038a389fccf7624b927b8c3128e752de12c6df.tar.gz gentoo-2-0a038a389fccf7624b927b8c3128e752de12c6df.tar.bz2 gentoo-2-0a038a389fccf7624b927b8c3128e752de12c6df.zip | |
Added patch to compile also with vdr-1.4.4_p1
(Portage version: 2.1.2_rc2-r4)
Diffstat (limited to 'media-plugins/vdr-console')
| -rw-r--r-- | media-plugins/vdr-console/ChangeLog | 6 | ||||
| -rw-r--r-- | media-plugins/vdr-console/files/vdr-console-0.6.0-uint64.diff | 33 | ||||
| -rw-r--r-- | media-plugins/vdr-console/vdr-console-0.6.0.ebuild | 14 |
3 files changed, 42 insertions, 11 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/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" |