From 0554fbc984c74e315ba099c9d0afe2ef52d4c4ca Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 17 Aug 2011 10:13:21 +0000
Subject: [PATCH] [package] minidlna: update to 1.0.21

010-genconfig-checks.patch adjusts two configure checks to use ICONV_PREFIX and INTL_PREFIX. These changes were already made previously elsewhere in the build process and looks like it was just overlooked here.

040-configuration-tweak.patch was to rebase.

Minidlna's changes were primarily bug fixes and compatibility with newer ffmpeg.

Signed-off-by: Ian Leonard <antonlacon@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@28031 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 multimedia/minidlna/Makefile                           |  6 +++---
 multimedia/minidlna/patches/010-genconfig-checks.patch | 18 ++++++++++++++++++
 .../minidlna/patches/040-configuration-tweak.patch     |  2 +-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile
index e660a9bd6..b60fe2f49 100644
--- a/multimedia/minidlna/Makefile
+++ b/multimedia/minidlna/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2010-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=minidlna
-PKG_VERSION:=1.0.20
+PKG_VERSION:=1.0.21
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_src.tar.gz
 PKG_SOURCE_URL:=@SF/minidlna
-PKG_MD5SUM:=1c5230cc6dec7592eca4c63c526eadb7
+PKG_MD5SUM:=a53e0008ad225843a1782e4af6e5bf0b
 
 PKG_BUILD_PARALLEL:=0
 
diff --git a/multimedia/minidlna/patches/010-genconfig-checks.patch b/multimedia/minidlna/patches/010-genconfig-checks.patch
index b3dd30556..368f408a1 100644
--- a/multimedia/minidlna/patches/010-genconfig-checks.patch
+++ b/multimedia/minidlna/patches/010-genconfig-checks.patch
@@ -39,3 +39,21 @@
  if [ -n "$MISSING" ]; then
  	echo -e "\nERROR!  Cannot continue."
  	echo -e "The following required libraries are either missing, or are missing development headers:\n"
+@@ -184,7 +184,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."
+@@ -193,7 +193,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/040-configuration-tweak.patch b/multimedia/minidlna/patches/040-configuration-tweak.patch
index cb4684972..a26df5888 100644
--- a/multimedia/minidlna/patches/040-configuration-tweak.patch
+++ b/multimedia/minidlna/patches/040-configuration-tweak.patch
@@ -3,7 +3,7 @@
 @@ -2,7 +2,7 @@
  port=8200
  
- # network interface to bind to (this is the only interface that will serve files)
+ # network interfaces to serve, comma delimited
 -#network_interface=eth0
 +network_interface=br-lan
  
-- 
2.11.0