[rpms/minidlna] epel9-next: Add patch for FFMPEG 7 compatibility

[rpms/minidlna] epel9-next: Add patch for FFMPEG 7 compatibility

[@ 2026-07-20 18:20 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/minidlna
Branch : epel9-next
Commit : 5de0e84859aa974c489b999ba75c83b5697eecb9
Author : Robert-André Mauchin <zebob.m@gmail.com>
Date   : 2024-05-09T10:05:52+02:00
Stats  : +45/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/minidlna/c/5de0e84859aa974c489b999ba75c83b5697eecb9?branch=epel9-next

Log:
Add patch for FFMPEG 7 compatibility

---
diff --git a/0001-Add-compatibility-with-FFMPEG-7.0.patch b/0001-Add-compatibility-with-FFMPEG-7.0.patch
new file mode 100644
index 0000000..681509c
--- /dev/null
+++ b/0001-Add-compatibility-with-FFMPEG-7.0.patch
@@ -0,0 +1,38 @@
+From 243cf2dd27ebcaf4ef1093c79b96077378d52018 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
+Date: Sat, 4 May 2024 18:36:58 +0200
+Subject: [PATCH] Add compatibility with FFMPEG 7.0
+
+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.44.0
+

diff --git a/minidlna.spec b/minidlna.spec
index c6baa6d..871a802 100644
--- a/minidlna.spec
+++ b/minidlna.spec
@@ -1,6 +1,6 @@
 Name:           minidlna
 Version:        1.3.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Lightweight DLNA/UPnP-AV server targeted at embedded systems
 
 # see minidlna-licensing-breakdown.txt for complete breakdown
@@ -17,6 +17,9 @@ Source5:        %{name}.sysusers
 # Fix core dump
 # https://sourceforge.net/p/minidlna/bugs/333/
 Patch0:         %{name}-1.3.0-select_use_after_free.patch
+# Add compatibility with FFMPEG 7.0
+# https://sourceforge.net/p/minidlna/git/merge-requests/58/
+Patch1:         0001-Add-compatibility-with-FFMPEG-7.0.patch
 
 BuildRequires:  avahi-devel
 BuildRequires:  flac-devel
@@ -138,6 +141,9 @@ install -d -m 755 %{buildroot}%{_localstatedir}/log/%{name}/
 
 
 %changelog
+* Sat May 04 2024 Robert-André Mauchin <zebob.m@gmail.com> - 1.3.3-7
+- Add patch for FFMPEG 7 compatibility
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild