Author: qboosh Date: Fri Jun 22 19:13:46 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.6.0
- removed obsolete git,leck,compile,update patches
- updated ffmpeg patch (few parts obsolete, few more needed for ffmpeg 0.8
through 0.11 compatibility)
---- Files affected:
packages/FusionSound:
FusionSound-ffmpeg.patch (1.1 -> 1.2) , FusionSound.spec (1.24 -> 1.25) ,
FusionSound-git.patch (1.1 -> NONE) (REMOVED), FusionSound-leck.patch (1.1 ->
NONE) (REMOVED), FusionSound-update.patch (1.2 -> NONE) (REMOVED),
compile.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/FusionSound/FusionSound-ffmpeg.patch
diff -u packages/FusionSound/FusionSound-ffmpeg.patch:1.1
packages/FusionSound/FusionSound-ffmpeg.patch:1.2
--- packages/FusionSound/FusionSound-ffmpeg.patch:1.1 Sun Sep 11 20:23:52 2011
+++ packages/FusionSound/FusionSound-ffmpeg.patch Fri Jun 22 21:13:41 2012
@@ -9,39 +9,6 @@
AVFormatContext *ctx;
AVStream *st;
void *iobuf;
-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 );
-
---
FusionSound-1.1.1.org/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c
2011-09-11 20:21:02.521648411 +0200
+++
FusionSound-1.1.1/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c
2011-09-11 20:20:22.216456936 +0200
@@ -41,6 +41,7 @@
@@ -128,3 +95,78 @@
if (!data->st || data->st->codec->bit_rate <
data->ctx->streams[i]->codec->bit_rate)
data->st = data->ctx->streams[i];
}
+---
FusionSound-1.6.0/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c.orig
2012-06-19 21:43:14.057077681 +0200
++++
FusionSound-1.6.0/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c
2012-06-22 17:46:15.046796804 +0200
+@@ -1208,16 +1208,17 @@
+ return D_OOM();
+ }
+
+- if (init_put_byte( &data->pb, data->iobuf, 4096, 0,
++ if (ffio_init_context( &data->pb, data->iobuf, 4096, 0,
+ (void*)data, av_read_callback, NULL,
+ direct_stream_seekable( stream ) ? av_seek_callback :
NULL ) < 0) {
+- D_ERROR( "IFusionSoundMusicProvider_FFmpeg: init_put_byte()
failed!\n" );
++ D_ERROR( "IFusionSoundMusicProvider_FFmpeg: ffio_init_context()
failed!\n" );
+ IFusionSoundMusicProvider_FFmpeg_Destruct( thiz );
+ return DR_INIT;
+ }
+
+- if (av_open_input_stream( &data->ctx, &data->pb, filename, fmt, NULL ) <
0) {
+- D_ERROR( "IFusionSoundMusicProvider_FFmpeg: av_open_input_stream()
failed!\n" );
++ data->ctx->pb = &data->pb;
++ if (avformat_open_input( &data->ctx, filename, fmt, NULL ) < 0) {
++ D_ERROR( "IFusionSoundMusicProvider_FFmpeg: avformat_open_input()
failed!\n" );
+ IFusionSoundMusicProvider_FFmpeg_Destruct( thiz );
+ return DR_FAILURE;
+ }
+---
FusionSound-1.6.0/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c.orig
2012-06-22 19:05:38.449930237 +0200
++++
FusionSound-1.6.0/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c
2012-06-22 20:12:51.699760976 +0200
+@@ -65,7 +65,7 @@
+
+ DirectStream *stream;
+
+- AVIOContext pb;
++ AVIOContext *pb;
+ AVFormatContext *ctx;
+ AVStream *st;
+ void *iobuf;
+@@ -424,6 +424,9 @@
+ }
+ }
+
++ if (data->pb)
++ av_free( data->pb);
++
+ if (data->iobuf)
+ D_FREE( data->iobuf );
+
+@@ -1208,15 +1211,24 @@
+ return D_OOM();
+ }
+
+- if (ffio_init_context( &data->pb, data->iobuf, 4096, 0,
++ if ((data->pb = avio_alloc_context( data->iobuf, 4096, 0,
+ (void*)data, av_read_callback, NULL,
+- direct_stream_seekable( stream ) ? av_seek_callback :
NULL ) < 0) {
+- D_ERROR( "IFusionSoundMusicProvider_FFmpeg: ffio_init_context()
failed!\n" );
++ direct_stream_seekable( stream ) ? av_seek_callback :
NULL )) == NULL) {
++ D_ERROR( "IFusionSoundMusicProvider_FFmpeg: avio_alloc_context()
failed!\n" );
+ IFusionSoundMusicProvider_FFmpeg_Destruct( thiz );
+ return DR_INIT;
+ }
+-
+- data->ctx->pb = &data->pb;
++
++ if(data->ctx == NULL) {
++ data->ctx = avformat_alloc_context();
++ if (data->ctx == NULL) {
++ D_ERROR( "IFusionSoundMusicProvider_FFmpeg:
avformat_alloc_context() failed!\n" );
++ IFusionSoundMusicProvider_FFmpeg_Destruct( thiz );
++ return DR_FAILURE;
++ }
++ }
++
++ data->ctx->pb = data->pb;
+ if (avformat_open_input( &data->ctx, filename, fmt, NULL ) < 0) {
+ D_ERROR( "IFusionSoundMusicProvider_FFmpeg: avformat_open_input()
failed!\n" );
+ IFusionSoundMusicProvider_FFmpeg_Destruct( thiz );
================================================================
Index: packages/FusionSound/FusionSound.spec
diff -u packages/FusionSound/FusionSound.spec:1.24
packages/FusionSound/FusionSound.spec:1.25
--- packages/FusionSound/FusionSound.spec:1.24 Sun Feb 12 09:19:01 2012
+++ packages/FusionSound/FusionSound.spec Fri Jun 22 21:13:41 2012
@@ -2,36 +2,32 @@
Summary: Audio sub system for multiple applications
Summary(pl.UTF-8): Dźwiękowy podsystem dla złożonych aplikacji
Name: FusionSound
-Version: 1.1.1
-Release: 9
+Version: 1.6.0
+Release: 1
License: LGPL v2+
Group: Libraries
-Source0: http://www.directfb.org/downloads/Core/%{name}-%{version}.tar.gz
-# Source0-md5: f29b0e6bb693e59b7303c163c737a39b
+Source0:
http://www.directfb.org/downloads/Core/FusionSound/%{name}-%{version}.tar.gz
+# Source0-md5: 018f7759e48ad9e07c4d34b93479482d
Patch0: %{name}-conf.patch
-Patch1: %{name}-git.patch
-Patch2: %{name}-leck.patch
-Patch3: compile.patch
-Patch4: %{name}-update.patch
-Patch5: %{name}-ffmpeg.patch
+Patch1: %{name}-ffmpeg.patch
URL: http://www.directfb.org/index.php?path=Platform/FusionSound
-BuildRequires: DirectFB-devel >= 1:1.4.15
+BuildRequires: DirectFB-devel >= 1:1.6.0
# for examples
BuildRequires: LiTE-devel >= 0.8.9
BuildRequires: alsa-lib-devel >= 0.9
BuildRequires: autoconf >= 2.52
BuildRequires: automake
-BuildRequires: ffmpeg-devel >= 0.4.9-4.20080822
+BuildRequires: ffmpeg-devel >= 0.8
BuildRequires: libcddb-devel >= 1.0.0
BuildRequires: libmad-devel
BuildRequires: libtimidity-devel >= 0.1.0
BuildRequires: libtool
BuildRequires: libvorbis-devel >= 1:1.0.0
BuildRequires: pkgconfig >= 1:0.9
-Requires: DirectFB >= 1:1.4.15
+Requires: DirectFB >= 1:1.6.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define dfblibdir %{_libdir}/directfb-1.4-6
+%define dfblibdir %{_libdir}/directfb-1.6-0
%description
FusionSound supports multiple applications using Fusion IPC. It
@@ -52,7 +48,7 @@
Summary(pl.UTF-8): Pliki rozwojowe dla FusionSound
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: DirectFB-devel >= 1:1.4.15
+Requires: DirectFB-devel >= 1:1.6.0
%description devel
Header files required for development using FusionSound.
@@ -138,10 +134,6 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%build
%{__libtoolize}
@@ -151,8 +143,7 @@
%{__automake}
%configure \
--enable-static
-%{__make} \
- FFMPEG_CFLAGS="-I/usr/include/libavcodec -I/usr/include/libavformat"
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
@@ -177,8 +168,8 @@
%attr(755,root,root) %{_bindir}/fsplay
%attr(755,root,root) %{_bindir}/fsproxy
%attr(755,root,root) %{_bindir}/fsvolume
-%attr(755,root,root) %{_libdir}/libfusionsound-1.1.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfusionsound-1.1.so.1
+%attr(755,root,root) %{_libdir}/libfusionsound-1.6.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfusionsound-1.6.so.0
%dir %{dfblibdir}/interfaces/IFusionSound
%attr(755,root,root) %{dfblibdir}/interfaces/IFusionSound/libifusionsound.so
%attr(755,root,root)
%{dfblibdir}/interfaces/IFusionSound/libifusionsound_dispatcher.so
@@ -248,6 +239,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.25 2012/06/22 19:13:41 qboosh
+- updated to 1.6.0
+- removed obsolete git,leck,compile,update patches
+- updated ffmpeg patch (few parts obsolete, few more needed for ffmpeg 0.8
through 0.11 compatibility)
+
Revision 1.24 2012/02/12 08:19:01 arekm
- release 9
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/FusionSound/FusionSound-ffmpeg.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/FusionSound/FusionSound.spec?r1=1.24&r2=1.25
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
