testing/minidlna: cleanup and upgrade to 1.1.4

4 files changed, 21 insertions, 81 deletions

diff --git a/testing/minidlna/APKBUILD b/testing/minidlna/APKBUILD
index 2985b15b98..e6d68aacd3 100644
--- a/testing/minidlna/APKBUILD
+++ b/testing/minidlna/APKBUILD
@@ -1,22 +1,21 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=minidlna
-pkgver=1.1.0
-pkgrel=2
+pkgver=1.1.4
+pkgrel=0
 pkgdesc="A small dlna server"
 url="http://sourceforge.net/projects/minidlna/"
 arch="all"
 license="GPL"
 depends=
-depends_dev="libvorbis-dev libogg-dev libid3tag-dev libexif-dev jpeg-dev
+depends_dev="libvorbis-dev libogg-dev libid3tag-dev libexif-dev libjpeg-turbo-dev
 	sqlite-dev ffmpeg-dev flac-dev libiconv-dev"
 makedepends="$depends_dev"
 install="minidlna.pre-install"
-subpackages=""
+subpackages="$pkgname-doc"
 pkgusers="$pkgname"
 pkggroups="$pkgname"
 source="http://downloads.sourceforge.net/project/minidlna/minidlna/$pkgver/minidlna-$pkgver.tar.gz
-	headers.patch
 	$pkgname.initd
 	$pkgname.confd"
 
@@ -30,7 +29,7 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
-	update_config_sub || return 1
+	#update_config_sub || return 1
 }
 
 build() {
@@ -46,22 +45,27 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
-	mkdir -p "$pkgdir"/var/cache/$pkgname
-	chown $pkgusers:$pkggroups "$pkgdir"/var/cache/$pkgname
-	install -m755 -D "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
-	install -m644 -D "$srcdir/$pkgname.confd" "$pkgdir/etc/conf.d/$pkgname"
-	install -m755 -D "$pkgname.conf" "$pkgdir"/etc/$pkgname.conf	
+	mkdir -p "$pkgdir"/var/cache/$pkgname || return 1
+	chown $pkgusers:$pkggroups \
+		"$pkgdir"/var/cache/$pkgname || return 1
+	install -m755 -D "$srcdir/$pkgname.initd" \
+		"$pkgdir/etc/init.d/$pkgname" || return 1
+	install -m644 -D "$srcdir/$pkgname.confd" \
+		"$pkgdir/etc/conf.d/$pkgname" || return 1
+	install -m755 -D "$pkgname.conf" \
+		"$pkgdir"/etc/$pkgname.conf || return 1
+	install -Dm644 "$srcdir"/$pkgname-$pkgver/minidlna.conf.5 \
+		"$pkgdir"/usr/share/man/man5/minidlna.conf.5 || return 1
+	install -Dm644 "$srcdir"/$pkgname-$pkgver/minidlnad.8 \
+		"$pkgdir"/usr/share/man/man8/minidlnad.8 || return 1
 }
 
-md5sums="26484a84af3fceafdee26595aae097f7  minidlna-1.1.0.tar.gz
-452a71cf87d610abbb3722c8dba8e69a  headers.patch
+md5sums="67c9e91285bc3801fd91a5d26ea775d7  minidlna-1.1.4.tar.gz
 5af7d64de1978260ef7eb441bb249310  minidlna.initd
 59d14c1bf3cd637138bfa58db7255d78  minidlna.confd"
-sha256sums="c2ef2ebe4311d08a60a87ec0c86fbe5e7f4fd25b947841f1d71b0508c60a90e2  minidlna-1.1.0.tar.gz
-737eb9bac19da46a6b6549e551aad5ec576673644ea35c3e8c0f3ded75bef4b7  headers.patch
+sha256sums="9814c04a2c506a0dd942c4218d30c07dedf90dabffbdef2d308a3f9f23545314  minidlna-1.1.4.tar.gz
 136b5d944d6104330ef3144501ba2a579baaee4d82704867596d7eb68aeeb0c5  minidlna.initd
 67603d65c6bd3918255f050cb5cfd6fc1373b024bca1ce728f03491a90d79e19  minidlna.confd"
