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-streamdev-client/ChangeLog b/media-plugins/vdr-streamdev-client/ChangeLog
index db69e4b9819c3b6005bd79d8fbd7e4707c67cc8b..a24211088a67829025214a04012e0ebd722abf4c 100644 (file)
--- a/media-plugins/vdr-streamdev-client/ChangeLog
+++ b/media-plugins/vdr-streamdev-client/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-streamdev-client
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-client/ChangeLog,v 1.4 2006/08/15 10:09:15 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-client/ChangeLog,v 1.5 2006/12/03 15:41:24 zzam Exp $
+
+  03 Dec 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-streamdev-uint64.diff,
+  vdr-streamdev-client-0.3.3_pre20051219.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-streamdev-client/Manifest b/media-plugins/vdr-streamdev-client/Manifest
index ed358631bdce3ac1860a57386392dd90bbe729bd..17599b39f0ffd531b2f6feb437d72631b67eb164 100644 (file)
--- a/media-plugins/vdr-streamdev-client/Manifest
+++ b/media-plugins/vdr-streamdev-client/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX vdr-streamdev-uint64.diff 492 RMD160 11e34f218dd0aadac331ff032be654a92408bc38 SHA1 f190c4db4c0828555320da1f985fb18c28264a75 SHA256 19f77031efe58899d6798665535b9d787cbfb875ed879ce30cb6ab38579cd09c
+MD5 333d487ce160fec8649b351e175d03cf files/vdr-streamdev-uint64.diff 492
+RMD160 11e34f218dd0aadac331ff032be654a92408bc38 files/vdr-streamdev-uint64.diff 492
+SHA256 19f77031efe58899d6798665535b9d787cbfb875ed879ce30cb6ab38579cd09c files/vdr-streamdev-uint64.diff 492
 DIST vdr-streamdev-20051219.tar.bz2 118761 RMD160 e9a251892fe8be59cc3bebfe1cf57690b8c33ec4 SHA1 d6e2e8a834912ad3994b234815795223a9cf77d9 SHA256 efe78266e77c5b1c89a3692d6d328c7de85849aefcb50912b17409afbe9dbd96
-EBUILD vdr-streamdev-client-0.3.3_pre20051219.ebuild 891 RMD160 3409c65dd83401f3adb620e1352696fb4ad3442b SHA1 6e68b941f07b5ab327c2fb0dc9bd6c8ca3cec2ee SHA256 b059365ca17aede7f4b7bc958e4676de0fc487b812d293ac6347ef0ec0cdef86
-MD5 0cbd04f7cb2ff85f3f8e3827f3e1ae72 vdr-streamdev-client-0.3.3_pre20051219.ebuild 891
-RMD160 3409c65dd83401f3adb620e1352696fb4ad3442b vdr-streamdev-client-0.3.3_pre20051219.ebuild 891
-SHA256 b059365ca17aede7f4b7bc958e4676de0fc487b812d293ac6347ef0ec0cdef86 vdr-streamdev-client-0.3.3_pre20051219.ebuild 891
-MISC ChangeLog 938 RMD160 2ca5eebde6d665642945c0feb49fe61966354d8f SHA1 f7ed8f90c29ed35e6741496cb0856bc4a3671130 SHA256 2e23ecb504c8ac403b998e0a1135744ea2768692376e2a2ddbcc241f33b79a0d
-MD5 aa29a0cbf0021396c17cd24960b17291 ChangeLog 938
-RMD160 2ca5eebde6d665642945c0feb49fe61966354d8f ChangeLog 938
-SHA256 2e23ecb504c8ac403b998e0a1135744ea2768692376e2a2ddbcc241f33b79a0d ChangeLog 938
+EBUILD vdr-streamdev-client-0.3.3_pre20051219.ebuild 940 RMD160 9124e7b72e471c3543cb4705f9c103b22aa24e43 SHA1 c2d030af3e369ff2a6f58d50f7731d70c36a43e5 SHA256 b4973fc5d6db568bffb4d0350b6a2646447ea6187e893ae08f5ab74adc781b7e
+MD5 60e5450bcaa375b91b0d382b8c087766 vdr-streamdev-client-0.3.3_pre20051219.ebuild 940
+RMD160 9124e7b72e471c3543cb4705f9c103b22aa24e43 vdr-streamdev-client-0.3.3_pre20051219.ebuild 940
+SHA256 b4973fc5d6db568bffb4d0350b6a2646447ea6187e893ae08f5ab74adc781b7e vdr-streamdev-client-0.3.3_pre20051219.ebuild 940
+MISC ChangeLog 1125 RMD160 331e6bfb20968e9208a9316834cc1a6ec3c123f3 SHA1 a786876acecbf9bf7200bbddc45579c93c63fbeb SHA256 d3bc29a132c9967f07df8498169da3f88a322c14865ee5e561a65143b5542bca
+MD5 3d2b8e573afab85527762ced5bd8ba55 ChangeLog 1125
+RMD160 331e6bfb20968e9208a9316834cc1a6ec3c123f3 ChangeLog 1125
+SHA256 d3bc29a132c9967f07df8498169da3f88a322c14865ee5e561a65143b5542bca ChangeLog 1125
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 MD5 116de98355049ce943c3b6fedc00b4a3 metadata.xml 257
 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 metadata.xml 257
