Fix automagic deps like alsa, cddb, ffmpeg, mad, timidity and vorbis. Fix ffmpeg compability wrt #238718, thanks to Victor Ostorga. Fix building with GCC 4.3 wrt #238718, thanks to Tupone Alfredo.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

2 files changed, 83 insertions, 0 deletions

diff --git a/media-libs/FusionSound/files/FusionSound-1.1.1-ffmpeg.patch b/media-libs/FusionSound/files/FusionSound-1.1.1-ffmpeg.patch
new file mode 100644
index 000000000000..8135157b3f31
--- /dev/null
+++ b/media-libs/FusionSound/files/FusionSound-1.1.1-ffmpeg.patch
@@ -0,0 +1,43 @@
+diff -Naurp FusionSound-1.1.1-original/configure.in FusionSound-1.1.1/configure.in
+--- FusionSound-1.1.1-original/configure.in	2008-02-11 05:31:45.000000000 -0600
++++ FusionSound-1.1.1/configure.in	2009-04-10 15:18:02.000000000 -0600
+@@ -513,11 +513,11 @@ AC_ARG_WITH(ffmpeg,
+     
+ if test "x$with_ffmpeg" = "xyes"; then
+   AC_MSG_CHECKING([for libavcodec/libavformat])
+-  if $PKG_CONFIG libavcodec libavformat; then
++  if $PKG_CONFIG libavcodec libavformat libavutil; then
+     AC_MSG_RESULT(yes)
+     ffmpeg="yes"
+-    FFMPEG_CFLAGS=`$PKG_CONFIG --cflags libavcodec libavformat`
+-    FFMPEG_LIBS=`$PKG_CONFIG --libs libavcodec libavformat`
++    FFMPEG_CFLAGS=`$PKG_CONFIG --cflags libavcodec libavformat libavutil`
++    FFMPEG_LIBS=`$PKG_CONFIG --libs libavcodec libavformat libavutil`
+   else
+     AC_MSG_RESULT(no)
+     AC_MSG_WARN([
+diff -Naurp FusionSound-1.1.1-original/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c FusionSound-1.1.1/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c
+--- FusionSound-1.1.1-original/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c	2008-02-11 05:31:45.000000000 -0600
++++ FusionSound-1.1.1/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c	2009-04-10 15:18:21.000000000 -0600
+@@ -41,8 +41,8 @@
+ 
+ #include <misc/sound_util.h>
+ 
+-#include <avcodec.h>
+-#include <avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ 
+ static DFBResult
+ Probe( IFusionSoundMusicProvider_ProbeContext *ctx );
+@@ -123,8 +123,8 @@ av_read_callback( void *opaque, uint8_t 
+      return len;
+ }
+ 
+-static offset_t
+-av_seek_callback( void *opaque, offset_t offset, int whence )
++static int64_t
++av_seek_callback( void *opaque, int64_t offset, int whence )
+ {
+      IFusionSoundMusicProvider_FFmpeg_data *data = opaque;
+      unsigned int                           pos  = 0;
diff --git a/media-libs/FusionSound/files/FusionSound-1.1.1-gcc43.patch b/media-libs/FusionSound/files/FusionSound-1.1.1-gcc43.patch
new file mode 100644
index 000000000000..5ebdfbcf1eeb
--- /dev/null
+++ b/media-libs/FusionSound/files/FusionSound-1.1.1-gcc43.patch
@@ -0,0 +1,40 @@
+--- src/fusionsound.c.old	2009-01-16 14:28:27.000000000 +0100
++++ src/fusionsound.c	2009-01-16 14:33:34.000000000 +0100
+@@ -116,7 +116,7 @@
+      return fs_config_set( name, value );
+ }
+ 
+-DirectResult
++DFBResult
+ FusionSoundCreate( IFusionSound **ret_interface )
+ {
+      DFBResult ret;
+@@ -160,8 +160,8 @@
+      return ret;
+ }
+ 
+-DirectResult
+-FusionSoundError( const char *msg, DirectResult error )
++DFBResult
++FusionSoundError( const char *msg, DFBResult error )
+ {
+      if (msg)
+           fprintf( stderr, "(#) FusionSound Error [%s]: %s\n", msg, DirectResultString( error ) );
+@@ -172,7 +172,7 @@
+ }
+ 
+ DFBResult
+-FusionSoundErrorFatal( const char *msg, DirectResult error )
++FusionSoundErrorFatal( const char *msg, DFBResult error )
+ {
+      FusionSoundError( msg, error );
+      
+@@ -180,7 +180,7 @@
+ }
+ 
+ const char *
+-FusionSoundErrorString( DirectResult error )
++FusionSoundErrorString( DFBResult error )
+ {
+      return DirectResultString( error );
+ }