Control: tags 888336 + patch Control: tags 888336 + pending Dear maintainer,
I've prepared an NMU for aubio (versioned as 0.4.5-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 aubio-0.4.5/debian/changelog aubio-0.4.5/debian/changelog
--- aubio-0.4.5/debian/changelog 2017-07-24 15:11:01.000000000 +0200
+++ aubio-0.4.5/debian/changelog 2018-07-11 20:52:59.000000000 +0200
@@ -1,3 +1,10 @@
+aubio (0.4.5-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches: Fix build with ffmpeg 4.0. (Closes: #888336)
+
+ -- Sebastian Ramacher <sramac...@debian.org> Wed, 11 Jul 2018 20:52:59 +0200
+
aubio (0.4.5-1) unstable; urgency=medium
* New upstream version 0.4.5
diff -Nru aubio-0.4.5/debian/patches/ffmpeg4.0.patch aubio-0.4.5/debian/patches/ffmpeg4.0.patch
--- aubio-0.4.5/debian/patches/ffmpeg4.0.patch 1970-01-01 01:00:00.000000000 +0100
+++ aubio-0.4.5/debian/patches/ffmpeg4.0.patch 2018-07-11 20:52:28.000000000 +0200
@@ -0,0 +1,25 @@
+From 5690daf759b473b9d13b4547ef37adc2695cf524 Mon Sep 17 00:00:00 2001
+From: James Cowgill <jcowg...@jcowgill.uk>
+Date: Sun, 25 Feb 2018 14:23:25 +0000
+Subject: [PATCH] Fix build with FFmpeg 4.0
+
+---
+ src/io/source_avcodec.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c
+index ccdce807..8197445c 100644
+--- a/src/io/source_avcodec.c
++++ b/src/io/source_avcodec.c
+@@ -58,7 +58,11 @@
+ #include "fmat.h"
+ #include "source_avcodec.h"
+
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 56, 0)
+ #define AUBIO_AVCODEC_MAX_BUFFER_SIZE FF_MIN_BUFFER_SIZE
++#else
++#define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
++#endif
+
+ struct _aubio_source_avcodec_t {
+ uint_t hop_size;
diff -Nru aubio-0.4.5/debian/patches/series aubio-0.4.5/debian/patches/series
--- aubio-0.4.5/debian/patches/series 2017-07-21 18:37:14.000000000 +0200
+++ aubio-0.4.5/debian/patches/series 2018-07-11 20:52:40.000000000 +0200
@@ -1 +1,2 @@
local_mathjax.patch
+ffmpeg4.0.patch
signature.asc
Description: PGP signature
