summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2006-12-03 14:42:38 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2006-12-03 14:42:38 +0000
commit3df1784a6b381ed9527a9eb9e74ca1961a0c5af5 (patch)
tree94cbd9d41dd35e8e3a21e6570eac1932e9903a24 /media-plugins
parentFix build with USE=-cups thanks to spanky in bug 156966 (diff)
downloadgentoo-2-3df1784a6b381ed9527a9eb9e74ca1961a0c5af5.tar.gz
gentoo-2-3df1784a6b381ed9527a9eb9e74ca1961a0c5af5.tar.bz2
gentoo-2-3df1784a6b381ed9527a9eb9e74ca1961a0c5af5.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-xineliboutput/ChangeLog7
-rw-r--r--media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_pre6-uint64.diff14
-rw-r--r--media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre6-r1.ebuild4
3 files changed, 23 insertions, 2 deletions
diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index bce08d47948c..ad767e9c4752 100644
--- a/media-plugins/vdr-xineliboutput/ChangeLog
+++ b/media-plugins/vdr-xineliboutput/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-plugins/vdr-xineliboutput
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.16 2006/11/17 12:24:10 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.17 2006/12/03 14:42:38 zzam Exp $
+
+ 03 Dec 2006; Matthias Schwarzott <zzam@gentoo.org>
+ +files/vdr-xineliboutput-1.0.0_pre6-uint64.diff,
+ vdr-xineliboutput-1.0.0_pre6-r1.ebuild:
+ Added patch to compile also with vdr-1.4.4_p1
17 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
-vdr-xineliboutput-1.0.0_pre5-r1.ebuild,
diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_pre6-uint64.diff b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_pre6-uint64.diff
new file mode 100644
index 000000000000..09ef8f503d69
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_pre6-uint64.diff
@@ -0,0 +1,14 @@
+diff -ru xineliboutput-1.0.0pre6-orig/tools/udp_pes_scheduler.c xineliboutput-1.0.0pre6/tools/udp_pes_scheduler.c
+--- xineliboutput-1.0.0pre6-orig/tools/udp_pes_scheduler.c 2006-12-03 15:37:01.308416481 +0100
++++ xineliboutput-1.0.0pre6/tools/udp_pes_scheduler.c 2006-12-03 15:37:38.101192802 +0100
+@@ -59,8 +59,8 @@
+ }
+ t.tv_usec -= tbegin.tv_usec;
+
+- return (uint64(t.tv_sec)) * 90000LL +
+- (uint64(t.tv_usec)) * 90LL / 1000LL +
++ return (uint64_t(t.tv_sec)) * 90000LL +
++ (uint64_t(t.tv_usec)) * 90LL / 1000LL +
+ begin;
+ }
+
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre6-r1.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre6-r1.ebuild
index 1f7ba4e6a970..2fc613ce5602 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre6-r1.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre6-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-xineliboutput/vdr-xineliboutput-1.0.0_pre6-r1.ebuild,v 1.1 2006/10/31 10:14:45 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre6-r1.ebuild,v 1.2 2006/12/03 14:42:38 zzam Exp $
inherit vdr-plugin eutils multilib
@@ -45,6 +45,8 @@ S=${WORKDIR}/xineliboutput-${MY_PV}
VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
+PATCHES="${FILESDIR}/${P}-uint64.diff"
+
enable_in_makefile() {
local opt
for opt; do