Author: qboosh Date: Wed Mar 30 18:13:10 2011 GMT Module: packages Tag: HEAD ---- Log message: - added ffmpeg patch, build with system ffmpeg (0.6.2 build-tested)
---- Files affected: packages/gpac: gpac.spec (1.30 -> 1.31) , gpac-ffmpeg.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/gpac/gpac.spec diff -u packages/gpac/gpac.spec:1.30 packages/gpac/gpac.spec:1.31 --- packages/gpac/gpac.spec:1.30 Mon Mar 28 19:39:49 2011 +++ packages/gpac/gpac.spec Wed Mar 30 20:13:05 2011 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# TODO -# - FFMPEG: local # # Conditional build: %bcond_with amr # AMR-NB and AMR-WB (floating-point) support @@ -18,7 +16,7 @@ Summary(pl.UTF-8): GPAC - implementacja standardu MPEG-4 Systems (ISO/IEC 14496-1) Name: gpac Version: 0.4.5 -Release: 0.2 +Release: 0.3 License: LGPL v2+ Group: Applications/Multimedia Source0: http://downloads.sourceforge.net/gpac/%{name}-%{version}.tar.gz @@ -28,6 +26,7 @@ Patch2: %{name}-pic.patch Patch3: %{name}-xulrunner.patch Patch4: %{name}-amr.patch +Patch5: %{name}-ffmpeg.patch URL: http://gpac.sourceforge.net/ BuildRequires: SDL-devel BuildRequires: a52dec-libs-devel @@ -35,7 +34,7 @@ %{?with_amr:BuildRequires: amrnb-devel} %{?with_amr:BuildRequires: amrwb-devel} %{?with_faad:BuildRequires: faad2-devel} -%{?with_ffmpeg:BuildRequires: ffmpeg-devel} +%{?with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.6} %{?with_freetype:BuildRequires: freetype-devel} BuildRequires: jack-audio-connection-kit-devel %{?with_js:BuildRequires: js-devel} @@ -123,6 +122,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %if %{with amr} sed -i -e 's/amr_\([nw]b\)_ft/amr\1/' modules/amr_float_dec/amr_float_dec.c @@ -211,6 +211,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.31 2011/03/30 18:13:05 qboosh +- added ffmpeg patch, build with system ffmpeg (0.6.2 build-tested) + Revision 1.30 2011/03/28 17:39:49 qboosh - dropped outdated wxWidgets patch, use sed call to set wx-config path; enabled by default, packaged in -gui ================================================================ Index: packages/gpac/gpac-ffmpeg.patch diff -u /dev/null packages/gpac/gpac-ffmpeg.patch:1.1 --- /dev/null Wed Mar 30 20:13:10 2011 +++ packages/gpac/gpac-ffmpeg.patch Wed Mar 30 20:13:05 2011 @@ -0,0 +1,50 @@ +--- gpac/modules/ffmpeg_in/ffmpeg_in.h.orig 2008-10-20 13:04:40.000000000 +0200 ++++ gpac/modules/ffmpeg_in/ffmpeg_in.h 2011-03-28 19:44:02.765729730 +0200 +@@ -56,14 +56,14 @@ + + + /*include FFMPEG APIs*/ +-#include <ffmpeg/avformat.h> ++#include <libavformat/avformat.h> + + void gf_av_vlog(void* avcl, int level, const char *fmt, va_list vl); + + + #if LIBAVCODEC_VERSION_INT > ((52<<16)+(0<<8)+0) + #define FFMPEG_SWSCALE +-#include <ffmpeg/swscale.h> ++#include <libswscale/swscale.h> + #endif + + /*FFMPEG decoder module */ +--- gpac/configure.orig 2011-03-27 21:38:49.493737273 +0200 ++++ gpac/configure 2011-03-28 19:44:22.401729730 +0200 +@@ -732,7 +732,7 @@ fi + #look for FFMPEG support + cat > $TMPC << EOF + #include <stddef.h> +-#include <ffmpeg/avcodec.h> ++#include <libavcodec/avcodec.h> + int main( void ) { return 0; } + EOF + +--- gpac/modules/ffmpeg_in/ffmpeg_decode.c.orig 2008-11-28 18:26:06.000000000 +0100 ++++ gpac/modules/ffmpeg_in/ffmpeg_decode.c 2011-03-28 20:33:19.441729730 +0200 +@@ -241,7 +241,7 @@ + + /*setup audio streams*/ + if (ffd->st==GF_STREAM_AUDIO) { +- if ((ffd->codec->type == CODEC_ID_MP3LAME) || (ffd->codec->type == CODEC_ID_MP2)) { ++ if ((ffd->codec->type == CODEC_ID_MP3) || (ffd->codec->type == CODEC_ID_MP2)) { + ffd->ctx->frame_size = (ffd->ctx->sample_rate > 24000) ? 1152 : 576; + } + /*may be 0 (cfg not known yet)*/ +@@ -643,7 +643,7 @@ + NULL, NULL, NULL); + + if (ffd->sws_ctx) +- sws_scale(ffd->sws_ctx, ffd->frame->data, ffd->frame->linesize, 0, ffd->ctx->height->codec->height, pict.data, pict.linesize); ++ sws_scale(ffd->sws_ctx, ffd->frame->data, ffd->frame->linesize, 0, ffd->ctx->height, pict.data, pict.linesize); + + #endif + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gpac/gpac.spec?r1=1.30&r2=1.31&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
