summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2006-12-03 15:22:53 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2006-12-03 15:22:53 +0000
commite58c37cd61fad2917aa9fc737d1cad48f8a3ca91 (patch)
tree96fd0a06642559c7257c5169704c8798ab1cae4f /media-plugins
parentRemove old versions (diff)
downloadgentoo-2-e58c37cd61fad2917aa9fc737d1cad48f8a3ca91.tar.gz
gentoo-2-e58c37cd61fad2917aa9fc737d1cad48f8a3ca91.tar.bz2
gentoo-2-e58c37cd61fad2917aa9fc737d1cad48f8a3ca91.zip
Added patch to compile also with vdr-1.4.4_p1
(Portage version: 2.1.2_rc2-r4)
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/vdr-graphlcd/ChangeLog6
-rw-r--r--media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.2_pre6-r12
-rw-r--r--media-plugins/vdr-graphlcd/files/vdr-graphlcd-0.1.3-uint64.diff36
-rw-r--r--media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3-r1.ebuild9
4 files changed, 48 insertions, 5 deletions
diff --git a/media-plugins/vdr-graphlcd/ChangeLog b/media-plugins/vdr-graphlcd/ChangeLog
index de2e35e91f4b..31b7f1b1a1a4 100644
--- a/media-plugins/vdr-graphlcd/ChangeLog
+++ b/media-plugins/vdr-graphlcd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-plugins/vdr-graphlcd
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/ChangeLog,v 1.8 2006/09/09 21:26:29 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/ChangeLog,v 1.9 2006/12/03 15:22:53 zzam Exp $
+
+ 03 Dec 2006; Matthias Schwarzott <zzam@gentoo.org>
+ +files/vdr-graphlcd-0.1.3-uint64.diff, vdr-graphlcd-0.1.3-r1.ebuild:
+ Added patch to compile also with vdr-1.4.4_p1
*vdr-graphlcd-0.1.3-r1 (09 Sep 2006)
diff --git a/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.2_pre6-r1 b/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.2_pre6-r1
index 6f5a86db7c88..d5efab3b24ad 100644
--- a/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.2_pre6-r1
+++ b/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.2_pre6-r1
@@ -1 +1,3 @@
MD5 358e8483887a3ee86f3282aaf0e56522 vdr-graphlcd-0.1.2-pre6.tgz 232345
+RMD160 5e47c30c9a7b5f7649a8cf12c38da73fa9bf76ae vdr-graphlcd-0.1.2-pre6.tgz 232345
+SHA256 3f5d772d392373c744a2945254039cfc4846f505683d90569845ef8be8c8aafd vdr-graphlcd-0.1.2-pre6.tgz 232345
diff --git a/media-plugins/vdr-graphlcd/files/vdr-graphlcd-0.1.3-uint64.diff b/media-plugins/vdr-graphlcd/files/vdr-graphlcd-0.1.3-uint64.diff
new file mode 100644
index 000000000000..63a47f1bceb9
--- /dev/null
+++ b/media-plugins/vdr-graphlcd/files/vdr-graphlcd-0.1.3-uint64.diff
@@ -0,0 +1,36 @@
+diff -ru graphlcd-0.1.3-orig/display.c graphlcd-0.1.3/display.c
+--- graphlcd-0.1.3-orig/display.c 2006-12-03 16:18:11.526195337 +0100
++++ graphlcd-0.1.3/display.c 2006-12-03 16:18:47.994898923 +0100
+@@ -2025,7 +2025,7 @@
+ else
+ {
+ if (GraphLCDSetup.BrightnessDelay < 1
+- || ((TimeMs() - LastTimeBrightness) > (uint64) (GraphLCDSetup.BrightnessDelay*1000)))
++ || ((TimeMs() - LastTimeBrightness) > (uint64_t) (GraphLCDSetup.BrightnessDelay*1000)))
+ {
+ LCD->SetBrightness(GraphLCDSetup.BrightnessIdle);
+ nCurrentBrightness = GraphLCDSetup.BrightnessIdle;
+diff -ru graphlcd-0.1.3-orig/display.h graphlcd-0.1.3/display.h
+--- graphlcd-0.1.3-orig/display.h 2006-12-03 16:18:11.526195337 +0100
++++ graphlcd-0.1.3/display.h 2006-12-03 16:18:40.497109608 +0100
+@@ -200,7 +200,7 @@
+
+ /** Set Brightness depends user activity */
+ void SetBrightness();
+- uint64 LastTimeBrightness;
++ uint64_t LastTimeBrightness;
+ int nCurrentBrightness;
+ bool bBrightnessActive;
+ };
+diff -ru graphlcd-0.1.3-orig/tags graphlcd-0.1.3/tags
+--- graphlcd-0.1.3-orig/tags 2006-12-03 16:18:11.526195337 +0100
++++ graphlcd-0.1.3/tags 2006-12-03 16:19:05.319033056 +0100
+@@ -71,7 +71,7 @@
+ LIBDIR Makefile /^LIBDIR = ..\/..\/lib$/;" m
+ LastState display.h /^ ThreadState LastState;$/;" m class:cGraphLCDDisplay
+ LastTime display.h /^ time_t LastTime;$/;" m class:cGraphLCDDisplay
+-LastTimeBrightness display.h /^ uint64 LastTimeBrightness;$/;" m class:cGraphLCDDisplay
++LastTimeBrightness display.h /^ uint64_t LastTimeBrightness;$/;" m class:cGraphLCDDisplay
+ LastTimeCheckSym display.h /^ time_t LastTimeCheckSym;$/;" m class:cGraphLCDDisplay
+ LastTimeModSym display.h /^ time_t LastTimeModSym;$/;" m class:cGraphLCDDisplay
+ Load layout.c /^bool cFontElement::Load(const std::string & url)$/;" f class:cFontElement
diff --git a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3-r1.ebuild b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3-r1.ebuild
index 0f270170b0a6..32bd0e8523e0 100644
--- a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3-r1.ebuild
+++ b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3-r1.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-graphlcd/vdr-graphlcd-0.1.3-r1.ebuild,v 1.1 2006/09/09 21:26:29 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3-r1.ebuild,v 1.2 2006/12/03 15:22:53 zzam Exp $
inherit eutils vdr-plugin
@@ -17,12 +17,13 @@ IUSE="truetype"
DEPEND=">=media-video/vdr-1.2.6
>=app-misc/graphlcd-base-${PV}"
+PATCHES="${FILESDIR}/0.1.3/radiotext-lcr-service.diff
+ ${FILESDIR}/0.1.3/graphlcd-0.1.3-span.diff
+ ${FILESDIR}/${P}-uint64.diff"
+
src_unpack() {
vdr-plugin_src_unpack
- epatch ${FILESDIR}/0.1.3/radiotext-lcr-service.diff
- epatch ${FILESDIR}/0.1.3/graphlcd-0.1.3-span.diff
-
sed -i "s:/usr/local:/usr:" Makefile
}