| 1 |
ssuominen 09/06/05 21:27:05 |
| 2 |
|
| 3 |
Added: FusionSound-1.1.1-gcc43.patch |
| 4 |
FusionSound-1.1.1-ffmpeg.patch |
| 5 |
Log: |
| 6 |
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. |
| 7 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-libs/FusionSound/files/FusionSound-1.1.1-gcc43.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/FusionSound/files/FusionSound-1.1.1-gcc43.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/FusionSound/files/FusionSound-1.1.1-gcc43.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: FusionSound-1.1.1-gcc43.patch |
| 16 |
=================================================================== |
| 17 |
--- src/fusionsound.c.old 2009-01-16 14:28:27.000000000 +0100 |
| 18 |
+++ src/fusionsound.c 2009-01-16 14:33:34.000000000 +0100 |
| 19 |
@@ -116,7 +116,7 @@ |
| 20 |
return fs_config_set( name, value ); |
| 21 |
} |
| 22 |
|
| 23 |
-DirectResult |
| 24 |
+DFBResult |
| 25 |
FusionSoundCreate( IFusionSound **ret_interface ) |
| 26 |
{ |
| 27 |
DFBResult ret; |
| 28 |
@@ -160,8 +160,8 @@ |
| 29 |
return ret; |
| 30 |
} |
| 31 |
|
| 32 |
-DirectResult |
| 33 |
-FusionSoundError( const char *msg, DirectResult error ) |
| 34 |
+DFBResult |
| 35 |
+FusionSoundError( const char *msg, DFBResult error ) |
| 36 |
{ |
| 37 |
if (msg) |
| 38 |
fprintf( stderr, "(#) FusionSound Error [%s]: %s\n", msg, DirectResultString( error ) ); |
| 39 |
@@ -172,7 +172,7 @@ |
| 40 |
} |
| 41 |
|
| 42 |
DFBResult |
| 43 |
-FusionSoundErrorFatal( const char *msg, DirectResult error ) |
| 44 |
+FusionSoundErrorFatal( const char *msg, DFBResult error ) |
| 45 |
{ |
| 46 |
FusionSoundError( msg, error ); |
| 47 |
|
| 48 |
@@ -180,7 +180,7 @@ |
| 49 |
} |
| 50 |
|
| 51 |
const char * |
| 52 |
-FusionSoundErrorString( DirectResult error ) |
| 53 |
+FusionSoundErrorString( DFBResult error ) |
| 54 |
{ |
| 55 |
return DirectResultString( error ); |
| 56 |
} |
| 57 |
|
| 58 |
|
| 59 |
|
| 60 |
1.1 media-libs/FusionSound/files/FusionSound-1.1.1-ffmpeg.patch |
| 61 |
|
| 62 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/FusionSound/files/FusionSound-1.1.1-ffmpeg.patch?rev=1.1&view=markup |
| 63 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/FusionSound/files/FusionSound-1.1.1-ffmpeg.patch?rev=1.1&content-type=text/plain |
| 64 |
|
| 65 |
Index: FusionSound-1.1.1-ffmpeg.patch |
| 66 |
=================================================================== |
| 67 |
diff -Naurp FusionSound-1.1.1-original/configure.in FusionSound-1.1.1/configure.in |
| 68 |
--- FusionSound-1.1.1-original/configure.in 2008-02-11 05:31:45.000000000 -0600 |
| 69 |
+++ FusionSound-1.1.1/configure.in 2009-04-10 15:18:02.000000000 -0600 |
| 70 |
@@ -513,11 +513,11 @@ AC_ARG_WITH(ffmpeg, |
| 71 |
|
| 72 |
if test "x$with_ffmpeg" = "xyes"; then |
| 73 |
AC_MSG_CHECKING([for libavcodec/libavformat]) |
| 74 |
- if $PKG_CONFIG libavcodec libavformat; then |
| 75 |
+ if $PKG_CONFIG libavcodec libavformat libavutil; then |
| 76 |
AC_MSG_RESULT(yes) |
| 77 |
ffmpeg="yes" |
| 78 |
- FFMPEG_CFLAGS=`$PKG_CONFIG --cflags libavcodec libavformat` |
| 79 |
- FFMPEG_LIBS=`$PKG_CONFIG --libs libavcodec libavformat` |
| 80 |
+ FFMPEG_CFLAGS=`$PKG_CONFIG --cflags libavcodec libavformat libavutil` |
| 81 |
+ FFMPEG_LIBS=`$PKG_CONFIG --libs libavcodec libavformat libavutil` |
| 82 |
else |
| 83 |
AC_MSG_RESULT(no) |
| 84 |
AC_MSG_WARN([ |
| 85 |
diff -Naurp FusionSound-1.1.1-original/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c FusionSound-1.1.1/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c |
| 86 |
--- FusionSound-1.1.1-original/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c 2008-02-11 05:31:45.000000000 -0600 |
| 87 |
+++ FusionSound-1.1.1/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c 2009-04-10 15:18:21.000000000 -0600 |
| 88 |
@@ -41,8 +41,8 @@ |
| 89 |
|
| 90 |
#include <misc/sound_util.h> |
| 91 |
|
| 92 |
-#include <avcodec.h> |
| 93 |
-#include <avformat.h> |
| 94 |
+#include <libavcodec/avcodec.h> |
| 95 |
+#include <libavformat/avformat.h> |
| 96 |
|
| 97 |
static DFBResult |
| 98 |
Probe( IFusionSoundMusicProvider_ProbeContext *ctx ); |
| 99 |
@@ -123,8 +123,8 @@ av_read_callback( void *opaque, uint8_t |
| 100 |
return len; |
| 101 |
} |
| 102 |
|
| 103 |
-static offset_t |
| 104 |
-av_seek_callback( void *opaque, offset_t offset, int whence ) |
| 105 |
+static int64_t |
| 106 |
+av_seek_callback( void *opaque, int64_t offset, int whence ) |
| 107 |
{ |
| 108 |
IFusionSoundMusicProvider_FFmpeg_data *data = opaque; |
| 109 |
unsigned int pos = 0; |
Archives