Control: tags 803837 + pending Dear maintainer,
I've prepared an NMU for lightspark (versioned as 0.7.2+git20150512-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- Sebastian Ramacher
diff -Nru lightspark-0.7.2+git20150512/debian/changelog lightspark-0.7.2+git20150512/debian/changelog
--- lightspark-0.7.2+git20150512/debian/changelog 2015-07-15 17:21:27.000000000 +0200
+++ lightspark-0.7.2+git20150512/debian/changelog 2016-03-08 23:54:01.000000000 +0100
@@ -1,3 +1,12 @@
+lightspark (0.7.2+git20150512-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Andreas Cadhalpun ]
+ * Fix build with ffmpeg 3.0. (Closes: #803837)
+
+ -- Sebastian Ramacher <sramac...@debian.org> Tue, 08 Mar 2016 23:54:00 +0100
+
lightspark (0.7.2+git20150512-2) unstable; urgency=medium
* Run dpkg-vendor at build time (Closes: #790807).
diff -Nru lightspark-0.7.2+git20150512/debian/patches/ffmpeg_2.9.patch lightspark-0.7.2+git20150512/debian/patches/ffmpeg_2.9.patch
--- lightspark-0.7.2+git20150512/debian/patches/ffmpeg_2.9.patch 1970-01-01 01:00:00.000000000 +0100
+++ lightspark-0.7.2+git20150512/debian/patches/ffmpeg_2.9.patch 2016-03-08 23:53:29.000000000 +0100
@@ -0,0 +1,105 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
+Last-Update: <2015-11-02>
+
+--- lightspark-0.7.2+git20150512.orig/src/backends/decoder.cpp
++++ lightspark-0.7.2+git20150512/src/backends/decoder.cpp
+@@ -166,7 +166,7 @@ FFMpegVideoDecoder::FFMpegVideoDecoder(L
+ else
+ status=INIT;
+
+- frameIn=avcodec_alloc_frame();
++ frameIn=av_frame_alloc();
+ }
+
+ FFMpegVideoDecoder::FFMpegVideoDecoder(AVCodecContext* _c, double frameRateHint):
+@@ -201,7 +201,7 @@ FFMpegVideoDecoder::FFMpegVideoDecoder(A
+ if(fillDataAndCheckValidity())
+ status=VALID;
+
+- frameIn=avcodec_alloc_frame();
++ frameIn=av_frame_alloc();
+ }
+
+ FFMpegVideoDecoder::~FFMpegVideoDecoder()
+@@ -210,7 +210,7 @@ FFMpegVideoDecoder::~FFMpegVideoDecoder(
+ avcodec_close(codecContext);
+ if(ownedContext)
+ av_free(codecContext);
+- av_free(frameIn);
++ av_frame_free(&frameIn);
+ }
+
+ //setSize is called from the routine that inserts new frames
+@@ -274,7 +274,7 @@ bool FFMpegVideoDecoder::decodeData(uint
+ assert_and_throw(ret==(int)datalen);
+ if(frameOk)
+ {
+- assert(codecContext->pix_fmt==PIX_FMT_YUV420P);
++ assert(codecContext->pix_fmt==AV_PIX_FMT_YUV420P);
+
+ if(status==INIT && fillDataAndCheckValidity())
+ status=VALID;
+@@ -301,7 +301,7 @@ bool FFMpegVideoDecoder::decodePacket(AV
+ assert_and_throw(ret==(int)pkt->size);
+ if(frameOk)
+ {
+- assert(codecContext->pix_fmt==PIX_FMT_YUV420P);
++ assert(codecContext->pix_fmt==AV_PIX_FMT_YUV420P);
+
+ if(status==INIT && fillDataAndCheckValidity())
+ status=VALID;
+@@ -476,7 +476,7 @@ FFMpegAudioDecoder::FFMpegAudioDecoder(L
+ else
+ status=INIT;
+ #if HAVE_AVCODEC_DECODE_AUDIO4
+- frameIn=avcodec_alloc_frame();
++ frameIn=av_frame_alloc();
+ #endif
+ }
+
+@@ -502,7 +502,7 @@ FFMpegAudioDecoder::FFMpegAudioDecoder(L
+ if(fillDataAndCheckValidity())
+ status=VALID;
+ #if HAVE_AVCODEC_DECODE_AUDIO4
+- frameIn=avcodec_alloc_frame();
++ frameIn=av_frame_alloc();
+ #endif
+ }
+
+@@ -522,7 +522,7 @@ FFMpegAudioDecoder::FFMpegAudioDecoder(A
+ if(fillDataAndCheckValidity())
+ status=VALID;
+ #if HAVE_AVCODEC_DECODE_AUDIO4
+- frameIn=avcodec_alloc_frame();
++ frameIn=av_frame_alloc();
+ #endif
+ }
+
+@@ -532,7 +532,7 @@ FFMpegAudioDecoder::~FFMpegAudioDecoder(
+ if(ownedContext)
+ av_free(codecContext);
+ #if HAVE_AVCODEC_DECODE_AUDIO4
+- av_free(frameIn);
++ av_frame_free(&frameIn);
+ #endif
+ }
+
+@@ -607,7 +607,7 @@ uint32_t FFMpegAudioDecoder::decodeData(
+ }
+
+ #if HAVE_AVCODEC_DECODE_AUDIO4
+- avcodec_get_frame_defaults(frameIn);
++ av_frame_unref(frameIn);
+ int frameOk=0;
+ int32_t ret=avcodec_decode_audio4(codecContext, frameIn, &frameOk, &pkt);
+ if(frameOk==0)
+@@ -664,7 +664,7 @@ uint32_t FFMpegAudioDecoder::decodePacke
+ int maxLen=AVCODEC_MAX_AUDIO_FRAME_SIZE;
+
+ #if HAVE_AVCODEC_DECODE_AUDIO4
+- avcodec_get_frame_defaults(frameIn);
++ av_frame_unref(frameIn);
+ int frameOk=0;
+ int ret=avcodec_decode_audio4(codecContext, frameIn, &frameOk, pkt);
+ if(frameOk==0)
diff -Nru lightspark-0.7.2+git20150512/debian/patches/series lightspark-0.7.2+git20150512/debian/patches/series
--- lightspark-0.7.2+git20150512/debian/patches/series 2015-07-15 17:21:27.000000000 +0200
+++ lightspark-0.7.2+git20150512/debian/patches/series 2016-03-08 23:53:29.000000000 +0100
@@ -3,3 +3,4 @@
#fix-for-llvm35.patch
#libav10.patch
assert.patch
+ffmpeg_2.9.patch
signature.asc
Description: PGP signature
