Control: tags 1115015 + patch Control: tags 1115015 + pending Dear maintainer,
I've prepared an NMU for ffmpegfs (versioned as 2.17-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for ffmpegfs-2.17 ffmpegfs-2.17 changelog | 7 + patches/0001-define-AV_PROFILE_UNKNOWN-when-required.patch | 58 ++++++++++ patches/0002-av_format_inject_global_side_data-has-been-deprecate.patch | 25 ++++ patches/series | 2 4 files changed, 92 insertions(+) diff -Nru ffmpegfs-2.17/debian/changelog ffmpegfs-2.17/debian/changelog --- ffmpegfs-2.17/debian/changelog 2024-11-22 17:43:59.000000000 +0200 +++ ffmpegfs-2.17/debian/changelog 2026-01-03 23:24:22.000000000 +0200 @@ -1,3 +1,10 @@ +ffmpegfs (2.17-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fixes for FTBFS with FFmpeg 8. (Closes: #1115015) + + -- Adrian Bunk <[email protected]> Sat, 03 Jan 2026 23:24:22 +0200 + ffmpegfs (2.17-1) unstable; urgency=medium * Bugfix: Issue #164: Fixed incorrectly discarded HLS seek requests. diff -Nru ffmpegfs-2.17/debian/patches/0001-define-AV_PROFILE_UNKNOWN-when-required.patch ffmpegfs-2.17/debian/patches/0001-define-AV_PROFILE_UNKNOWN-when-required.patch --- ffmpegfs-2.17/debian/patches/0001-define-AV_PROFILE_UNKNOWN-when-required.patch 1970-01-01 02:00:00.000000000 +0200 +++ ffmpegfs-2.17/debian/patches/0001-define-AV_PROFILE_UNKNOWN-when-required.patch 2026-01-03 23:24:22.000000000 +0200 @@ -0,0 +1,58 @@ +From 7d1b7ad1883403747ed43f7278ba9e9c9e201841 Mon Sep 17 00:00:00 2001 +From: Norbert Schlia <[email protected]> +Date: Thu, 28 Aug 2025 14:34:50 +0200 +Subject: #define AV_PROFILE_UNKNOWN when required + +--- + src/ffmpeg_compat.h | 12 ++++-------- + src/ffmpegfs.cc | 4 ++-- + 2 files changed, 6 insertions(+), 10 deletions(-) + +diff --git a/src/ffmpeg_compat.h b/src/ffmpeg_compat.h +index df3f509e..17f96946 100644 +--- a/src/ffmpeg_compat.h ++++ b/src/ffmpeg_compat.h +@@ -50,14 +50,10 @@ + * https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/doc/APIchanges + */ + +-// FFmpeg 4.1.8 "al-Khwarizmi" or newer: +-// +-// libavutil (>= 56.22.100) +-// libavcodec (>= 58.35.100) +-// libavformat (>= 58.20.100) +-// libavfilter (>= 7.40.101) +-// libswscale (>= 5.3.100) +-// libswresample (>= 3.3.100) ++// Define as FF_PROFILE_UNKNOWN in older versions ++#ifndef AV_PROFILE_UNKNOWN ++#define AV_PROFILE_UNKNOWN FF_PROFILE_UNKNOWN ++#endif + + /** + * 2022-07-xx - xxxxxxxxxx - lavu 57.30.100 - frame.h +diff --git a/src/ffmpegfs.cc b/src/ffmpegfs.cc +index 371a9591..161ebd5c 100644 +--- a/src/ffmpegfs.cc ++++ b/src/ffmpegfs.cc +@@ -1571,7 +1571,7 @@ static int get_hwaccel_dec_blocked(const std::string & arg, HWACCEL_BLOCKED_MAP + if (!nProfilesFound) + { + // No profile +- (*hwaccel_dec_blocked)->insert(std::pair<AVCodecID, int>(codec_id, FF_PROFILE_UNKNOWN)); ++ (*hwaccel_dec_blocked)->insert(std::pair<AVCodecID, int>(codec_id, AV_PROFILE_UNKNOWN)); + } + + return 0; +@@ -1591,7 +1591,7 @@ bool check_hwaccel_dec_blocked(AVCodecID codec_id, int profile) + + for (HWACCEL_BLOCKED_MAP::const_iterator it = params.m_hwaccel_dec_blocked->find(codec_id); it != params.m_hwaccel_dec_blocked->cend(); ++it) + { +- if (it->first == codec_id && (it->second == profile || it->second == FF_PROFILE_UNKNOWN)) ++ if (it->first == codec_id && (it->second == profile || it->second == AV_PROFILE_UNKNOWN)) + { + return true; + } +-- +2.30.2 + diff -Nru ffmpegfs-2.17/debian/patches/0002-av_format_inject_global_side_data-has-been-deprecate.patch ffmpegfs-2.17/debian/patches/0002-av_format_inject_global_side_data-has-been-deprecate.patch --- ffmpegfs-2.17/debian/patches/0002-av_format_inject_global_side_data-has-been-deprecate.patch 1970-01-01 02:00:00.000000000 +0200 +++ ffmpegfs-2.17/debian/patches/0002-av_format_inject_global_side_data-has-been-deprecate.patch 2026-01-03 23:24:22.000000000 +0200 @@ -0,0 +1,25 @@ +From 3d4605aeab43a48836546fe95143e5474eb84fa0 Mon Sep 17 00:00:00 2001 +From: Norbert Schlia <[email protected]> +Date: Thu, 28 Aug 2025 14:36:45 +0200 +Subject: av_format_inject_global_side_data() has been deprecated & removed + +--- + src/ffmpeg_utils.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ffmpeg_utils.h b/src/ffmpeg_utils.h +index d0bb6d91..7239e369 100644 +--- a/src/ffmpeg_utils.h ++++ b/src/ffmpeg_utils.h +@@ -83,7 +83,7 @@ extern "C" { + /** + * Allow use of av_format_inject_global_side_data when available + */ +-#define HAVE_AV_FORMAT_INJECT_GLOBAL_SIDE_DATA (LIBAVFORMAT_VERSION_MICRO >= 100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 64, 101)) ++#define HAVE_AV_FORMAT_INJECT_GLOBAL_SIDE_DATA (LIBAVFORMAT_VERSION_MICRO >= 100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 64, 101) && LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(60, 14, 100)) + + /** + * Add av_get_media_type_string function if missing +-- +2.30.2 + diff -Nru ffmpegfs-2.17/debian/patches/series ffmpegfs-2.17/debian/patches/series --- ffmpegfs-2.17/debian/patches/series 2023-06-25 17:11:38.000000000 +0300 +++ ffmpegfs-2.17/debian/patches/series 2026-01-03 23:24:22.000000000 +0200 @@ -0,0 +1,2 @@ +0001-define-AV_PROFILE_UNKNOWN-when-required.patch +0002-av_format_inject_global_side_data-has-been-deprecate.patch
