fix build with latest ffmpeg, bug #242070

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.6 x86_64

4 files changed, 50 insertions, 8 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 0beede210a62..19982360986c 100644
--- a/media-plugins/vdr-softdevice/ChangeLog
+++ b/media-plugins/vdr-softdevice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-softdevice
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.57 2008/09/23 08:45:16 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.58 2008/10/18 09:51:51 aballier Exp $
+
+  18 Oct 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/vdr-softdevice-0.5.0.20080922-offsett.patch,
+  vdr-softdevice-0.5.0.20080922.ebuild:
+  fix build with latest ffmpeg, bug #242070
 
 *vdr-softdevice-0.5.0.20080922 (23 Sep 2008)
 
diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index 09cbba6776e8..1051949fed7c 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -11,6 +11,7 @@ AUX rc-addon.sh 321 RMD160 b236a3ce160d66fd4b25ad8fe4239cbbe5cb0843 SHA1 02c5f2e
 AUX vdr-softdevice-0.2.3-shm-fullscreen.diff 826 RMD160 d1ad20ec5c3d4c8e9e20270f205f09cd984b71a9 SHA1 5caf77a611c3c451416aa7b039ba5d78d8cda261 SHA256 911c00fd9c088a3186059c2b757ea3620dcd27dc20ee842ce326d1970704dfd3
 AUX vdr-softdevice-0.3.1-osdmode-software-default.diff 537 RMD160 b6266883351086f04ff65ff8b3253b0d7c2d9bbf SHA1 c047edc3b3d4f65d9e3a47e2259ccbf2aba63d52 SHA256 e9203e71ca046db87c710a1f51ec4825032a3e0214cd91b2fa96ba6790beddaa
 AUX vdr-softdevice-0.4.0-xinerama-configure-opts.patch 787 RMD160 13bfd161b68372ccc3a5ea3b777d0d5e4a59da9f SHA1 ab65432f810ddd2fa3b9251f5a565c7937fc0be1 SHA256 541d3ff037d2c8ebcfca5873d551ff91e2618e8d551317a0497b6138c8b8af1d
+AUX vdr-softdevice-0.5.0.20080922-offsett.patch 1298 RMD160 ac28491ce13a8d06dc8bd5af6805a4fcd91c9cfd SHA1 5a8ae7cf83c737077b85213f9cfc1b789c9c028c SHA256 ccf16a8e94b6b9a0cb284b1e11595858b330f1307b2157eb1224db6b91e78661
 AUX vdr-softdevice-20070711-vdr-1.5.9.diff 1902 RMD160 0f92a226eb7c176bd799bbbf933a657c5e3a1222 SHA1 0679b5738f3680f51f4081c5a4189a7753ae2d17 SHA256 d4380a425d79068f50b9acf81c7c1e187274b405e1c8f43cba3fafbb2d159027
 DIST vdr-softdevice-0.4.0.tgz 190505 RMD160 78c49568776b71d3b892de8cdc7406f31fd90115 SHA1 0949d6727011ebd0ed0947d9906d081bbe4d2162 SHA256 4a43426e03a36771bce272123d2b3a0a7dc5aac05b98277a985ba277e3c0b9c9
 DIST vdr-softdevice-0.5.0.tgz 200049 RMD160 de854f35173e0ecea21ce73613b5f6e58293d9fa SHA1 e92ef0d6bf71ea6a2c7e2c84dfef07a1c3e81708 SHA256 8b1eec4f5b7cd9a051439830408c1209d5583a5979551b28b69649f1e3381bc3
@@ -22,14 +23,14 @@ EBUILD vdr-softdevice-0.4.0.20070711.ebuild 3550 RMD160 79275bd9563266fed3191e22
 EBUILD vdr-softdevice-0.4.0.20080120.ebuild 3546 RMD160 63faac2aa9c025c1ffa85d4fe0c6633a3abba606 SHA1 ebf2b63eaa67a5c2dd49528ca80e799b0b7a32a0 SHA256 56bd4911043de6c648db4371f91d1d4a9d0478cf7fbea1c660bab66a7783584d
 EBUILD vdr-softdevice-0.4.0.ebuild 3588 RMD160 12d960454ed4cd5a295ef4cab66621d5da3b947d SHA1 181412532815c11aa305de573725ee94076ba468 SHA256 85cde41dd65b8d4d4b7c227651a0294c6ed9be9ffbcbe93ca2426d18a28e421b
 EBUILD vdr-softdevice-0.5.0-r1.ebuild 3571 RMD160 7777c4adad624dcc42b99b906bcd8e902bc85791 SHA1 35c05c982c2abb179478c4ecac8d7d9abe2da0c3 SHA256 63566dd9be19cfe87c5d1b4b8aaf1ff3591d117629b48e5262e40db781641831
-EBUILD vdr-softdevice-0.5.0.20080922.ebuild 3520 RMD160 8f1649ee248276bbf26cc7c99f4da995ce5f2e32 SHA1 80f718dda91e5d271dacdb5c076391b984f7b8d1 SHA256 93831a288fb837a3255402f90246cafb6468d00a9f2b911ed755f5ae5ef93585
+EBUILD vdr-softdevice-0.5.0.20080922.ebuild 3559 RMD160 59753658800e9e49d1223218bb90743bc6162e22 SHA1 bafca82124c7337ea09d45dc03304c9803d6adca SHA256 d3036cf5e752363da0015c9da725b4d16c93f78be9b514b0211f034c7a679974
 EBUILD vdr-softdevice-0.5.0.ebuild 3487 RMD160 3b61c650f425dcb50697fcabaedd43f9d135b94e SHA1 1a4bdfc8070018d76f96b13e37475ac4345c5975 SHA256 caae055cbcfdc31391ec1014ca54b9ee6224bb13bfd2f34071c917c8179a66c6
-MISC ChangeLog 13540 RMD160 5b398460e2fe11446d0ebf5b2c78caf6e659f029 SHA1 4de8bf3c65b58fab9d0b09e9597e4a3866e15e8c SHA256 413a678c6b68a9d8e5d11c593395f581340541424c85d9ed0f2b7e94ab396fa0
+MISC ChangeLog 13735 RMD160 df502fde2f34257d3907a030c575f0b6c88ca902 SHA1 aff1e03d10060ebe056d0b35660f8532b03c0a72 SHA256 f2611dfb1461640a3985ce3787e5e0f8dba075fb6c4828a8f6667ca583fb177d
 MISC metadata.xml 315 RMD160 9ff61fc577af435ee1e4c8cc622a7495ee2b6932 SHA1 514ba8e35690751b2d1d8cfba2c4162152f07d0f SHA256 0e99bf3f1538b2fef87bd304d896b78a5ddfb8a75277550c261801dcd3c4e279
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjYrKcACgkQt2vP6XvVdOdVVgCcDg8vJvrwi2tHNFYtQrieSoeL
-oxsAn3V1l32DtE5n+pmiMJd5jHxbP1jV
-=M7Ii
+iEYEARECAAYFAkj5scAACgkQvFcC4BYPU0qBQwCeMGfPC2a1F0cAMVwEpxCdv+T1
+y3oAnRLuhRAQiXxzIF4Sy8QshBtmTXon
+=Bs/J
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.5.0.20080922-offsett.patch b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.5.0.20080922-offsett.patch
new file mode 100644
index 000000000000..2c1824bf96e8
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.5.0.20080922-offsett.patch
@@ -0,0 +1,35 @@
+Index: softdevice-cvs-20080922/mpeg2decoder.c
+===================================================================
+--- softdevice-cvs-20080922.orig/mpeg2decoder.c
++++ softdevice-cvs-20080922/mpeg2decoder.c
+@@ -1016,7 +1016,7 @@ static int read_packet_RingBuffer(void *
+ };
+ 
+ #if LIBAVFORMAT_BUILD >4625
+-static offset_t seek_RingBuffer(void *opaque, offset_t offset, int whence)
++static int64_t seek_RingBuffer(void *opaque, int64_t offset, int whence)
+ #else
+ static int seek_RingBuffer(void *opaque, offset_t offset, int whence)
+ #endif
+@@ -1135,7 +1135,7 @@ start:
+     return 0;
+ };
+ 
+-int cMpeg2Decoder::seek(offset_t offset, int whence) {
++int cMpeg2Decoder::seek(int64_t offset, int whence) {
+    printf("unimplemented: seek offset %lld whence %d\n", (long long int)offset, whence);
+    return -EINVAL;
+ };
+Index: softdevice-cvs-20080922/mpeg2decoder.h
+===================================================================
+--- softdevice-cvs-20080922.orig/mpeg2decoder.h
++++ softdevice-cvs-20080922/mpeg2decoder.h
+@@ -312,7 +312,7 @@ private:
+     bool          packetMode;
+ public:
+     int read_packet(uint8_t *buf, int buf_size);
+-    int seek(offset_t offset, int whence);
++    int seek(int64_t offset, int whence);
+ 
+ public:
+     cMpeg2Decoder(cAudioOut *AudioOut, cVideoOut *VideoOut);
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild
index 752c7ef70d0d..773cd632305f 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild,v 1.1 2008/09/23 08:45:16 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild,v 1.2 2008/10/18 09:51:51 aballier Exp $
 
 inherit eutils vdr-plugin versionator
 
@@ -48,7 +48,8 @@ DEPEND="${RDEPEND}
 # Remove this once default-linux/amd64/2006.1 is deprecated
 DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
 
-PATCHES=("${FILESDIR}/patches-0.4.0/shm-fullscreen-parameter.diff")
+PATCHES=("${FILESDIR}/patches-0.4.0/shm-fullscreen-parameter.diff"
+	"${FILESDIR}/${P}-offsett.patch" )
 
 pkg_setup() {
 	vdr-plugin_pkg_setup