Bug#1004803: contextfree: diff for NMU version 3.3+dfsg1-1.1

[John Horigan]

Sebastian,

I see no reason to delay your NMU patch. I apologize for not handling this
bug in a timely manner. My Debian development system died and I am still a
few weeks away from getting a replacement. When I have a working Debian
system again I will confirm functionality with FFmpeg5.0 and migrate your
patch to upstream.

-- john

Bug#1004803: contextfree: diff for NMU version 3.3+dfsg1-1.1

[Sebastian Ramacher]

Control: tags 1004803 + patch
Control: tags 1004803 + pending

Dear maintainer,

I've prepared an NMU for contextfree (versioned as 3.3+dfsg1-1.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Cheers
-- 
Sebastian Ramacher
diff -Nru contextfree-3.3+dfsg1/debian/changelog contextfree-3.3+dfsg1/debian/changelog
--- contextfree-3.3+dfsg1/debian/changelog	2020-03-12 20:44:17.0 +0100
+++ contextfree-3.3+dfsg1/debian/changelog	2022-02-27 17:03:40.0 +0100
@@ -1,3 +1,10 @@
+contextfree (3.3+dfsg1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches: Fix build with ffmpeg 5.0 (Closes: #1004803)
+
+ -- Sebastian Ramacher   Sun, 27 Feb 2022 17:03:40 +0100
+
 contextfree (3.3+dfsg1-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru contextfree-3.3+dfsg1/debian/patches/ffmpeg5.0.patch contextfree-3.3+dfsg1/debian/patches/ffmpeg5.0.patch
--- contextfree-3.3+dfsg1/debian/patches/ffmpeg5.0.patch	1970-01-01 01:00:00.0 +0100
+++ contextfree-3.3+dfsg1/debian/patches/ffmpeg5.0.patch	2022-02-27 16:52:03.0 +0100
@@ -0,0 +1,12 @@
+--- contextfree-3.3+dfsg1.orig/src-common/ffCanvas.cpp
 contextfree-3.3+dfsg1/src-common/ffCanvas.cpp
+@@ -161,6 +161,9 @@ ffCanvas::Impl::Impl(const char* name, P
+ return;
+ }
+ 
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59, 0, 0)
++const
++#endif
+ AVCodec *codec = my_avcodec_find_encoder_by_name(_codec ? "prores_ks" : "libx264");
+ if (!codec) {
+ mError = "codec not found";
diff -Nru contextfree-3.3+dfsg1/debian/patches/series contextfree-3.3+dfsg1/debian/patches/series
--- contextfree-3.3+dfsg1/debian/patches/series	2020-03-12 20:44:17.0 +0100
+++ contextfree-3.3+dfsg1/debian/patches/series	2022-02-27 16:51:59.0 +0100
@@ -2,3 +2,4 @@
 02_use_external_libagg.patch
 03_use_dh_strip.patch
 04_enable_ffmpeg.patch
+ffmpeg5.0.patch


signature.asc
Description: PGP signature