@@ -20,7 +24,7 @@ SHA256 781b69c2fd02d192a72eb9c7b26af73e046a43282e2c8f2cc7ebb7daa7701623 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE4Z1Rt2vP6XvVdOcRAgunAJ909/BG47NfTorabmoltfikGPva/ACgwy8W
-Ov6bj08qi31PqFtsVL7oTcc=
-=Z/X0
+iD8DBQFFcvAst2vP6XvVdOcRArIUAJ9SLaHZna/8LOdV/7DXlh/4JuIWiACfd9E8
+z9VjspzF8tWXEb9+7uS4nTg=
+=0zvK
 -----END PGP SIGNATURE-----

diff --git a/media-plugins/vdr-streamdev-client/files/vdr-streamdev-uint64.diff b/media-plugins/vdr-streamdev-client/files/vdr-streamdev-uint64.diff
new file mode 100644 (file)
index 0000000..5198a38
--- /dev/null
+++ b/media-plugins/vdr-streamdev-client/files/vdr-streamdev-uint64.diff
@@ -0,0 +1,12 @@
+diff -ru streamdev-20051219-orig/client/socket.c streamdev-20051219/client/socket.c
+--- streamdev-20051219-orig/client/socket.c    2006-12-03 16:38:44.044459126 +0100
++++ streamdev-20051219/client/socket.c 2006-12-03 16:38:58.315865440 +0100
+@@ -54,7 +54,7 @@
+               return false;
+       }
+ 
+-      uint64 elapsed = starttime.Elapsed();
++      uint64_t elapsed = starttime.Elapsed();
+       if (Expected != 0) { // XXX+ What if elapsed > TimeoutMs?
+               TimeoutMs -= elapsed;
+               return Expect(Expected, NULL, TimeoutMs);

diff --git a/media-plugins/vdr-streamdev-client/vdr-streamdev-client-0.3.3_pre20051219.ebuild b/media-plugins/vdr-streamdev-client/vdr-streamdev-client-0.3.3_pre20051219.ebuild
index d94b74d86618b49168996f05150e6267d3942967..dc103775c75c101301e935a33a8d5f8679cf7659 100644 (file)
--- a/media-plugins/vdr-streamdev-client/vdr-streamdev-client-0.3.3_pre20051219.ebuild
+++ b/media-plugins/vdr-streamdev-client/vdr-streamdev-client-0.3.3_pre20051219.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-streamdev-client/vdr-streamdev-client-0.3.3_pre20051219.ebuild,v 1.2 2006/03/20 16:07:56 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-client/vdr-streamdev-client-0.3.3_pre20051219.ebuild,v 1.3 2006/12/03 15:41:24 zzam Exp $
 
 inherit vdr-plugin eutils
 
@@ -22,6 +22,8 @@ S=${WORKDIR}/${MY_P}
 
 VDRPLUGIN_MAKE_TARGET="libvdr-${VDRPLUGIN}.so"
 
+PATCHES="${FILESDIR}/vdr-streamdev-uint64.diff"
+
 src_unpack() {
        vdr-plugin_src_unpack
        cd ${S}