This updates Minidlna to version 1.1.2.
Minidlna has had several changes since 1.0.25:
Renamed minidlna binary to minidlnad (affects the luci plugin) and install to
/usr/sbin/ per upstream behavior
Adjust for the configure script changing to autoconf
Adjust config file protection
All patches are no logner necessary
Additionally, the presentation page has changed, which breaks part of the
integration with the luci plugin (reporting how many files are being shared).
Signed-off-by: Ian Leonard <antonla...@gmail.com>
---
This should have the necessary changes pointed out by the earlier 1.1.0 update
patch on the mailing list. My thanks to those participants.
---
multimedia/minidlna/Makefile | 37 ++++-----
.../minidlna/patches/010-genconfig-checks.patch | 92 ----------------------
.../minidlna/patches/020-makefile-tweaks.patch | 48 -----------
.../minidlna/patches/030-missing-include.patch | 10 ---
...-1.0.25-fix-libavformat-api-feature-check.patch | 11 ---
5 files changed, 15 insertions(+), 183 deletions(-)
delete mode 100644 multimedia/minidlna/patches/010-genconfig-checks.patch
delete mode 100644 multimedia/minidlna/patches/020-makefile-tweaks.patch
delete mode 100644 multimedia/minidlna/patches/030-missing-include.patch
delete mode 100644
multimedia/minidlna/patches/040-minidlna-1.0.25-fix-libavformat-api-feature-check.patch
diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile
index be9804d..8648205 100644
--- a/multimedia/minidlna/Makefile
+++ b/multimedia/minidlna/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2010-2013 OpenWrt.org
+# Copyright (C) 2010-2014 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -8,17 +8,16 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=minidlna
-PKG_VERSION:=1.0.25
+PKG_VERSION:=1.1.2
PKG_RELEASE:=1
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_src.tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/minidlna
-PKG_MD5SUM:=d966256baf2f9b068b9de871ab5dade5
+PKG_MD5SUM:=65cebffa9b57bf30fbfcf2a3a3253e6
PKG_BUILD_PARALLEL:=0
PKG_BUILD_DEPENDS:=util-linux
-include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
@@ -38,7 +37,7 @@ define Package/minidlna/description
endef
define Package/minidlna/conffiles
-/etc/minidlna.conf
+/etc/config/minidlna
endef
TARGET_CPPFLAGS += \
@@ -64,28 +63,22 @@ MAKE_FLAGS +=\
LDFLAGS="$(TARGET_LDFLAGS)" \
ICONV_LIBS="-liconv $(if $(INTL_FULL),-lintl)" \
-MAKE_VARS +=\
- PREFIX="$(STAGING_DIR)/usr" \
- ICONV_PREFIX="$(ICONV_PREFIX)" \
- INTL_PREFIX="$(INTL_PREFIX)" \
- OS_NAME="OpenWrt Linux" \
- OS_VERSION="$(LINUX_VERSION)" \
- OS_URL="http://openwrt.org/"; \
- DB_PATH="/var/run/minidlna" \
- LOG_PATH="/var/log" \
-
+CONFIGURE_ARGS +=\
+ --with-libiconv-prefix="$(ICONV_PREFIX)" \
+ --with-libintl-prefix="$(INTL_PREFIX)" \
+ --with-os-name="OpenWrt Linux" \
+ --with-os-version="$(LINUX_VERSION)" \
+ --with-os-url="http://openwrt.org/"; \
+ --with-db-path="/var/run/minidlna" \
+ --with-log-path="/var/log" \
define Package/minidlna/install
- $(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/minidlna $(1)/usr/bin/
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/minidlnad $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/minidlna.init $(1)/etc/init.d/minidlna
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) ./files/minidlna.config $(1)/etc/config/minidlna
endef
-define Package/minidlna/conffiles
-/etc/config/minidlna
-endef
-
$(eval $(call BuildPackage,minidlna))
diff --git a/multimedia/minidlna/patches/010-genconfig-checks.patch
b/multimedia/minidlna/patches/010-genconfig-checks.patch
deleted file mode 100644
index bce8456..0000000
--- a/multimedia/minidlna/patches/010-genconfig-checks.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/genconfig.sh
-+++ b/genconfig.sh
-@@ -23,14 +23,18 @@ RM="rm -f"
- CONFIGFILE="config.h"
- CONFIGMACRO="__CONFIG_H__"
-
-+PREFIX="${PREFIX:-/usr}"
-+ICONV_PREFIX="${ICONV_PREFIX:-$PREFIX}"
-+INTL_PREFIX="${INTL_PREFIX:-$PREFIX}"
-+
- # Database path
--DB_PATH="/tmp/minidlna"
-+DB_PATH="${DB_PATH:-/tmp/minidlna}"
- # Log path
--LOG_PATH="${DB_PATH}"
-+LOG_PATH="${LOG_PATH:-$DB_PATH}"
-
- # detecting the OS name and version
--OS_NAME=`uname -s`
--OS_VERSION=`uname -r`
-+OS_NAME="${OS_NAME:-$(uname -s)}"
-+OS_VERSION="${OS_VERSION:-$(uname -r)}"
- TIVO="/*#define TIVO_SUPPORT*/"
- NETGEAR="/*#define NETGEAR*/"
- READYNAS="/*#define READYNAS*/"
-@@ -40,22 +44,22 @@ ${RM} ${CONFIGFILE}
-
- # Detect if there are missing headers
- # NOTE: This check only works with a normal distro
--[ ! -e "/usr/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING"
--[ ! -e "/usr/include/jpeglib.h" ] && MISSING="libjpeg $MISSING"
--[ ! -e "/usr/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING"
--[ ! -e "/usr/include/id3tag.h" ] && MISSING="libid3tag $MISSING"
--[ ! -e "/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING"
--[ ! -e "/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING"
--[ ! -e "/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING"
--[ ! -e "/usr/include/ffmpeg/avutil.h" -a \
-- ! -e "/usr/include/libavutil/avutil.h" -a \
-- ! -e "/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil
$MISSING"
--[ ! -e "/usr/include/ffmpeg/avformat.h" -a \
-- ! -e "/usr/include/libavformat/avformat.h" -a \
-- ! -e "/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat
$MISSING"
--[ ! -e "/usr/include/ffmpeg/avcodec.h" -a \
-- ! -e "/usr/include/libavcodec/avcodec.h" -a \
-- ! -e "/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec
$MISSING"
-+[ ! -e "${PREFIX}/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING"
-+[ ! -e "${PREFIX}/include/jpeglib.h" ] && MISSING="libjpeg $MISSING"
-+[ ! -e "${PREFIX}/include/libexif/exif-loader.h" ] && MISSING="libexif
$MISSING"
-+[ ! -e "${PREFIX}/include/id3tag.h" ] && MISSING="libid3tag $MISSING"
-+[ ! -e "${PREFIX}/include/ogg/ogg.h" ] && MISSING="libogg $MISSING"
-+[ ! -e "${PREFIX}/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING"
-+[ ! -e "${PREFIX}/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING"
-+[ ! -e "${PREFIX}/include/ffmpeg/avutil.h" -a \
-+ ! -e "${PREFIX}/include/libavutil/avutil.h" -a \
-+ ! -e "${PREFIX}/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil
$MISSING"
-+[ ! -e "${PREFIX}/include/ffmpeg/avformat.h" -a \
-+ ! -e "${PREFIX}/include/libavformat/avformat.h" -a \
-+ ! -e "${PREFIX}/include/ffmpeg/libavformat/avformat.h" ] &&
MISSING="libavformat $MISSING"
-+[ ! -e "${PREFIX}/include/ffmpeg/avcodec.h" -a \
-+ ! -e "${PREFIX}/include/libavcodec/avcodec.h" -a \
-+ ! -e "${PREFIX}/include/ffmpeg/libavcodec/avcodec.h" ] &&
MISSING="libavcodec $MISSING"
- if [ -n "$MISSING" ]; then
- echo -e "\nERROR! Cannot continue."
- echo -e "The following required libraries are either missing, or are
missing development headers:\n"
-@@ -151,8 +155,7 @@ case $OS_NAME in
- fi
- ;;
- *)
-- echo "Unknown OS : $OS_NAME"
-- exit 1
-+ echo "WARNING: Unknown OS : $OS_NAME" 1>&2
- ;;
- esac
-
-@@ -183,7 +186,7 @@ fi
- echo "" >> ${CONFIGFILE}
-
- echo "/* Enable if the system iconv.h exists. ID3 tag reading in various
character sets will not work properly otherwise. */" >> ${CONFIGFILE}
--if [ -f /usr/include/iconv.h ]; then
-+if [ -f ${ICONV_PREFIX}/include/iconv.h ]; then
- echo "#define HAVE_ICONV_H" >> ${CONFIGFILE}
- else
- echo -e "\nWARNING!! Iconv support not found. ID3 tag reading may not work."
-@@ -192,7 +195,7 @@ fi
- echo "" >> ${CONFIGFILE}
-
- echo "/* Enable if the system libintl.h exists for NLS support. */" >>
${CONFIGFILE}
--if [ -f /usr/include/libintl.h ]; then
-+if [ -f ${INTL_PREFIX}/include/libintl.h ]; then
- echo "#define ENABLE_NLS" >> ${CONFIGFILE}
- else
- echo "/*#define ENABLE_NLS*/" >> ${CONFIGFILE}
diff --git a/multimedia/minidlna/patches/020-makefile-tweaks.patch
b/multimedia/minidlna/patches/020-makefile-tweaks.patch
deleted file mode 100644
index 8314d94..0000000
--- a/multimedia/minidlna/patches/020-makefile-tweaks.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -10,19 +10,23 @@
- # or :
- # $ make install
- #
-+PREFIX ?= /usr
-+ICONV_PREFIX ?= $(PREFIX)
-+INTL_PREFIX ?= $(PREFIX)
- #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
- #CFLAGS = -Wall -g -Os -D_GNU_SOURCE
- CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
-- -I/usr/include/ffmpeg \
-- -I/usr/include/libavutil -I/usr/include/libavcodec
-I/usr/include/libavformat \
-- -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec
-I/usr/include/ffmpeg/libavformat
-+ -I$(PREFIX)/include/ffmpeg \
-+ -I$(PREFIX)/include/libavutil -I$(PREFIX)/include/libavcodec
-I$(PREFIX)/include/libavformat \
-+ -I$(PREFIX)/include/ffmpeg/libavutil
-I$(PREFIX)/include/ffmpeg/libavcodec -I$(PREFIX)/include/ffmpeg/libavformat
-+
- #STATIC_LINKING: CFLAGS += -DSTATIC
- #STATIC_LINKING: LDFLAGS = -static
- CC = gcc
- RM = rm -f
- INSTALL = install
-
--INSTALLPREFIX ?= $(DESTDIR)/usr
-+INSTALLPREFIX ?= $(DESTDIR)$(PREFIX)
- SBININSTALLDIR = $(INSTALLPREFIX)/sbin
- ETCINSTALLDIR = $(DESTDIR)/etc
-
-@@ -37,7 +41,7 @@ BASEOBJS = minidlna.o upnphttp.o upnpdes
-
- ALLOBJS = $(BASEOBJS) $(LNXOBJS)
-
--LIBS = -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec
-lid3tag -lFLAC -logg -lvorbis
-+LIBS = -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec
-lid3tag -lFLAC -logg -lvorbis -luuid $(ICONV_LIBS)
- #STATIC_LINKING: LIBS = -lvorbis -logg -lm -lsqlite3 -lpthread -lexif -ljpeg
-lFLAC -lm -lid3tag -lz -lavformat -lavutil -lavcodec -lm
-
- TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
-@@ -64,7 +68,7 @@ install-conf:
- $(INSTALL) -d $(ETCINSTALLDIR)
- $(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)
-
--minidlna: $(BASEOBJS) $(LNXOBJS) $(LIBS)
-+minidlna: $(BASEOBJS) $(LNXOBJS)
- @echo Linking $@
- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
-
diff --git a/multimedia/minidlna/patches/030-missing-include.patch
b/multimedia/minidlna/patches/030-missing-include.patch
deleted file mode 100644
index a1491ba..0000000
--- a/multimedia/minidlna/patches/030-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/minidlna.c
-+++ b/minidlna.c
-@@ -58,6 +58,7 @@
- #include <fcntl.h>
- #include <sys/file.h>
- #include <sys/time.h>
-+#include <sys/stat.h>
- #include <time.h>
- #include <signal.h>
- #include <sys/param.h>
diff --git
a/multimedia/minidlna/patches/040-minidlna-1.0.25-fix-libavformat-api-feature-check.patch
b/multimedia/minidlna/patches/040-minidlna-1.0.25-fix-libavformat-api-feature-check.patch
deleted file mode 100644
index 5f69126..0000000
---
a/multimedia/minidlna/patches/040-minidlna-1.0.25-fix-libavformat-api-feature-check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/metadata.c 2012-08-27 23:00:06.997932249 +0100
-+++ b/metadata.c 2012-08-27 23:10:07.716582960 +0100
-@@ -110,7 +110,7 @@ lav_open(AVFormatContext **ctx, const ch
- static inline void
- lav_close(AVFormatContext *ctx)
- {
--#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(2<<8)+0)
-+#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(17<<8)+0)
- avformat_close_input(&ctx);
- #else
- av_close_input_file(ctx);
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
