[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1042395: casparcg-server: diff for NMU version 2.3.3+dfsg-3.1

Control: tags 1042395 + patch
Control: tags 1042395 + pending

Dear maintainer,

I've prepared an NMU for casparcg-server (versioned as 2.3.3+dfsg-3.1) and
uploaded it.

Regards.

diff -Nru casparcg-server-2.3.3+dfsg/debian/changelog casparcg-server-2.3.3+dfsg/debian/changelog
--- casparcg-server-2.3.3+dfsg/debian/changelog 2022-09-02 17:30:00.000000000 +0200
+++ casparcg-server-2.3.3+dfsg/debian/changelog 2023-10-10 09:13:09.000000000 +0200
@@ -1,3 +1,13 @@
+casparcg-server (2.3.3+dfsg-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Nick Rosbrook <enr0n@ubuntu.com> ]
+  * debian/patches: add use-renamed-AV_CODEC_CAP_OTHER_THREADS.patch
+    This fixes FTBFS against ffmpeg 6.0 (LP: #2034959, Closes: #1042395)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 10 Oct 2023 09:13:09 +0200
+
 casparcg-server (2.3.3+dfsg-3) unstable; urgency=medium

   [ Filip Hanes ]
diff -Nru casparcg-server-2.3.3+dfsg/debian/patches/series casparcg-server-2.3.3+dfsg/debian/patches/series
--- casparcg-server-2.3.3+dfsg/debian/patches/series    2022-08-31 16:43:35.000000000 +0200
+++ casparcg-server-2.3.3+dfsg/debian/patches/series    2023-10-10 09:09:47.000000000 +0200
@@ -4,3 +4,4 @@
 0004-fix-shader-frag.patch
 1001-cmake-ftbfs.patch
 1002-arm64-compatibility.patch
+use-renamed-AV_CODEC_CAP_OTHER_THREADS.patch
diff -Nru casparcg-server-2.3.3+dfsg/debian/patches/use-renamed-AV_CODEC_CAP_OTHER_THREADS.patch casparcg-server-2.3.3+dfsg/debian/patches/use-renamed-AV_CODEC_CAP_OTHER_THREADS.patch
--- casparcg-server-2.3.3+dfsg/debian/patches/use-renamed-AV_CODEC_CAP_OTHER_THREADS.patch      1970-01-01 01:00:00.000000000 +0100
+++ casparcg-server-2.3.3+dfsg/debian/patches/use-renamed-AV_CODEC_CAP_OTHER_THREADS.patch      2023-10-10 09:09:47.000000000 +0200
@@ -0,0 +1,18 @@
+Description: Use AV_CODEC_CAP_OTHER_THREADS instead of AV_CODEC_CAP_AUTO_THREADS
+ This flag was renamed in libavcodec: https://github.com/FFmpeg/FFmpeg/blob/n6.0/doc/APIchanges#L436-L439.
+Author: Nick Rosbrook <enr0n@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/casparcg-server/+bug/2034959
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1042395
+Forwarded: https://salsa.debian.org/multimedia-team/casparcg-server/-/merge_requests/5
+Last-Update: 2023-09-08
+--- a/src/modules/ffmpeg/producer/av_producer.cpp
++++ b/src/modules/ffmpeg/producer/av_producer.cpp
+@@ -106,7 +106,7 @@
+         FF(av_opt_set_int(ctx.get(), "refcounted_frames", 1, 0));
+
+         int numThreads = 1;
+-        if (codec->capabilities & AV_CODEC_CAP_AUTO_THREADS) {
++        if (codec->capabilities & AV_CODEC_CAP_OTHER_THREADS) {
+             numThreads = 0;
+         } else if (codec->capabilities & AV_CODEC_CAP_SLICE_THREADS) {
+             numThreads = std::min<int>(8, std::thread::hardware_concurrency() / 2);


On Thu, 27 Jul 2023 16:13:45 +0300 Adrian Bunk <bunk@debian.org> wrote:

Source: casparcg-server
Version: 2.3.3+dfsg-3
Severity: serious
Tags: ftbfs trixie sid

https://buildd.debian.org/status/logs.php?pkg=casparcg-server&ver=2.3.3%2Bdfsg-3%2Bb2

...
/<<PKGBUILDDIR>>/src/modules/ffmpeg/producer/av_producer.cpp: In constructor ‘caspar::ffmpeg::Decoder::Decoder(AVStream*)’:
/<<PKGBUILDDIR>>/src/modules/ffmpeg/producer/av_producer.cpp:109:35: error: ‘AV_CODEC_CAP_AUTO_THREADS’ was not declared in this scope; did you mean ‘AV_CODEC_CAP_FRAME_THREADS’?
  109 |         if (codec->capabilities & AV_CODEC_CAP_AUTO_THREADS) {
      |                                   ^~~~~~~~~~~~~~~~~~~~~~~~~
      |                                   AV_CODEC_CAP_FRAME_THREADS
...

Attachment: OpenPGP_signature.asc
Description: OpenPGP digital signature

Reply to: