diff --git a/net/dmapd/Makefile b/net/dmapd/Makefile index 91aefe499..0b6f6ed9b 100644 --- a/net/dmapd/Makefile +++ b/net/dmapd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dmapd -PKG_VERSION:=0.0.73 +PKG_VERSION:=0.0.75 PKG_RELEASE:=1 PKG_MAINTAINER:=W. Michael Petullo @@ -17,8 +17,8 @@ PKG_LICENSE:=GPLv2 PKG_LICENSE_FILES:=COPYING PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.flyn.org/projects/dmapd -PKG_HASH:=5447e8d28cd93739efe479e8ca3e140043b11aca4427676e8990b300618011a1 +PKG_SOURCE_URL:=https://www.flyn.org/projects/dmapd +PKG_HASH:=f296a5ba02eae36a41381d19d5d08f2b9b7657091db9674f82121cd26c2893a1 PKG_FIXUP:=autoreconf PKG_INSTALL:=2 @@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/nls.mk define Package/dmapd SECTION:=net CATEGORY:=Network - DEPENDS:=+libdmapsharing +libdb47 +vips + DEPENDS:=+libdmapsharing +libdb47 +vips +libgst1pbutils TITLE:= dmapd URL:=http://www.flyn.org/projects/dmapd/ USERID:=dmapd=56:dmapd=56 diff --git a/net/dmapd/files/dmapd.init b/net/dmapd/files/dmapd.init index 76ecd501f..33a41f1eb 100644 --- a/net/dmapd/files/dmapd.init +++ b/net/dmapd/files/dmapd.init @@ -2,8 +2,10 @@ # Copyright (C) 2009-2012 OpenWrt.org START=60 +USE_PROCD=1 +PROG=/usr/sbin/dmapd -start() { +start_service() { [ -d /var/run/dmapd ] || { mkdir -m 0755 -p /var/run/dmapd chown dmapd:dmapd /var/run/dmapd @@ -20,9 +22,11 @@ start() { mkdir -m 0755 -p /var/media/music mkdir -m 0755 -p /var/media/pictures - service_start /usr/sbin/dmapd -u dmapd -g dmapd -m /var/media/music -p /var/media/pictures --vips-disc-threshold 64k -} - -stop() { - service_stop /usr/sbin/dmapd + procd_open_instance + procd_set_param stdout 1 + procd_set_param stderr 1 + procd_set_param pidfile /var/run/dmapd.pid + procd_set_param user dmapd + procd_set_param command $PROG -f + procd_close_instance } diff --git a/net/dmapd/patches/001-dmapd_conf.patch b/net/dmapd/patches/001-dmapd_conf.patch deleted file mode 100644 index 9c1e60a33..000000000 --- a/net/dmapd/patches/001-dmapd_conf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/distro/dmapd.conf -+++ b/distro/dmapd.conf -@@ -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 diff --git a/net/dmapd/patches/002-make_unit_test_optionnal.patch b/net/dmapd/patches/001-make_unit_test_optional.patch similarity index 100% rename from net/dmapd/patches/002-make_unit_test_optionnal.patch rename to net/dmapd/patches/001-make_unit_test_optional.patch