From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/4] minidlna: Add patch to add compatibility with ffmpeg-7.0
Date: Wed, 21 Aug 2024 20:46:09 +0200
Message-ID: <20240821184611.1906582-2-adolf.belka@ipfire.org>
In-Reply-To: <20240821184611.1906582-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8768687366413603520=="
List-Id: <development.lists.ipfire.org>

--===============8768687366413603520==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- From ffmpeg-7.0 the channel_layout variable has been changed to ch_layout. =
A minidlna
   user has submitted a patch to minidlna in May 2024 to fix this. Without th=
is patch
   minidlna fails to build with ffmpeg-7.0 onwards.
- The patch has not yet been merged with minidlna (last commit was in May 202=
3) so I have
   taken the patch and applied it to the minidlna source tarball.
- Update of rootfile not required

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 lfs/minidlna                                  |  6 +++--
 ....3_add_compatibility_with_ffmpeg_7.0.patch | 23 +++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 src/patches/minidlna-1.3.3_add_compatibility_with_ffmpeg_=
7.0.patch

diff --git a/lfs/minidlna b/lfs/minidlna
index eb989567c..6415bb0fd 100644
--- a/lfs/minidlna
+++ b/lfs/minidlna
@@ -34,7 +34,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D minidlna
-PAK_VER    =3D 15
+PAK_VER    =3D 16
=20
 DEPS       =3D ffmpeg flac libexif libid3tag libogg
=20
@@ -84,7 +84,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure --prefix=3D/usr
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/minidlna-1.3.3_add_co=
mpatibility_with_ffmpeg_7.0.patch
+	cd $(DIR_APP) && ./configure \
+				--prefix=3D/usr
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
=20
diff --git a/src/patches/minidlna-1.3.3_add_compatibility_with_ffmpeg_7.0.pat=
ch b/src/patches/minidlna-1.3.3_add_compatibility_with_ffmpeg_7.0.patch
new file mode 100644
index 000000000..86c9fa019
--- /dev/null
+++ b/src/patches/minidlna-1.3.3_add_compatibility_with_ffmpeg_7.0.patch
@@ -0,0 +1,23 @@
+--- minidlna-1.3.3/libav.h.orig	2023-05-31 10:25:59.000000000 +0200
++++ minidlna-1.3.3/libav.h	2024-08-21 15:34:14.374621920 +0200
+@@ -117,6 +117,8 @@
+ # endif
+ #endif
+=20
++#define HAVE_CH_LAYOUT (LIBAVUTIL_VERSION_INT >=3D ((57<<16)+(28<<8)+100))
++
+ static inline int
+ lav_open(AVFormatContext **ctx, const char *filename)
+ {
+@@ -174,7 +176,11 @@
+ #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
--=20
2.46.0


--===============8768687366413603520==--