Merge pull request #6854 from heitbaum/minidlna

[le11] minidlna: update to 1.3.2 and drop upstreamed patches and addon (104)

packages/addons/service/minidlna/changelog.txt

@@ -1,3 +1,6 @@
+104
+- update to 1.3.2
+
 103
 - fix build
 

packages/addons/service/minidlna/package.mk

@@ -2,13 +2,13 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="minidlna"
-PKG_VERSION="1.3.0"
+PKG_VERSION="1.3.2"
-PKG_SHA256="47d9b06b4c48801a4c1112ec23d24782728b5495e95ec2195bbe5c81bc2d3c63"
+PKG_SHA256="222ce45a1a60c3ce3de17527955d38e5ff7a4592d61db39577e6bf88e0ae1cb0"
-PKG_REV="103"
+PKG_REV="104"
 PKG_ARCH="any"
 PKG_LICENSE="BSD-3c/GPLv2"
 PKG_SITE="https://sourceforge.net/projects/minidlna/"
-PKG_URL="https://downloads.sourceforge.net/project/minidlna/minidlna/1.3.0/minidlna-${PKG_VERSION}.tar.gz"
+PKG_URL="https://downloads.sourceforge.net/project/minidlna/minidlna/${PKG_VERSION}/minidlna-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ffmpeg flac libexif libiconv libid3tag libjpeg-turbo libogg libvorbis sqlite"
 PKG_SECTION="service"
 PKG_SHORTDESC="MiniDLNA (ReadyMedia): a fully compliant DLNA/UPnP-AV server"

packages/addons/service/minidlna/patches/minidlna-02-fix-autoconf-271.patch

@@ -1,31 +0,0 @@
---- a/configure.ac	2021-09-14 20:57:49.719326718 +1000
-+++ b/configure.ac	2021-09-14 20:57:24.852784827 +1000
-@@ -404,7 +404,7 @@
-     AC_CHECK_LIB([exif], [exif_data_new_from_file], [LIBEXIF_LIBS="-lexif"], [unset ac_cv_lib_exif_exif_data_new_from_file; LDFLAGS="$LDFLAGS_SAVE"; continue])
-     break
- done
--test x"$ac_cv_lib_jpeg_jpeg_set_defaults" = x"yes" || AC_MSG_ERROR([Could not find libexif])
-+test x"$ac_cv_lib_exif_exif_data_new_from_file" = x"yes" || AC_MSG_ERROR([Could not find libexif])
- AC_SUBST(LIBEXIF_LIBS)
- 
- LDFLAGS_SAVE="$LDFLAGS"
-@@ -415,7 +415,7 @@
-     AC_CHECK_LIB([id3tag -lz], [id3_file_open], [LIBID3TAG_LIBS="-lid3tag -lz"], [unset ac_cv_lib_id3tag_id3_file_open; LDFLAGS="$LDFLAGS_SAVE"; continue])
-     break
- done
--test x"$ac_cv_lib_id3tag__lz___id3_file_open" = x"yes" || AC_MSG_ERROR([Could not find libid3tag])
-+test x"$ac_cv_lib_id3tag__lz_id3_file_open" = x"yes" || AC_MSG_ERROR([Could not find libid3tag])
- AC_SUBST(LIBID3TAG_LIBS)
- 
- LDFLAGS_SAVE="$LDFLAGS"
-@@ -441,8 +441,8 @@
- 		  [unset ac_cv_lib_avformat_av_open_input_file; unset ac_cv_lib_avformat_avformat_open_input; LDFLAGS="$LDFLAGS_SAVE"; continue])])
-     break
- done
--if test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___av_open_input_file" != x"yes" &&
--   test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___avformat_open_input" != x"yes"; then
-+if test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz_av_open_input_file" != x"yes" &&
-+   test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz_avformat_open_input" != x"yes"; then
-    AC_MSG_ERROR([Could not find libavformat - part of ffmpeg])
- fi
- AC_SUBST(LIBAVFORMAT_LIBS)

packages/addons/service/minidlna/patches/minidlna-03-allow-gettext-0.20.patch

@@ -1,14 +0,0 @@
-Subject: [PATCH] configure.ac: allow gettext >=0.18
-
-diff --git a/configure.ac b/configure.ac
-index cb596b9..2eaf0a4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -29,6 +29,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC_USE_SYSTEM_EXTENSIONS])
- AM_ICONV
- AM_GNU_GETTEXT([external])
- AM_GNU_GETTEXT_VERSION(0.18)
-+AM_GNU_GETTEXT_REQUIRE_VERSION(0.18)
- 
- # Checks for programs.
- AC_PROG_AWK