summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2012-11-25 13:51:03 +0000
committerLuca Barbato <lu_zero@gentoo.org>2012-11-25 13:51:03 +0000
commitf20d9970a74126295f82e2dc9cf047c4245e4e78 (patch)
treea1b48706f307c2f2ac904ceadc9f2ff2bd5cb8e9 /media-libs/FusionSound
parentremoved initial broken src_test subsequent to a prompt from Afrever wrt Bug #... (diff)
downloadgentoo-2-f20d9970a74126295f82e2dc9cf047c4245e4e78.tar.gz
gentoo-2-f20d9970a74126295f82e2dc9cf047c4245e4e78.tar.bz2
gentoo-2-f20d9970a74126295f82e2dc9cf047c4245e4e78.zip
Support libav-9
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 1191738E)
Diffstat (limited to 'media-libs/FusionSound')
-rw-r--r--media-libs/FusionSound/ChangeLog6
-rw-r--r--media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild5
-rw-r--r--media-libs/FusionSound/files/FusionSound-1.1.1-libav-9.patch21
3 files changed, 29 insertions, 3 deletions
diff --git a/media-libs/FusionSound/ChangeLog b/media-libs/FusionSound/ChangeLog
index b15ab617e0a7..84b943c41d5a 100644
--- a/media-libs/FusionSound/ChangeLog
+++ b/media-libs/FusionSound/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/FusionSound
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/ChangeLog,v 1.20 2012/05/05 08:02:42 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/ChangeLog,v 1.21 2012/11/25 13:51:03 lu_zero Exp $
+
+ 25 Nov 2012; Luca Barbato <lu_zero@gentoo.org> FusionSound-1.1.1-r1.ebuild,
+ +files/FusionSound-1.1.1-libav-9.patch:
+ Support libav-9
05 May 2012; Jeff Horelick <jdhore@gentoo.org> FusionSound-1.1.1-r1.ebuild:
dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild b/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild
index 91710d007bc1..12524b880498 100644
--- a/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild
+++ b/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild,v 1.13 2012/05/05 08:02:42 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild,v 1.14 2012/11/25 13:51:03 lu_zero Exp $
EAPI=4
inherit autotools eutils
@@ -35,7 +35,8 @@ src_prepare() {
"${FILESDIR}"/${P}-ffmpeg-0.6.90.patch \
"${FILESDIR}"/${P}-ffmpeg-0.10.patch \
"${FILESDIR}"/${P}-libavformat54.patch \
- "${FILESDIR}"/${P}-libav-0.8.1.patch
+ "${FILESDIR}"/${P}-libav-0.8.1.patch \
+ "${FILESDIR}"/${P}-libav-9.patch
sed -i -e 's:-O3 -ffast-math -pipe::' configure.in || die
diff --git a/media-libs/FusionSound/files/FusionSound-1.1.1-libav-9.patch b/media-libs/FusionSound/files/FusionSound-1.1.1-libav-9.patch
new file mode 100644
index 000000000000..35295d37cf89
--- /dev/null
+++ b/media-libs/FusionSound/files/FusionSound-1.1.1-libav-9.patch
@@ -0,0 +1,21 @@
+diff -burN FusionSound-1.1.1.old//interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c FusionSound-1.1.1/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c
+--- FusionSound-1.1.1.old//interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c 2012-11-25 14:41:46.306782213 +0100
++++ FusionSound-1.1.1/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c 2012-11-25 14:46:14.151772465 +0100
+@@ -1197,7 +1197,7 @@
+ return DFB_FAILURE;
+ }
+
+- if (av_find_stream_info( data->ctx ) < 0) {
++ if (avformat_find_stream_info( data->ctx, NULL ) < 0) {
+ D_ERROR( "IFusionSoundMusicProvider_FFmpeg: couldn't find stream info!\n" );
+ IFusionSoundMusicProvider_FFmpeg_Destruct( thiz );
+ return DFB_FAILURE;
+@@ -1218,7 +1218,7 @@
+
+ data->codec = data->st->codec;
+ c = avcodec_find_decoder( data->codec->codec_id );
+- if (!c || avcodec_open( data->codec, c ) < 0) {
++ if (!c || avcodec_open2( data->codec, c, NULL ) < 0) {
+ D_ERROR( "IFusionSoundMusicProvider_FFmpeg: couldn't find audio decoder!\n" );
+ IFusionSoundMusicProvider_FFmpeg_Destruct( thiz );
+ return DFB_FAILURE;