Hello community, here is the log from the commit of package lightspark for openSUSE:Factory checked in at 2012-06-06 16:08:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lightspark (Old) and /work/SRC/openSUSE:Factory/.lightspark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lightspark", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/lightspark/lightspark.changes 2012-05-29 14:14:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lightspark.new/lightspark.changes 2012-06-06 16:08:10.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 28 14:54:59 UTC 2012 - reddwarf@opensuse.org + +- Fix build with ffmpeg 0.11 + +------------------------------------------------------------------- New: ---- lightspark-0.5.7-ffmpeg_011.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightspark.spec ++++++ --- /var/tmp/diff_new_pack.LTIP4L/_old 2012-06-06 16:08:14.000000000 +0200 +++ /var/tmp/diff_new_pack.LTIP4L/_new 2012-06-06 16:08:14.000000000 +0200 @@ -30,6 +30,7 @@ Patch0: lightspark-0.5.7-underlinking.patch # PATCH-FIX-UPSTREAM lightspark-0.5.7-llvm_31.patch lp#980464 reddwarf@opensuse.org -- Fix build with LLVM 3.1. Took from GIT. Patch1: lightspark-0.5.7-llvm_31.patch +Patch2: lightspark-0.5.7-ffmpeg_011.patch BuildRequires: boost-devel BuildRequires: cmake BuildRequires: desktop-file-utils @@ -79,6 +80,7 @@ %setup -q %patch0 %patch1 +%patch2 %build export CFLAGS='%{optflags}' ++++++ lightspark-0.5.7-ffmpeg_011.patch ++++++ Index: src/backends/decoder.cpp =================================================================== --- src/backends/decoder.cpp.orig +++ src/backends/decoder.cpp @@ -628,8 +628,7 @@ StreamDecoder::~StreamDecoder() FFMpegStreamDecoder::FFMpegStreamDecoder(std::istream& s):stream(s),formatCtx(NULL),audioFound(false),videoFound(false),avioContext(NULL) { valid=false; - //NOTE: this will become avio_alloc_context in FFMpeg 0.7 - avioContext=av_alloc_put_byte(avioBuffer,4096,0,this,avioReadPacket,NULL,NULL); + avioContext=avio_alloc_context(avioBuffer,4096,0,this,avioReadPacket,NULL,NULL); if(avioContext==NULL) return; @@ -658,7 +657,8 @@ FFMpegStreamDecoder::FFMpegStreamDecoder if(fmt==NULL) return; - int ret=av_open_input_stream(&formatCtx, avioContext, "lightspark_stream", fmt, NULL); + formatCtx->pb = avioContext; + int ret=avformat_open_input(&formatCtx, "lightspark_stream", fmt, NULL); if(ret<0) return; @@ -706,7 +706,7 @@ FFMpegStreamDecoder::~FFMpegStreamDecode audioDecoder=NULL; videoDecoder=NULL; if(formatCtx) - av_close_input_stream(formatCtx); + av_close_input_file(formatCtx); if(avioContext) av_free(avioContext); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org