Control: forwarded -1 https://sourceforge.net/p/minidlna/bugs/363/ https://sourceforge.net/p/minidlna/git/merge-requests/58/ Control: tag -1 patch
On Wednesday, 5 June 2024 14:43:17 CEST Diederik de Haas wrote: > Control: tag -1 upstream > Control: forwarded -1 https://sourceforge.net/p/minidlna/bugs/363/ > > On 2 Jun 2024 15:22:21 +0200 Sebastian Ramacher <sramac...@debian.org> wrote: > > during a rebuild of the reverse dependencies for the transition to > > ffmpeg 7.0, your package failed to build > > There's an upstream bug for it, but not yet a solution. > Updating metadata accordingly. And there's also an upstream merge request for it. Attaching a patch to add that patch to the Debian package. Or you can use https://salsa.debian.org/debian/minidlna/-/merge_requests/7 which is a MR with the attach patch applied. Cheers, Diederik
>From 1a77e07ca0f2dce15b756ac45d192ea12e8ecace Mon Sep 17 00:00:00 2001 From: Diederik de Haas <didi.deb...@cknow.org> Date: Wed, 26 Jun 2024 13:12:09 +0200 Subject: [PATCH] d/patches: Add 16-Add-compatibility-with-FFMPEG-7.0.patch Closes: #1072435 Link: https://bugs.debian.org/1072435 --- ...16-Add-compatibility-with-FFMPEG-7.0.patch | 40 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 41 insertions(+) create mode 100644 debian/patches/16-Add-compatibility-with-FFMPEG-7.0.patch diff --git a/debian/patches/16-Add-compatibility-with-FFMPEG-7.0.patch b/debian/patches/16-Add-compatibility-with-FFMPEG-7.0.patch new file mode 100644 index 0000000..f56de1c --- /dev/null +++ b/debian/patches/16-Add-compatibility-with-FFMPEG-7.0.patch @@ -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 --git a/debian/patches/series b/debian/patches/series index 05164a6..83ea738 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ 13-spelling-and-typos.patch 14-autoupdate.patch 15-thumbnails.patch +16-Add-compatibility-with-FFMPEG-7.0.patch -- 2.45.2
signature.asc
Description: This is a digitally signed message part.
