Bug#1115016: gmerlin-encoders: diff for NMU version 2.0.0~svn6278-7.1
Control: tags 1115016 + patch
Control: tags 1115016 + pending
Control: forwarded 1115016 https://github.com/bplaum/gmerlin-encoders/pull/5
Dear maintainer,
I've prepared an NMU for gmerlin-encoders (versioned as 2.0.0~svn6278-7.1)
and uploaded it to DELAYED/7. Please feel free to tell me if I should
cancel it.
cu
Adrian
diffstat for gmerlin-encoders-2.0.0~svn6278 gmerlin-encoders-2.0.0~svn6278
changelog | 10 +++
control | 1
patches/0001-FF_PROFILE_AAC_-removed-in-FFmpeg-8-AV_PROFILE_AAC_.patch | 31 ++++++++++
patches/series | 1
4 files changed, 42 insertions(+), 1 deletion(-)
diff -Nru gmerlin-encoders-2.0.0~svn6278/debian/changelog gmerlin-encoders-2.0.0~svn6278/debian/changelog
--- gmerlin-encoders-2.0.0~svn6278/debian/changelog 2025-08-23 21:00:49.000000000 +0300
+++ gmerlin-encoders-2.0.0~svn6278/debian/changelog 2026-01-03 16:32:28.000000000 +0200
@@ -1,3 +1,13 @@
+gmerlin-encoders (2.0.0~svn6278-7.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix building with FFmpeg 8:
+ - Remove libpostproc-dev from Build-Depends.
+ - FF_PROFILE_AAC_* -> AV_PROFILE_AAC_*
+ - Closes: #1115016
+
+ -- Adrian Bunk <bunk@debian.org> Sat, 03 Jan 2026 16:32:28 +0200
+
gmerlin-encoders (2.0.0~svn6278-7) unstable; urgency=medium
* Team upload.
diff -Nru gmerlin-encoders-2.0.0~svn6278/debian/control gmerlin-encoders-2.0.0~svn6278/debian/control
--- gmerlin-encoders-2.0.0~svn6278/debian/control 2025-08-23 21:00:18.000000000 +0300
+++ gmerlin-encoders-2.0.0~svn6278/debian/control 2026-01-03 16:32:28.000000000 +0200
@@ -18,7 +18,6 @@
libmp3lame-dev,
libogg-dev,
libopus-dev,
- libpostproc-dev,
libshout-dev,
libspeex-dev,
libswscale-dev,
diff -Nru gmerlin-encoders-2.0.0~svn6278/debian/patches/0001-FF_PROFILE_AAC_-removed-in-FFmpeg-8-AV_PROFILE_AAC_.patch gmerlin-encoders-2.0.0~svn6278/debian/patches/0001-FF_PROFILE_AAC_-removed-in-FFmpeg-8-AV_PROFILE_AAC_.patch
--- gmerlin-encoders-2.0.0~svn6278/debian/patches/0001-FF_PROFILE_AAC_-removed-in-FFmpeg-8-AV_PROFILE_AAC_.patch 1970-01-01 02:00:00.000000000 +0200
+++ gmerlin-encoders-2.0.0~svn6278/debian/patches/0001-FF_PROFILE_AAC_-removed-in-FFmpeg-8-AV_PROFILE_AAC_.patch 2026-01-03 16:32:28.000000000 +0200
@@ -0,0 +1,31 @@
+From ab3e6db1cc9f7bde2a4e6e664e642bda979f6772 Mon Sep 17 00:00:00 2001
+From: Adrian Bunk <bunk@debian.org>
+Date: Sat, 3 Jan 2026 17:07:44 +0200
+Subject: FF_PROFILE_AAC_* (removed in FFmpeg 8) -> AV_PROFILE_AAC_*
+
+---
+ plugins/ffmpeg/codecs.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/ffmpeg/codecs.c b/plugins/ffmpeg/codecs.c
+index a2cf818..a123010 100644
+--- a/plugins/ffmpeg/codecs.c
++++ b/plugins/ffmpeg/codecs.c
+@@ -1127,10 +1127,10 @@ static const enum_t mb_decision[] =
+
+ static const enum_t faac_profile[] =
+ {
+- { "main", FF_PROFILE_AAC_MAIN },
+- { "lc", FF_PROFILE_AAC_LOW },
+- { "ssr", FF_PROFILE_AAC_SSR },
+- { "ltp", FF_PROFILE_AAC_LTP }
++ { "main", AV_PROFILE_AAC_MAIN },
++ { "lc", AV_PROFILE_AAC_LOW },
++ { "ssr", AV_PROFILE_AAC_SSR },
++ { "ltp", AV_PROFILE_AAC_LTP }
+ };
+
+ #define PARAM_ENUM(n, var, arr) \
+--
+2.30.2
+
diff -Nru gmerlin-encoders-2.0.0~svn6278/debian/patches/series gmerlin-encoders-2.0.0~svn6278/debian/patches/series
--- gmerlin-encoders-2.0.0~svn6278/debian/patches/series 2024-08-13 11:17:04.000000000 +0300
+++ gmerlin-encoders-2.0.0~svn6278/debian/patches/series 2026-01-03 16:32:28.000000000 +0200
@@ -8,3 +8,4 @@
cross.patch
encoder_open.patch
m4_c99.patch
+0001-FF_PROFILE_AAC_-removed-in-FFmpeg-8-AV_PROFILE_AAC_.patch
Reply to: