Control: tags 803840 + pending

Dear maintainer,

I've prepared an NMU for lynkeos.app (versioned as 1.2-7.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
Sebastian Ramacher
diff -Nru lynkeos.app-1.2/debian/changelog lynkeos.app-1.2/debian/changelog
--- lynkeos.app-1.2/debian/changelog	2014-10-25 21:16:04.000000000 +0200
+++ lynkeos.app-1.2/debian/changelog	2016-03-06 22:46:16.000000000 +0100
@@ -1,3 +1,12 @@
+lynkeos.app (1.2-7.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Andreas Cadhalpun ]
+  * Fix build with ffmpeg 3.0. (Closes: #803840)
+
+ -- Sebastian Ramacher <sramac...@debian.org>  Sun, 06 Mar 2016 22:46:15 +0100
+
 lynkeos.app (1.2-7) unstable; urgency=medium
 
   * Ack NMUs, thanks Sebastian Ramacher and Moritz Muehlenhoff.
diff -Nru lynkeos.app-1.2/debian/patches/ffmpeg_2.9.patch lynkeos.app-1.2/debian/patches/ffmpeg_2.9.patch
--- lynkeos.app-1.2/debian/patches/ffmpeg_2.9.patch	1970-01-01 01:00:00.000000000 +0100
+++ lynkeos.app-1.2/debian/patches/ffmpeg_2.9.patch	2016-03-06 22:45:30.000000000 +0100
@@ -0,0 +1,28 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
+Last-Update: <2015-11-02>
+
+--- lynkeos.app-1.2.orig/Sources/ffmpeg_access.c
++++ lynkeos.app-1.2/Sources/ffmpeg_access.c
+@@ -59,7 +59,7 @@ int ffmpegNextFrame(FfmpegMovie* movie){
+ int ffmpegConvertCurrentFrame (FfmpegMovie* movie)
+ {
+   img_convert_ctx = sws_getContext (movie->pCodecCtx->width,
+-				    movie->pCodecCtx->height, PIX_FMT_RGB24,
++				    movie->pCodecCtx->height, AV_PIX_FMT_RGB24,
+ 				    movie->pCodecCtx->width,
+ 				    movie->pCodecCtx->height,
+ 				    movie->pCodecCtx->pix_fmt, SWS_BICUBIC,
+@@ -309,10 +309,10 @@ int ffmpegLoadMovie(const char* movieNam
+     pFrameRGB=av_frame_alloc();
+ 
+     // Determine required buffer size and allocate buffer
+-    numBytes=avpicture_get_size(PIX_FMT_RGB24, pCodecCtx->width,pCodecCtx->height);
++    numBytes=avpicture_get_size(AV_PIX_FMT_RGB24, pCodecCtx->width,pCodecCtx->height);
+     buffer = (uint8_t*) malloc(sizeof(uint8_t)*numBytes);
+     // Assign appropriate parts of buffer to image planes in pFrameRGB
+-    avpicture_fill((AVPicture *)pFrameRGB, buffer, PIX_FMT_RGB24,pCodecCtx->width, pCodecCtx->height);
++    avpicture_fill((AVPicture *)pFrameRGB, buffer, AV_PIX_FMT_RGB24,pCodecCtx->width, pCodecCtx->height);
+     
+     resultMovie->pFormatCtx = pFormatCtx;
+     resultMovie->pCodecCtx = pCodecCtx;
diff -Nru lynkeos.app-1.2/debian/patches/series lynkeos.app-1.2/debian/patches/series
--- lynkeos.app-1.2/debian/patches/series	2014-10-25 21:16:04.000000000 +0200
+++ lynkeos.app-1.2/debian/patches/series	2016-03-06 22:45:30.000000000 +0100
@@ -9,3 +9,4 @@
 libav-10.patch
 format-security.patch
 gcc-warnings.patch
+ffmpeg_2.9.patch

Attachment: signature.asc
Description: PGP signature

Reply via email to