From 1a4e0c54371c1e8ea282ed041264d53b0c948742 Mon Sep 17 00:00:00 2001 From: Markham Date: Tue, 12 Nov 2024 20:59:09 +0100 Subject: [PATCH] bump version minidlna-1.3.3 and add patch for newer ffmpeg --- ...ning_deprecated_declaration_channels.patch | 51 +++++++++++++++++++ make/applications.mk | 1 + make/versions.mk | 2 +- 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 archive-patches/minidlna/patches/0001-fix_warning_deprecated_declaration_channels.patch diff --git a/archive-patches/minidlna/patches/0001-fix_warning_deprecated_declaration_channels.patch b/archive-patches/minidlna/patches/0001-fix_warning_deprecated_declaration_channels.patch new file mode 100644 index 0000000..b8457b9 --- /dev/null +++ b/archive-patches/minidlna/patches/0001-fix_warning_deprecated_declaration_channels.patch @@ -0,0 +1,51 @@ +--- a/metadata.c ++++ b/metadata.c +@@ -778,16 +778,24 @@ + break; + } + /* AAC @ Level 1/2 */ +- if( lav_channels(astream) <= 2 && +- lav_bit_rate(astream) <= 576000 ) ++ ++ int channels = 0; ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59, 37, 100) ++ channels = astream->codecpar->ch_layout.nb_channels; ++#elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 41, 100) ++ channels = astream->codecpar->channels; ++#else ++ // Fallback for older versions ++ channels = lav_channels(astream); ++#endif ++ if (channels <= 2 && lav_bit_rate(astream) <= 576000) { + audio_profile = PROFILE_AUDIO_AAC; +- else if( lav_channels(astream) <= 6 && +- lav_bit_rate(astream) <= 1440000 ) ++ } else if (channels <= 6 && lav_bit_rate(astream) <= 1440000) { + audio_profile = PROFILE_AUDIO_AAC_MULT5; +- else +- DPRINTF(E_DEBUG, L_METADATA, "Unhandled AAC: %lld channels, %lld bitrate\n", +- (long long)lav_channels(astream), +- (long long)lav_bit_rate(astream)); ++ } else { ++ DPRINTF(E_DEBUG, L_METADATA, "Unhandled AAC: %d channels, %lld bitrate\n", ++ channels, (long long)lav_bit_rate(astream)); ++ } + break; + default: + DPRINTF(E_DEBUG, L_METADATA, "Unhandled AAC type [%d]\n", aac_type); +@@ -825,7 +833,15 @@ + break; + } + m.frequency = lav_sample_rate(astream); ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59, 37, 100) ++ m.channels = astream->codecpar->ch_layout.nb_channels; ++#elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 41, 100) ++ m.channels = astream->codecpar->channels; ++#else ++ // Fallback for older versions + m.channels = lav_channels(astream); ++#endif ++ + } + if( vstream ) + { diff --git a/make/applications.mk b/make/applications.mk index cc63edd..60c5147 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -289,6 +289,7 @@ $(D)/minidlna: $(D)/zlib $(D)/sqlite $(D)/libexif $(D)/libjpeg $(D)/libid3tag $( $(START_BUILD) $(UNTAR)/minidlna-$(MINIDLNA_VER).tar.gz set -e; cd $(BUILD_TMP)/minidlna-$(MINIDLNA_VER); \ + $(call apply_patches, $(addprefix minidlna/patches/, 0001-fix_warning_deprecated_declaration_channels.patch)); \ autoreconf -fi; \ $(CONFIGURE) \ --prefix=/ \ diff --git a/make/versions.mk b/make/versions.mk index 30582a2..a34bb09 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -195,7 +195,7 @@ LZO_VER = 2.10 MC_VER = 4.8.21 # mini-DLNA -MINIDLNA_VER = 1.3.2 +MINIDLNA_VER = 1.3.3 # mtd-utils for the host and target MTD_UTILS_VER = 2.1.2 -- 2.39.5