diff --git a/net/dmapd/Makefile b/net/dmapd/Makefile index 10eec49c3..0a047a81b 100644 --- a/net/dmapd/Makefile +++ b/net/dmapd/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2011 OpenWrt.org +# Copyright (C) 2009-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dmapd -PKG_VERSION:=0.0.43 -PKG_RELEASE:=3 +PKG_VERSION:=0.0.46 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.flyn.org/projects/dmapd -PKG_MD5SUM:=8b5d81beefa758d986300264e7d4324f +PKG_MD5SUM:=2bbd2378f90866b603e8b82c3c3cb929 PKG_FIXUP:=libtool PKG_INSTALL:=1 diff --git a/net/dmapd/files/dmapd.init b/net/dmapd/files/dmapd.init index 350db0018..e76b0ef3e 100644 --- a/net/dmapd/files/dmapd.init +++ b/net/dmapd/files/dmapd.init @@ -1,5 +1,5 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2009-2011 OpenWrt.org +# Copyright (C) 2009-2012 OpenWrt.org START=60 @@ -14,11 +14,14 @@ start() { mkdir -m 0755 -p /var/db/dmapd/DAAP chown dmapd:dmapd /var/db/dmapd/DAAP } + [ -d /var/db/dmapd/DPAP ] || { + mkdir -m 0755 -p /var/db/dmapd/DPAP + chown dmapd:dmapd /var/db/dmapd/DPAP + } mkdir -m 0755 -p /var/lock/subsys mkdir -m 0755 -p /var/media/music mkdir -m 0755 -p /var/media/pictures - DMAPD_DB_MODULE=bdb \ service_start /usr/sbin/dmapd -m /var/media/music -p /var/media/pictures --vips-disc-threshold 64k } diff --git a/net/dmapd/patches/001-dmapd_conf.patch b/net/dmapd/patches/001-dmapd_conf.patch index 8300feec8..9c1e60a33 100644 --- a/net/dmapd/patches/001-dmapd_conf.patch +++ b/net/dmapd/patches/001-dmapd_conf.patch @@ -1,10 +1,11 @@ --- a/distro/dmapd.conf +++ b/distro/dmapd.conf -@@ -1,6 +1,6 @@ - [General] +@@ -3,7 +3,7 @@ + Database-Dir=/var/db/dmapd + # Name that will be used to identify share: -Share-Name=dmapd +Share-Name=OpenWrt # User that dmapd will run as, current user if undefined: - # User=dmapd + User=dmapd