Fix build with ffmpeg2.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

4 files changed, 68 insertions, 6 deletions

diff --git a/media-libs/FusionSound/ChangeLog b/media-libs/FusionSound/ChangeLog
index 94446edc5d72..5800a82bd0b1 100644
--- a/media-libs/FusionSound/ChangeLog
+++ b/media-libs/FusionSound/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/FusionSound
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/ChangeLog,v 1.22 2014/01/04 22:30:21 hasufell Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/ChangeLog,v 1.23 2015/02/08 10:37:53 aballier Exp $
+
+  08 Feb 2015; Alexis Ballier <aballier@gentoo.org>
+  FusionSound-1.1.1-r1.ebuild, +files/FusionSound-1.1.1-ffmpeg2.patch,
+  +files/FusionSound-1.1.1-segfault.patch:
+  Fix build with ffmpeg2.
 
   04 Jan 2014; Julian Ospald <hasufell@gentoo.org> FusionSound-1.1.1-r1.ebuild:
   fix dev-libs/DirectFB requirement
diff --git a/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild b/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild
index 92f111883b18..f37793251867 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-2014 Gentoo Foundation
+# Copyright 1999-2015 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.15 2014/01/04 22:30:21 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild,v 1.16 2015/02/08 10:37:53 aballier Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -24,7 +24,7 @@ RDEPEND=">=dev-libs/DirectFB-${PV}
 	vorbis? ( media-libs/libvorbis )
 	mad? ( media-libs/libmad )
 	cddb? ( media-libs/libcddb )
-	ffmpeg? ( >=virtual/ffmpeg-0.6.90 )"
+	ffmpeg? ( >=virtual/ffmpeg-9 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-apps/sed"
@@ -37,7 +37,9 @@ src_prepare() {
 		"${FILESDIR}"/${P}-ffmpeg-0.10.patch \
 		"${FILESDIR}"/${P}-libavformat54.patch \
 		"${FILESDIR}"/${P}-libav-0.8.1.patch \
-		"${FILESDIR}"/${P}-libav-9.patch
+		"${FILESDIR}"/${P}-libav-9.patch \
+		"${FILESDIR}"/${P}-ffmpeg2.patch \
+		"${FILESDIR}"/${P}-segfault.patch
 
 	sed -i -e 's:-O3 -ffast-math -pipe::' configure.in || die
 
diff --git a/media-libs/FusionSound/files/FusionSound-1.1.1-ffmpeg2.patch b/media-libs/FusionSound/files/FusionSound-1.1.1-ffmpeg2.patch
new file mode 100644
index 000000000000..adde2a541450
--- /dev/null
+++ b/media-libs/FusionSound/files/FusionSound-1.1.1-ffmpeg2.patch
@@ -0,0 +1,31 @@
+Minimal change fix to build with ffmpeg2.
+
+Index: FusionSound-1.1.1/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c
+===================================================================
+--- FusionSound-1.1.1.orig/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c
++++ FusionSound-1.1.1/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c
+@@ -46,6 +46,10 @@
+ #include <libavformat/avformat.h>
+ #include <libavutil/mathematics.h>
+ 
++#ifndef MAX_AUDIO_FRAME_SIZE
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
++#endif
++
+ static DFBResult
+ Probe( IFusionSoundMusicProvider_ProbeContext *ctx );
+ 
+@@ -416,11 +420,11 @@ IFusionSoundMusicProvider_FFmpeg_Destruc
+           /* Ugly hack to fix a bug (segfault) in url_fclose() */
+           if (!(iformat->flags & AVFMT_NOFILE)) {
+                iformat->flags |= AVFMT_NOFILE;
+-               av_close_input_file( data->ctx );
++               avformat_close_input( &data->ctx );
+                iformat->flags ^= AVFMT_NOFILE;
+           }
+           else {
+-               av_close_input_file( data->ctx );
++               avformat_close_input( &data->ctx );
+           }
+      }
+      
diff --git a/media-libs/FusionSound/files/FusionSound-1.1.1-segfault.patch b/media-libs/FusionSound/files/FusionSound-1.1.1-segfault.patch
new file mode 100644
index 000000000000..52b96b0bfc37
--- /dev/null
+++ b/media-libs/FusionSound/files/FusionSound-1.1.1-segfault.patch
@@ -0,0 +1,24 @@
+Fixes a segfault on probe.
+
+Index: FusionSound-1.1.1/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c
+===================================================================
+--- FusionSound-1.1.1.orig/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c
++++ FusionSound-1.1.1/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c
+@@ -1138,7 +1138,7 @@ IFusionSoundMusicProvider_FFmpeg_WaitSta
+ static DFBResult
+ Probe( IFusionSoundMusicProvider_ProbeContext *ctx )
+ {
+-     AVProbeData    pd;
++     AVProbeData    pd = { 0 };
+      AVInputFormat *format;
+           
+      av_register_all();
+@@ -1165,7 +1165,7 @@ Construct( IFusionSoundMusicProvider *th
+            const char                *filename,
+            DirectStream              *stream )
+ {
+-     AVProbeData    pd;
++     AVProbeData    pd = { 0 };
+      AVInputFormat *fmt;
+      AVCodec       *c;
+      unsigned char  buf[64];