Bug#1004828: handbrake: FTBFS with ffmpeg 5.0
Package: handbrake
Version: 1.5.1+ds1-1
Followup-For: Bug #1004828
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu kinetic ubuntu-patch
Control: tags -1 patch
Please find attached a debdiff which cherry-picks the upstream fix for
FFmpeg 5.0 compatibility.
This has been uploaded to Ubuntu for the ffmpeg 5.0 transition.
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer https://www.debian.org/
slangasek@ubuntu.com vorlon@debian.org
diff -Nru handbrake-1.5.1+ds1/debian/control handbrake-1.5.1+ds1/debian/control
--- handbrake-1.5.1+ds1/debian/control 2022-07-19 05:51:48.000000000 -0700
+++ handbrake-1.5.1+ds1/debian/control 2022-07-22 12:04:16.000000000 -0700
@@ -1,8 +1,7 @@
Source: handbrake
Section: graphics
Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
+Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Uploaders:
Reinhard Tartler <siretart@tauware.de>,
Sebastian Ramacher <sramacher@debian.org>
diff -Nru handbrake-1.5.1+ds1/debian/patches/0001-libhb-include-bsf.h-header-to-fix-build-with-FFmpeg-.patch handbrake-1.5.1+ds1/debian/patches/0001-libhb-include-bsf.h-header-to-fix-build-with-FFmpeg-.patch
--- handbrake-1.5.1+ds1/debian/patches/0001-libhb-include-bsf.h-header-to-fix-build-with-FFmpeg-.patch 1969-12-31 16:00:00.000000000 -0800
+++ handbrake-1.5.1+ds1/debian/patches/0001-libhb-include-bsf.h-header-to-fix-build-with-FFmpeg-.patch 2022-07-22 12:03:23.000000000 -0700
@@ -0,0 +1,42 @@
+From 024fae65f53de516161c36e16f2c1ae6f4d3f4dd Mon Sep 17 00:00:00 2001
+From: Timo Gurr <timo.gurr@gmail.com>
+Date: Mon, 17 Jan 2022 09:32:11 +0100
+Subject: [PATCH] libhb: include bsf.h header to fix build with FFmpeg >= 5
+ (#4106)
+
+avcodec.h stopped including bsf.h per FFmpeg commit
+57b5ec6ba7df [1]. Fixes compilation error against
+FFmpeg later than the mentioned commit.
+[1] https://github.com/FFmpeg/FFmpeg/commit/57b5ec6ba7df442caebc401c4a7ef3ebc066b519
+---
+ libhb/decavcodec.c | 1 +
+ libhb/muxavformat.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
+index 372f86f82..e7a63289c 100644
+--- a/libhb/decavcodec.c
++++ b/libhb/decavcodec.c
+@@ -41,6 +41,7 @@
+ #include "handbrake/handbrake.h"
+ #include "handbrake/hbffmpeg.h"
+ #include "handbrake/hbavfilter.h"
++#include "libavcodec/bsf.h"
+ #include "libavfilter/avfilter.h"
+ #include "libavfilter/buffersrc.h"
+ #include "libavfilter/buffersink.h"
+diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
+index 232edd094..ad8e2a1d8 100644
+--- a/libhb/muxavformat.c
++++ b/libhb/muxavformat.c
+@@ -8,6 +8,7 @@
+ */
+
+ #include <ogg/ogg.h>
++#include "libavcodec/bsf.h"
+ #include "libavformat/avformat.h"
+ #include "libavutil/avstring.h"
+ #include "libavutil/intreadwrite.h"
+--
+2.34.1
+
diff -Nru handbrake-1.5.1+ds1/debian/patches/series handbrake-1.5.1+ds1/debian/patches/series
--- handbrake-1.5.1+ds1/debian/patches/series 2022-01-15 07:47:10.000000000 -0800
+++ handbrake-1.5.1+ds1/debian/patches/series 2022-07-22 12:03:43.000000000 -0700
@@ -1,2 +1,3 @@
0001-Remove-embedded-downloaded-copies-of-various-librari.patch
0002-Do-not-abort-if-libtool-meson-or-ninja-build-are-mis.patch
+0001-libhb-include-bsf.h-header-to-fix-build-with-FFmpeg-.patch
Reply to: