diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-10-18 09:51:51 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-10-18 09:51:51 +0000 |
| commit | 22cf8c3ab31d375f13edcbb8d570a4497a0e263c (patch) | |
| tree | a0cbc1d9355dba62fa6e21539e90be59f6390edf /media-plugins/vdr-softdevice | |
| parent | Build with user specified CFLAGS (#240878). (diff) | |
| download | gentoo-2-22cf8c3ab31d375f13edcbb8d570a4497a0e263c.tar.gz gentoo-2-22cf8c3ab31d375f13edcbb8d570a4497a0e263c.tar.bz2 gentoo-2-22cf8c3ab31d375f13edcbb8d570a4497a0e263c.zip | |
fix build with latest ffmpeg, bug #242070
(Portage version: 2.2_rc12/cvs/Linux 2.6.26.6 x86_64)
Diffstat (limited to 'media-plugins/vdr-softdevice')
3 files changed, 44 insertions, 3 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/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 |