From e61499165b3bef1fab1891a78da1ad22cd7d2465 Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Wed, 4 Feb 2015 14:49:47 -0500 Subject: upmpdcli: Move to sound menu and sub-directory Signed-off-by: Ted Hess --- multimedia/upmpdcli/Makefile | 53 --------------------- multimedia/upmpdcli/files/upmpdcli.config | 15 ------ multimedia/upmpdcli/files/upmpdcli.init | 51 -------------------- multimedia/upmpdcli/files/upmpdcli.png | Bin 1640 -> 0 bytes .../upmpdcli/patches/010-Add_icon_config.patch | 9 ---- sound/upmpdcli/Makefile | 53 +++++++++++++++++++++ sound/upmpdcli/files/upmpdcli.config | 15 ++++++ sound/upmpdcli/files/upmpdcli.init | 51 ++++++++++++++++++++ sound/upmpdcli/files/upmpdcli.png | Bin 0 -> 1640 bytes sound/upmpdcli/patches/010-Add_icon_config.patch | 9 ++++ 10 files changed, 128 insertions(+), 128 deletions(-) delete mode 100644 multimedia/upmpdcli/Makefile delete mode 100644 multimedia/upmpdcli/files/upmpdcli.config delete mode 100644 multimedia/upmpdcli/files/upmpdcli.init delete mode 100644 multimedia/upmpdcli/files/upmpdcli.png delete mode 100644 multimedia/upmpdcli/patches/010-Add_icon_config.patch create mode 100644 sound/upmpdcli/Makefile create mode 100644 sound/upmpdcli/files/upmpdcli.config create mode 100644 sound/upmpdcli/files/upmpdcli.init create mode 100644 sound/upmpdcli/files/upmpdcli.png create mode 100644 sound/upmpdcli/patches/010-Add_icon_config.patch diff --git a/multimedia/upmpdcli/Makefile b/multimedia/upmpdcli/Makefile deleted file mode 100644 index d921feecc..000000000 --- a/multimedia/upmpdcli/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright (C) 2014 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=upmpdcli -PKG_VERSION:=0.9.0 -PKG_RELEASE:=2 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.lesbonscomptes.com/upmpdcli/downloads -PKG_MD5SUM:=0e7b86037f19ea3a08067409af6f6902 -PKG_MAINTAINER:=Petko Bordjukov -PKG_LICENSE:=GPL-2.0 -PKG_LICENSE_FILES:=COPYING - -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/upmpdcli - SECTION:=multimedia - CATEGORY:=Multimedia - URL:=http://www.lesbonscomptes.com/upmpdcli - DEPENDS+= +libupnpp +libmpdclient - TITLE:=A UPnP front-end to MPD, the Music Player Daemon - USERID:=upmpdcli=89:upmpdcli=89 -endef - -define Package/upmpdcli/description -upmpdcli implements an UPnP Media Renderer, using MPD to perform the real work. -endef - -define Package/upmpdcli/install - $(INSTALL_DIR) $(1)/etc - $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/upmpdcli.conf $(1)/etc/ - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_CONF) ./files/upmpdcli.config $(1)/etc/config/upmpdcli - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/upmpdcli $(1)/usr/bin/ - $(INSTALL_DIR) $(1)/usr/share/upmpdcli - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/upmpdcli/* $(1)/usr/share/upmpdcli/ - $(INSTALL_DATA) ./files/upmpdcli.png $(1)/usr/share/upmpdcli/ - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/upmpdcli.init $(1)/etc/init.d/upmpdcli -endef - -$(eval $(call BuildPackage,upmpdcli)) diff --git a/multimedia/upmpdcli/files/upmpdcli.config b/multimedia/upmpdcli/files/upmpdcli.config deleted file mode 100644 index 56b0ba3ea..000000000 --- a/multimedia/upmpdcli/files/upmpdcli.config +++ /dev/null @@ -1,15 +0,0 @@ -config upmpdcli lan - option interface 'br-lan' -# option friendly_name 'upmpdcli' -# option mpd_host '127.0.0.1' -# option mpd_port '6600' -# option upmpd_port '0' -# option config '/etc/upmpdcli.conf' - -# Add additional interfaces -# -#config upmpdcli wifi -# option interface 'wlan0' - -#config upmpdcli wan -# option interface 'eth0' diff --git a/multimedia/upmpdcli/files/upmpdcli.init b/multimedia/upmpdcli/files/upmpdcli.init deleted file mode 100644 index 6c69209c2..000000000 --- a/multimedia/upmpdcli/files/upmpdcli.init +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2014 OpenWrt.org - -NAME=upmpdcli -START=95 - -UPMPD_BIN=/usr/bin/${NAME} - -USE_PROCD=1 - -append_arg() { - local cfg="$1" - local var="$2" - local opt="$3" - local def="$4" - local val - - config_get val "$cfg" "$var" - [ -n "$val" -o -n "$def" ] && procd_append_param command $opt "${val:-$def}" -} - -start_instance() { - local cfg="$1" - local interface - - procd_open_instance - - procd_set_param command "${UPMPD_BIN}" - -# config_get interface "$cfg" interface -# procd_add_reload_interface_trigger $interface - - append_arg "$cfg" interface "-i" - append_arg "$cfg" mpd_host "-h" - append_arg "$cfg" mpd_port "-p" - append_arg "$cfg" upmpd_port "-P" - - append_arg "$cfg" config "-c" - append_arg "$cfg" friendly_name "-f" - - procd_close_instance -} - -service_triggers() { - procd_add_reload_trigger "${NAME}" -} - -start_service() { - config_load ${NAME} - config_foreach start_instance ${NAME} -} diff --git a/multimedia/upmpdcli/files/upmpdcli.png b/multimedia/upmpdcli/files/upmpdcli.png deleted file mode 100644 index ba50c6446..000000000 Binary files a/multimedia/upmpdcli/files/upmpdcli.png and /dev/null differ diff --git a/multimedia/upmpdcli/patches/010-Add_icon_config.patch b/multimedia/upmpdcli/patches/010-Add_icon_config.patch deleted file mode 100644 index 9b1ca6db7..000000000 --- a/multimedia/upmpdcli/patches/010-Add_icon_config.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/src/upmpdcli.conf -+++ b/src/upmpdcli.conf -@@ -53,3 +53,6 @@ ohmetapersist = 1 - # Path to the sc2mpd if it is not in /usr/bin and the location is not in - # the PATH for the init scripts. - #sc2mpd = /usr/bin/sc2mpd -+ -+# Icon for MPD UPnP interface -+iconpath = /usr/share/upmpdcli/upmpdcli.png diff --git a/sound/upmpdcli/Makefile b/sound/upmpdcli/Makefile new file mode 100644 index 000000000..1286cd42c --- /dev/null +++ b/sound/upmpdcli/Makefile @@ -0,0 +1,53 @@ +# +# Copyright (C) 2015 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=upmpdcli +PKG_VERSION:=0.9.0 +PKG_RELEASE:=2 + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.lesbonscomptes.com/upmpdcli/downloads +PKG_MD5SUM:=0e7b86037f19ea3a08067409af6f6902 +PKG_MAINTAINER:=Petko Bordjukov +PKG_LICENSE:=GPL-2.0 +PKG_LICENSE_FILES:=COPYING + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/upmpdcli + SECTION:=sound + CATEGORY:=Sound + URL:=http://www.lesbonscomptes.com/upmpdcli + DEPENDS+= +libupnpp +libmpdclient + TITLE:=A UPnP front-end to MPD, the Music Player Daemon + USERID:=upmpdcli=89:upmpdcli=89 +endef + +define Package/upmpdcli/description +upmpdcli implements an UPnP Media Renderer, using MPD to perform the real work. +endef + +define Package/upmpdcli/install + $(INSTALL_DIR) $(1)/etc + $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/upmpdcli.conf $(1)/etc/ + $(INSTALL_DIR) $(1)/etc/config + $(INSTALL_CONF) ./files/upmpdcli.config $(1)/etc/config/upmpdcli + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/upmpdcli $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/share/upmpdcli + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/upmpdcli/* $(1)/usr/share/upmpdcli/ + $(INSTALL_DATA) ./files/upmpdcli.png $(1)/usr/share/upmpdcli/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/upmpdcli.init $(1)/etc/init.d/upmpdcli +endef + +$(eval $(call BuildPackage,upmpdcli)) diff --git a/sound/upmpdcli/files/upmpdcli.config b/sound/upmpdcli/files/upmpdcli.config new file mode 100644 index 000000000..56b0ba3ea --- /dev/null +++ b/sound/upmpdcli/files/upmpdcli.config @@ -0,0 +1,15 @@ +config upmpdcli lan + option interface 'br-lan' +# option friendly_name 'upmpdcli' +# option mpd_host '127.0.0.1' +# option mpd_port '6600' +# option upmpd_port '0' +# option config '/etc/upmpdcli.conf' + +# Add additional interfaces +# +#config upmpdcli wifi +# option interface 'wlan0' + +#config upmpdcli wan +# option interface 'eth0' diff --git a/sound/upmpdcli/files/upmpdcli.init b/sound/upmpdcli/files/upmpdcli.init new file mode 100644 index 000000000..6c69209c2 --- /dev/null +++ b/sound/upmpdcli/files/upmpdcli.init @@ -0,0 +1,51 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2014 OpenWrt.org + +NAME=upmpdcli +START=95 + +UPMPD_BIN=/usr/bin/${NAME} + +USE_PROCD=1 + +append_arg() { + local cfg="$1" + local var="$2" + local opt="$3" + local def="$4" + local val + + config_get val "$cfg" "$var" + [ -n "$val" -o -n "$def" ] && procd_append_param command $opt "${val:-$def}" +} + +start_instance() { + local cfg="$1" + local interface + + procd_open_instance + + procd_set_param command "${UPMPD_BIN}" + +# config_get interface "$cfg" interface +# procd_add_reload_interface_trigger $interface + + append_arg "$cfg" interface "-i" + append_arg "$cfg" mpd_host "-h" + append_arg "$cfg" mpd_port "-p" + append_arg "$cfg" upmpd_port "-P" + + append_arg "$cfg" config "-c" + append_arg "$cfg" friendly_name "-f" + + procd_close_instance +} + +service_triggers() { + procd_add_reload_trigger "${NAME}" +} + +start_service() { + config_load ${NAME} + config_foreach start_instance ${NAME} +} diff --git a/sound/upmpdcli/files/upmpdcli.png b/sound/upmpdcli/files/upmpdcli.png new file mode 100644 index 000000000..ba50c6446 Binary files /dev/null and b/sound/upmpdcli/files/upmpdcli.png differ diff --git a/sound/upmpdcli/patches/010-Add_icon_config.patch b/sound/upmpdcli/patches/010-Add_icon_config.patch new file mode 100644 index 000000000..9b1ca6db7 --- /dev/null +++ b/sound/upmpdcli/patches/010-Add_icon_config.patch @@ -0,0 +1,9 @@ +--- a/src/upmpdcli.conf ++++ b/src/upmpdcli.conf +@@ -53,3 +53,6 @@ ohmetapersist = 1 + # Path to the sc2mpd if it is not in /usr/bin and the location is not in + # the PATH for the init scripts. + #sc2mpd = /usr/bin/sc2mpd ++ ++# Icon for MPD UPnP interface ++iconpath = /usr/share/upmpdcli/upmpdcli.png -- cgit v1.2.3