Control: tags 1072435 + pending
Dear maintainer, I've prepared an NMU for minidlna (versioned as 1.3.3+dfsg-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru minidlna-1.3.3+dfsg/debian/changelog minidlna-1.3.3+dfsg/debian/changelog --- minidlna-1.3.3+dfsg/debian/changelog 2024-01-28 14:30:31.000000000 +0100 +++ minidlna-1.3.3+dfsg/debian/changelog 2024-08-03 21:19:29.000000000 +0200 @@ -1,3 +1,13 @@ +minidlna (1.3.3+dfsg-1.1) unstable; urgency=medium + + * Non-maintainer upload. + + [ Diederik de Haas ] + * d/patches: Add 16-Add-compatibility-with-FFMPEG-7.0.patch to fix build + with ffmpeg 7.0 (Closes: #1072435) + + -- Sebastian Ramacher <sramac...@debian.org> Sat, 03 Aug 2024 21:19:29 +0200 + minidlna (1.3.3+dfsg-1) unstable; urgency=medium [ Barak A. Pearlmutter ] diff -Nru minidlna-1.3.3+dfsg/debian/patches/16-Add-compatibility-with-FFMPEG-7.0.patch minidlna-1.3.3+dfsg/debian/patches/16-Add-compatibility-with-FFMPEG-7.0.patch --- minidlna-1.3.3+dfsg/debian/patches/16-Add-compatibility-with-FFMPEG-7.0.patch 1970-01-01 01:00:00.000000000 +0100 +++ minidlna-1.3.3+dfsg/debian/patches/16-Add-compatibility-with-FFMPEG-7.0.patch 2024-08-03 21:14:04.000000000 +0200 @@ -0,0 +1,40 @@ +From 243cf2dd27ebcaf4ef1093c79b96077378d52018 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebo...@gmail.com> +Date: Sat, 4 May 2024 18:36:58 +0200 +Subject: [PATCH] Add compatibility with FFMPEG 7.0 +Origin: other, https://sourceforge.net/u/eclipseo/minidlna/ci/243cf2dd27ebcaf4ef1093c79b96077378d52018/ +Bug-Debian: https://bugs.debian.org/1072435 + +channel_layout has been replaced with ch_layout +--- + libav.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libav.h b/libav.h +index b69752c..fae094b 100644 +--- a/libav.h ++++ b/libav.h +@@ -117,6 +117,8 @@ typedef AVMetadataTag AVDictionaryEntry; + # endif + #endif + ++#define HAVE_CH_LAYOUT (LIBAVUTIL_VERSION_INT >= ((57<<16)+(28<<8)+100)) ++ + static inline int + lav_open(AVFormatContext **ctx, const char *filename) + { +@@ -174,7 +176,11 @@ lav_get_interlaced(AVStream *s) + #define lav_codec_tag(s) s->codecpar->codec_tag + #define lav_sample_rate(s) s->codecpar->sample_rate + #define lav_bit_rate(s) s->codecpar->bit_rate ++#if HAVE_CH_LAYOUT ++#define lav_channels(s) s->codecpar->ch_layout.nb_channels ++#else + #define lav_channels(s) s->codecpar->channels ++#endif + #define lav_width(s) s->codecpar->width + #define lav_height(s) s->codecpar->height + #define lav_profile(s) s->codecpar->profile +-- +2.45.2 + diff -Nru minidlna-1.3.3+dfsg/debian/patches/series minidlna-1.3.3+dfsg/debian/patches/series --- minidlna-1.3.3+dfsg/debian/patches/series 2024-01-28 14:25:31.000000000 +0100 +++ minidlna-1.3.3+dfsg/debian/patches/series 2024-08-03 21:14:04.000000000 +0200 @@ -6,3 +6,4 @@ 13-spelling-and-typos.patch 14-autoupdate.patch 15-thumbnails.patch +16-Add-compatibility-with-FFMPEG-7.0.patch
