Added patch to compile also with vdr-1.4.4_p1

Package-Manager: portage-2.1.2_rc2-r4

diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index bce08d47948c81283b63819c0dfe0d06f43cffa9..ad767e9c47524044a5721df340167e54e1ca3494 100644 (file)
--- 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/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index d3d73d1052b4f371452c5136de21f72d568c434e..89fb9b26e051fc39701198a5cdb2ba8ed94b7454 100644 (file)
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -5,15 +5,19 @@ AUX confd-1.0.0_pre6 856 RMD160 0d48271fe6041316f7ad95267f180f896b76c78b SHA1 5d
 MD5 9c6ae841c1edf3cf7d8199b0e77c8e09 files/confd-1.0.0_pre6 856
 RMD160 0d48271fe6041316f7ad95267f180f896b76c78b files/confd-1.0.0_pre6 856
 SHA256 fd30a70c06553463414e93771306a59fdabbcf674218dac49d4af46096d6089b files/confd-1.0.0_pre6 856
+AUX vdr-xineliboutput-1.0.0_pre6-uint64.diff 578 RMD160 aadccee14a7f8d2a521a3f57de5a2c5bc1a0112e SHA1 cb530366c58e0beb9dcaa5cea3173fbe7ada27ed SHA256 b701192054d2aa2ead5c77534fdf3a13a3d33d58254e5b0c81523995a6e188b5
+MD5 1726eca863d3c81e7d0327a7000dab36 files/vdr-xineliboutput-1.0.0_pre6-uint64.diff 578
+RMD160 aadccee14a7f8d2a521a3f57de5a2c5bc1a0112e files/vdr-xineliboutput-1.0.0_pre6-uint64.diff 578
+SHA256 b701192054d2aa2ead5c77534fdf3a13a3d33d58254e5b0c81523995a6e188b5 files/vdr-xineliboutput-1.0.0_pre6-uint64.diff 578
 DIST vdr-xineliboutput-1.0.0pre6.tgz 222439 RMD160 7874916a5e122fe114d36eeddc0581e8ded3e12e SHA1 993af565957daa930802568161ffe27ad4b8ce2e SHA256 c76ad8fda681b2ddcbae14096885805149544087f2a4e6e4aa41b8c93a8dc6a0
-EBUILD vdr-xineliboutput-1.0.0_pre6-r1.ebuild 1925 RMD160 7cde8241a066676dd8c588131c03545af83ef585 SHA1 ae7938e4ae0bded49394888f8542ee0df1c7bf04 SHA256 30706981e9daa0bf130e837202ec8f8b4a3ea66060916d18b4b7d7156a3404ca
-MD5 3d32c9fee61530c2edcf530366fe15d8 vdr-xineliboutput-1.0.0_pre6-r1.ebuild 1925
-RMD160 7cde8241a066676dd8c588131c03545af83ef585 vdr-xineliboutput-1.0.0_pre6-r1.ebuild 1925
-SHA256 30706981e9daa0bf130e837202ec8f8b4a3ea66060916d18b4b7d7156a3404ca vdr-xineliboutput-1.0.0_pre6-r1.ebuild 1925
-MISC ChangeLog 4008 RMD160 8b0b5a80acd10f5af816d71563986d54b791dadf SHA1 5cb00b34851b85fb4154f31e5cd0caaf7aa8cb3f SHA256 c0e4aacf2e96ba8d91bcd81058cd1d3c6f985633ba5d75fdaf391fbe97719517
-MD5 11f06e474fdcb38730612f136ef70f03 ChangeLog 4008
-RMD160 8b0b5a80acd10f5af816d71563986d54b791dadf ChangeLog 4008
-SHA256 c0e4aacf2e96ba8d91bcd81058cd1d3c6f985633ba5d75fdaf391fbe97719517 ChangeLog 4008
+EBUILD vdr-xineliboutput-1.0.0_pre6-r1.ebuild 1965 RMD160 c441a24fce66419c89631a19ab2c7d987c3bdc87 SHA1 22abb6bac5c6794d540a12a5a70f1bf758544e44 SHA256 b8115523cb2c900d311a6424eb6bbe1738b9f1164b875f2c80cbbf5694bc9e35
+MD5 50c77abb64b33b1fed61e6a7729e94d2 vdr-xineliboutput-1.0.0_pre6-r1.ebuild 1965
+RMD160 c441a24fce66419c89631a19ab2c7d987c3bdc87 vdr-xineliboutput-1.0.0_pre6-r1.ebuild 1965
+SHA256 b8115523cb2c900d311a6424eb6bbe1738b9f1164b875f2c80cbbf5694bc9e35 vdr-xineliboutput-1.0.0_pre6-r1.ebuild 1965
+MISC ChangeLog 4203 RMD160 124741c2721b0ebe08eb59f52f2cfcf3d49bf686 SHA1 2de3e19beddc49aaf7117e85e648db1b12f22aae SHA256 ef1598d1e7b8a13ed5f77d1f3ed1bdff78231761f7d399f543dc61ed39493d70
+MD5 7b14be71d104d4169f95272e75efa43c ChangeLog 4203
+RMD160 124741c2721b0ebe08eb59f52f2cfcf3d49bf686 ChangeLog 4203
+SHA256 ef1598d1e7b8a13ed5f77d1f3ed1bdff78231761f7d399f543dc61ed39493d70 ChangeLog 4203
 MISC metadata.xml 353 RMD160 8098dcdec4e7d627012ff4cc0e1a70fc0061228e SHA1 a8466ebe913ea08351d9415bca28ee107e54a7cb SHA256 48731babb71989233956af5f82f8bd1b24625eab7b26493e43d753621c9ec359
 MD5 3ca7be3c0a30822246151344759d8d7e metadata.xml 353
 RMD160 8098dcdec4e7d627012ff4cc0e1a70fc0061228e metadata.xml 353
@@ -24,7 +28,7 @@ SHA256 631fa9722e66e214233b9793ba998e6af7d068db0113273d00344248dc94e0d0 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD4DBQFFXaqut2vP6XvVdOcRApfMAJY/SX/Ww721F99Nie826iKIfsp7AJ4321jw
-2jboA2ZYAwG9vTHKylmJOw==
-=4ycX
+iD8DBQFFcuJlt2vP6XvVdOcRAl/WAJsHZgBOFY1SGWilHTlFtUuChtQmOwCgp+cU
+VQoDwrAgbLrPImTpjVng6i0=
+=LTkW
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..09ef8f5
--- /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 1f7ba4e6a9707d2903f0f6d608fc292c6442e349..2fc613ce5602f32f6047451dccaf669a209ac4c8 100644 (file)
--- 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