Control: tags 888328 + pending Dear maintainer,
I've prepared an NMU for motion (versioned as 4.1.1-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru motion-4.1.1/debian/changelog motion-4.1.1/debian/changelog
--- motion-4.1.1/debian/changelog 2018-05-18 08:46:40.000000000 +0200
+++ motion-4.1.1/debian/changelog 2018-07-11 22:47:11.000000000 +0200
@@ -1,3 +1,10 @@
+motion (4.1.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches: Fix building with ffmpeg 4.0. (Closes: #888328)
+
+ -- Sebastian Ramacher <sramac...@debian.org> Wed, 11 Jul 2018 22:47:11 +0200
+
motion (4.1.1-1) unstable; urgency=medium
* New upstream release.
diff -Nru motion-4.1.1/debian/patches/ffmpeg4.0.patch motion-4.1.1/debian/patches/ffmpeg4.0.patch
--- motion-4.1.1/debian/patches/ffmpeg4.0.patch 1970-01-01 01:00:00.000000000 +0100
+++ motion-4.1.1/debian/patches/ffmpeg4.0.patch 2018-07-11 22:47:11.000000000 +0200
@@ -0,0 +1,49 @@
+From ff99988d57f4bcb0a7b381374f8106896bda2b15 Mon Sep 17 00:00:00 2001
+From: James Cowgill <jcowg...@jcowgill.uk>
+Date: Fri, 23 Feb 2018 23:04:33 +0000
+Subject: [PATCH] Fix build errors with FFmpeg 4.0
+
+---
+ ffmpeg.c | 19 ++++++++++++++++---
+ 1 file changed, 16 insertions(+), 3 deletions(-)
+
+--- a/ffmpeg.c
++++ b/ffmpeg.c
+@@ -68,6 +68,19 @@
+ #endif
+
+ /*********************************************/
++#if (LIBAVCODEC_VERSION_MAJOR >= 57)
++
++#define MY_CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
++#define MY_CODEC_FLAG_QSCALE AV_CODEC_FLAG_QSCALE
++
++#else
++
++#define MY_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
++#define MY_CODEC_FLAG_QSCALE CODEC_FLAG_QSCALE
++
++#endif
++
++/*********************************************/
+ AVFrame *my_frame_alloc(void){
+ AVFrame *pic;
+ #if (LIBAVFORMAT_VERSION_MAJOR >= 55)
+@@ -538,7 +551,7 @@
+ /* The selection of 8000 in the else is a subjective number based upon viewing output files */
+ if (ffmpeg->vbr > 0){
+ ffmpeg->vbr =(int)(((100-ffmpeg->vbr)*(100-ffmpeg->vbr)*(100-ffmpeg->vbr) * 8000) / 1000000) + 1;
+- ffmpeg->ctx_codec->flags |= CODEC_FLAG_QSCALE;
++ ffmpeg->ctx_codec->flags |= MY_CODEC_FLAG_QSCALE;
+ ffmpeg->ctx_codec->global_quality=ffmpeg->vbr;
+ }
+ }
+@@ -663,7 +676,7 @@
+ ffmpeg->ctx_codec->strict_std_compliance = -2;
+ ffmpeg->ctx_codec->level = 3;
+ }
+- ffmpeg->ctx_codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ ffmpeg->ctx_codec->flags |= MY_CODEC_FLAG_GLOBAL_HEADER;
+
+ retcd = ffmpeg_set_quality(ffmpeg);
+ if (retcd < 0){
diff -Nru motion-4.1.1/debian/patches/series motion-4.1.1/debian/patches/series
--- motion-4.1.1/debian/patches/series 2018-05-18 08:33:41.000000000 +0200
+++ motion-4.1.1/debian/patches/series 2018-07-11 22:46:49.000000000 +0200
@@ -1 +1,2 @@
change-paths_set-debian-paths.patch
+ffmpeg4.0.patch
signature.asc
Description: PGP signature
