aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorIan Leonard <antonlacon@gmail.com>2014-10-04 00:26:20 -0700
committerIan Leonard <antonlacon@gmail.com>2014-10-25 23:31:58 -0700
commitaf0eb7f74063bd2f31ce1eb6e53d26061cc0bb48 (patch)
tree7cbe17699387d4ab19899f0179b2c23f9e25cadb /multimedia
parent236f128117b215238dac53f715683225077ad52d (diff)
minidlna: update to 1.1.4
The Philips TV patch was included upstream. Rename the minidlnad binary to minidlna instead of tweaking automake files. Signed-off-by: Ian Leonard <antonlacon@gmail.com>
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/minidlna/Makefile6
-rw-r--r--multimedia/minidlna/patches/020-makefileam-tweaks.patch32
-rw-r--r--multimedia/minidlna/patches/030-upnphttp-fixPhilips.patch12
3 files changed, 3 insertions, 47 deletions
diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile
index 2b30ba839..093c2efc6 100644
--- a/multimedia/minidlna/Makefile
+++ b/multimedia/minidlna/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=minidlna
-PKG_VERSION:=1.1.3
+PKG_VERSION:=1.1.4
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/minidlna
-PKG_MD5SUM:=879027192c89e5376cdd2ae2d1aa33b4
+PKG_MD5SUM:=67c9e91285bc3801fd91a5d26ea775d7
PKG_LICENSE:=GPL-2.0 BSD-3-Clause
PKG_LICENSE_FILES:=COPYING LICENCE.miniupnpd
@@ -75,7 +75,7 @@ CONFIGURE_ARGS +=\
define Package/minidlna/install
$(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/minidlna $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/minidlnad $(1)/usr/bin/minidlna
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/minidlna.init $(1)/etc/init.d/minidlna
$(INSTALL_DIR) $(1)/etc/config
diff --git a/multimedia/minidlna/patches/020-makefileam-tweaks.patch b/multimedia/minidlna/patches/020-makefileam-tweaks.patch
deleted file mode 100644
index 93d3f3cb1..000000000
--- a/multimedia/minidlna/patches/020-makefileam-tweaks.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,9 +19,9 @@
-
- SUBDIRS=po
-
--sbin_PROGRAMS = minidlnad
-+sbin_PROGRAMS = minidlna
- check_PROGRAMS = testupnpdescgen
--minidlnad_SOURCES = minidlna.c upnphttp.c upnpdescgen.c upnpsoap.c \
-+minidlna_SOURCES = minidlna.c upnphttp.c upnpdescgen.c upnpsoap.c \
- upnpreplyparse.c minixml.c clients.c \
- getifaddr.c process.c upnpglobalvars.c \
- options.c minissdp.c uuid.c upnpevents.c \
-@@ -38,7 +38,7 @@
- flacoggflag = -logg
- #endif
-
--minidlnad_LDADD = \
-+minidlna_LDADD = \
- @LIBJPEG_LIBS@ \
- @LIBID3TAG_LIBS@ \
- @LIBSQLITE3_LIBS@ \
-@@ -49,7 +49,7 @@
- @LIBICONV@ \
- -lFLAC $(flacoggflag) $(vorbisflag)
-
--minidlnad_LDFLAGS = @STATIC_LDFLAGS@
-+minidlna_LDFLAGS = @STATIC_LDFLAGS@
-
- testupnpdescgen_SOURCES = testupnpdescgen.c upnpdescgen.c
- testupnpdescgen_LDADD = \
diff --git a/multimedia/minidlna/patches/030-upnphttp-fixPhilips.patch b/multimedia/minidlna/patches/030-upnphttp-fixPhilips.patch
deleted file mode 100644
index 8829bdc64..000000000
--- a/multimedia/minidlna/patches/030-upnphttp-fixPhilips.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/upnphttp.c
-+++ b/upnphttp.c
-@@ -1259,7 +1259,7 @@
- int try_sendfile = 1;
- #endif
-
-- while( offset < end_offset )
-+ while( offset <= end_offset )
- {
- #if HAVE_SENDFILE
- if( try_sendfile )
-