-sha512sums="9240d857fc3927c06183c04c4d657c1b2b0596f63dbc549f331b52032698349e82244870f2ebf6f8bc8bf0ff5f2ff88df69b53d280f5e5f9b618a5de58ac6f57  minidlna-1.1.0.tar.gz
-47c4525881bddb3412183bc89010e17307765baac477a2ee4133f91514399cd56a8674965c17e254151bf5477b4767c3b04cb0f4688f2af28b532dde8ea7f805  headers.patch
+sha512sums="24c2d82222798278d60faa46c6d7b19e44a91868da869f7d2aa2bf3c68e343a6c2a323f67223ea69242919047b08f059ed9c7a49b0b516384244acd98b51db4e  minidlna-1.1.4.tar.gz
 47579822f25716086a1f69996c60b5f051cf92403a2c56fff094a94468906aef9288d5cf12d9ecf9bf75557a5f2c29ce38c27a3fa9c9a9f3996189e1885e6e0d  minidlna.initd
 e209848af0d79069ac989ad61d3be610b4c0c2783a207a50463a25ec3811b04d1da3a2acde54749878bec44e1567874ede827b978d5472c00f6a855663e5cbf8  minidlna.confd"
diff --git a/testing/minidlna/ffmpeg.patch b/testing/minidlna/ffmpeg.patch
deleted file mode 100644
index d55ddc089b..0000000000
--- a/testing/minidlna/ffmpeg.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/metadata.c b/metadata.c
-index 39a65ef..74d5488 100644
---- a/metadata.c
-+++ b/metadata.c
-@@ -30,9 +30,9 @@
- #include "image_utils.h"
- #include <jpeglib.h>
- #include <setjmp.h>
--#include <avutil.h>
--#include <avcodec.h>
--#include <avformat.h>
-+#include <libavutil/avutil.h>
-+#include <libavfilter/avcodec.h>
-+#include <libavformat/avformat.h>
- #include "tagutils/tagutils.h"
- 
- #include "upnpglobalvars.h"
diff --git a/testing/minidlna/headers.patch b/testing/minidlna/headers.patch
deleted file mode 100644
index 8e994dbf45..0000000000
--- a/testing/minidlna/headers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./minissdp.c.orig	2014-08-23 00:40:46.218655070 +0500
-+++ ./minissdp.c	2014-08-23 00:41:17.972176864 +0500
-@@ -41,6 +41,7 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <errno.h>
-+#include <sys/time.h>
- 
- #include "minidlnapath.h"
- #include "upnphttp.h"
---- ./clients.h.orig	2014-08-23 00:39:47.001636613 +0500
-+++ ./clients.h	2014-08-23 00:39:56.545026648 +0500
-@@ -2,6 +2,7 @@
- #define __CLIENTS_H__
- #include <stdint.h>
- #include <netinet/in.h>
-+#include <time.h>
- 
- #define CLIENT_CACHE_SLOTS 20
- 
diff --git a/testing/minidlna/makefile.patch b/testing/minidlna/makefile.patch
deleted file mode 100644
index a3be83f82c..0000000000
--- a/testing/minidlna/makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 86e03a3..17871ea 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,13 +12,17 @@
- #
- #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
-+
-+libavutil_cflags := $(shell pkg-config --cflags libavutil)
-+libavformat_cflags := $(shell pkg-config --cflags libavformat)
-+libavfilter_cflags := $(shell pkg-config --cflags libavfilter)
-+
-+CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -I. \
-+	$(libavutil_cflags) $(libavfilter_cflags) $(libavformat_clfags)
-+
- #STATIC_LINKING: CFLAGS += -DSTATIC
- #STATIC_LINKING: LDFLAGS = -static
--CC = gcc
-+CC ?= gcc
- RM = rm -f
- INSTALL = install
-