diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-10-06 22:03:02 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-10-06 22:03:02 +0000 |
| commit | 3c019da54489acd291d52c5bc81f5627611a0b32 (patch) | |
| tree | de71f36d507e106e1a304b5a84f4bdd2500bed21 /media-libs/xine-lib | |
| parent | Initial commit. (diff) | |
| download | gentoo-2-3c019da54489acd291d52c5bc81f5627611a0b32.tar.gz gentoo-2-3c019da54489acd291d52c5bc81f5627611a0b32.tar.bz2 gentoo-2-3c019da54489acd291d52c5bc81f5627611a0b32.zip | |
add upstream patch to fix build against ffmpeg trunk
(Portage version: 2.2_rc11/cvs/Linux 2.6.26.5 x86_64)
Diffstat (limited to 'media-libs/xine-lib')
| -rw-r--r-- | media-libs/xine-lib/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/xine-lib/files/xine-lib-1.1.15-ffmpeg.patch | 33 | ||||
| -rw-r--r-- | media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild | 3 |
3 files changed, 40 insertions, 2 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index 758b107b80fd..b54fcc86cf6c 100644 --- a/media-libs/xine-lib/ChangeLog +++ b/media-libs/xine-lib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/xine-lib # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.573 2008/09/28 15:12:47 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.574 2008/10/06 22:03:02 aballier Exp $ + + 06 Oct 2008; Alexis Ballier <aballier@gentoo.org> + +files/xine-lib-1.1.15-ffmpeg.patch, xine-lib-1.1.15-r1.ebuild: + add upstream patch to fix build against ffmpeg trunk 28 Sep 2008; Raúl Porcel <armin76@gentoo.org> xine-lib-1.1.15-r1.ebuild: arm stable wrt #211464 diff --git a/media-libs/xine-lib/files/xine-lib-1.1.15-ffmpeg.patch b/media-libs/xine-lib/files/xine-lib-1.1.15-ffmpeg.patch new file mode 100644 index 000000000000..27279be377d6 --- /dev/null +++ b/media-libs/xine-lib/files/xine-lib-1.1.15-ffmpeg.patch @@ -0,0 +1,33 @@ +# HG changeset patch +# User Darren Salt <linux@youmustbejoking.demon.co.uk> +# Date 1221306490 -3600 +# Node ID f5ff69fc65d3229ac9908b13c5bb0b9317adf80c +# Parent 89c3e23896babb1fc6fe0f4299fa645a47297d4c +Compilation fixes for ffmpeg API & ABI changes. + +diff -r 89c3e23896ba -r f5ff69fc65d3 src/combined/ffmpeg/ff_audio_decoder.c +--- a/src/combined/ffmpeg/ff_audio_decoder.c Fri Sep 05 21:26:59 2008 +0200 ++++ b/src/combined/ffmpeg/ff_audio_decoder.c Sat Sep 13 12:48:10 2008 +0100 +@@ -322,7 +322,7 @@ + + if (!this->output_open) { + if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) { +- avcodec_decode_audio (this->context, ++ avcodec_decode_audio2 (this->context, + (int16_t *)this->decode_buffer, + &decode_buffer_size, + &this->buf[0], +diff -r 89c3e23896ba -r f5ff69fc65d3 src/combined/ffmpeg/ffmpeg_decoder.h +--- a/src/combined/ffmpeg/ffmpeg_decoder.h Fri Sep 05 21:26:59 2008 +0200 ++++ b/src/combined/ffmpeg/ffmpeg_decoder.h Sat Sep 13 12:48:10 2008 +0100 +@@ -33,6 +33,10 @@ + # include "../../libffmpeg/libavcodec/avcodec.h" + #endif + ++#if LIBAVCODEC_VERSION_MAJOR > 51 ++#define bits_per_sample bits_per_coded_sample ++#endif ++ + typedef struct ff_codec_s { + uint32_t type; + enum CodecID id; diff --git a/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild b/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild index d8c6420810b8..cce3619c3ce6 100644 --- a/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild +++ b/media-libs/xine-lib/xine-lib-1.1.15-r1.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-libs/xine-lib/xine-lib-1.1.15-r1.ebuild,v 1.9 2008/09/28 15:12:47 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild,v 1.10 2008/10/06 22:03:02 aballier Exp $ EAPI=1 @@ -90,6 +90,7 @@ src_unpack() { cd "${S}" epatch "$FILESDIR"/${P}-libmpeg2-vis.patch epatch "$FILESDIR"/${P}-buffer_h_ansi.patch + epatch "$FILESDIR"/${P}-ffmpeg.patch } src_compile() { |