From b684137b010565310dddbde8f547ffe220de3e1d Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Sun, 3 Dec 2006 15:05:06 +0000 Subject: [PATCH] Added patch to compile also with vdr-1.4.4_p1 Package-Manager: portage-2.1.2_rc2-r4 --- media-plugins/vdr-powermate/ChangeLog | 6 ++++- .../files/vdr-powermate-0.0.3-uint64.diff | 26 +++++++++++++++++++ .../vdr-powermate/vdr-powermate-0.0.3.ebuild | 5 ++-- media-plugins/vdr-videosystem/ChangeLog | 6 ++++- .../files/vdr-videosystem-0.0.1-uint64.diff | 12 +++++++++ .../vdr-videosystem-0.0.1.ebuild | 4 ++- 6 files changed, 54 insertions(+), 5 deletions(-) create mode 100644 media-plugins/vdr-powermate/files/vdr-powermate-0.0.3-uint64.diff create mode 100644 media-plugins/vdr-videosystem/files/vdr-videosystem-0.0.1-uint64.diff diff --git a/media-plugins/vdr-powermate/ChangeLog b/media-plugins/vdr-powermate/ChangeLog index 4583f6b271c5..824e63cdb75b 100644 --- a/media-plugins/vdr-powermate/ChangeLog +++ b/media-plugins/vdr-powermate/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-powermate # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-powermate/ChangeLog,v 1.5 2006/08/15 10:26:36 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-powermate/ChangeLog,v 1.6 2006/12/03 15:01:31 zzam Exp $ + + 03 Dec 2006; Matthias Schwarzott + +files/vdr-powermate-0.0.3-uint64.diff, vdr-powermate-0.0.3.ebuild: + Added patch to compile also with vdr-1.4.4_p1 15 Aug 2006; Matthias Schwarzott metadata.xml: Assigned to Gentoo VDR Project. diff --git a/media-plugins/vdr-powermate/files/vdr-powermate-0.0.3-uint64.diff b/media-plugins/vdr-powermate/files/vdr-powermate-0.0.3-uint64.diff new file mode 100644 index 000000000000..28f23f3ec0a2 --- /dev/null +++ b/media-plugins/vdr-powermate/files/vdr-powermate-0.0.3-uint64.diff @@ -0,0 +1,26 @@ +diff -ru powermate-0.0.3-orig/powermate.c powermate-0.0.3/powermate.c +--- powermate-0.0.3-orig/powermate.c 2006-12-03 15:58:54.854003243 +0100 ++++ powermate-0.0.3/powermate.c 2006-12-03 15:59:51.239469576 +0100 +@@ -134,8 +134,8 @@ + } + if (click && !pushed) + { +- uint64 current = TimeMs(); +- if (current - lastPush > (uint64) PowerMateSetup.doubleClickTime) ++ uint64_t current = TimeMs(); ++ if (current - lastPush > (uint64_t) PowerMateSetup.doubleClickTime) + { + //printf("CLICK\n"); + ProcessEvent(kEventClick); +diff -ru powermate-0.0.3-orig/powermate.h powermate-0.0.3/powermate.h +--- powermate-0.0.3-orig/powermate.h 2006-12-03 15:58:54.854003243 +0100 ++++ powermate-0.0.3/powermate.h 2006-12-03 15:59:41.325102033 +0100 +@@ -26,7 +26,7 @@ + bool menu; + + bool pushed; +- uint64 lastPush; ++ uint64_t lastPush; + int offset; + bool click; + bool turn; diff --git a/media-plugins/vdr-powermate/vdr-powermate-0.0.3.ebuild b/media-plugins/vdr-powermate/vdr-powermate-0.0.3.ebuild index 60cec9b738d3..dbc0338d751d 100644 --- a/media-plugins/vdr-powermate/vdr-powermate-0.0.3.ebuild +++ b/media-plugins/vdr-powermate/vdr-powermate-0.0.3.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-powermate/vdr-powermate-0.0.3.ebuild,v 1.3 2006/02/05 19:49:02 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-powermate/vdr-powermate-0.0.3.ebuild,v 1.4 2006/12/03 15:01:31 zzam Exp $ inherit vdr-plugin @@ -16,4 +16,5 @@ IUSE="" RDEPEND="media-video/vdr" DEPEND="${RDEPEND}" -PATCHES="${FILESDIR}/${P}-1.3.38.diff" +PATCHES="${FILESDIR}/${P}-1.3.38.diff + ${FILESDIR}/${P}-uint64.diff" diff --git a/media-plugins/vdr-videosystem/ChangeLog b/media-plugins/vdr-videosystem/ChangeLog index 594a9f4fbf9f..fd17755c295b 100644 --- a/media-plugins/vdr-videosystem/ChangeLog +++ b/media-plugins/vdr-videosystem/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-videosystem # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-videosystem/ChangeLog,v 1.3 2006/08/15 10:04:41 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-videosystem/ChangeLog,v 1.4 2006/12/03 15:05:06 zzam Exp $ + + 03 Dec 2006; Matthias Schwarzott + +files/vdr-videosystem-0.0.1-uint64.diff, vdr-videosystem-0.0.1.ebuild: + Added patch to compile also with vdr-1.4.4_p1 15 Aug 2006; Matthias Schwarzott metadata.xml: Now really assign to Gentoo VDR Project. diff --git a/media-plugins/vdr-videosystem/files/vdr-videosystem-0.0.1-uint64.diff b/media-plugins/vdr-videosystem/files/vdr-videosystem-0.0.1-uint64.diff new file mode 100644 index 000000000000..81ec8773c675 --- /dev/null +++ b/media-plugins/vdr-videosystem/files/vdr-videosystem-0.0.1-uint64.diff @@ -0,0 +1,12 @@ +diff -ru videosystem-0.0.1-orig/videosystem.c videosystem-0.0.1/videosystem.c +--- videosystem-0.0.1-orig/videosystem.c 2006-12-03 16:03:23.386105568 +0100 ++++ videosystem-0.0.1/videosystem.c 2006-12-03 16:03:31.716095700 +0100 +@@ -45,7 +45,7 @@ + eVideoSystem GetVideoSystem(void); + + bool doexit; +- uint64 time; ++ uint64_t time; + eVideoSystem curVidSys; + bool initialized; + tOsdSettings pal; diff --git a/media-plugins/vdr-videosystem/vdr-videosystem-0.0.1.ebuild b/media-plugins/vdr-videosystem/vdr-videosystem-0.0.1.ebuild index 83a5fd6d7ab5..d8920eba3092 100644 --- a/media-plugins/vdr-videosystem/vdr-videosystem-0.0.1.ebuild +++ b/media-plugins/vdr-videosystem/vdr-videosystem-0.0.1.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-videosystem/vdr-videosystem-0.0.1.ebuild,v 1.1 2006/05/15 08:26:33 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-videosystem/vdr-videosystem-0.0.1.ebuild,v 1.2 2006/12/03 15:05:06 zzam Exp $ inherit vdr-plugin @@ -15,3 +15,5 @@ IUSE="" DEPEND=">=media-video/vdr-1.3.18" +PATCHES="${FILESDIR}/${P}-uint64.diff" + -- 2.26.2