From 93bc6b41417878d2113242fbcf24f7636eea8766 Mon Sep 17 00:00:00 2001 From: Petko Bordjukov Date: Mon, 11 May 2015 18:30:16 +0300 Subject: [PATCH 1/3] libupnpp: Bump version to 0.11.0 This new version introduces improvements to the OpenHome support. Signed-off-by: Petko Bordjukov --- libs/libupnpp/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libs/libupnpp/Makefile b/libs/libupnpp/Makefile index 8c9071db5..923187465 100644 --- a/libs/libupnpp/Makefile +++ b/libs/libupnpp/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libupnpp -PKG_VERSION:=0.9.0 +PKG_VERSION:=0.11.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.lesbonscomptes.com/upmpdcli/downloads -PKG_MD5SUM:=ff218bbe2df6cf70b73843d951ef838e +PKG_MD5SUM:=faefaef9e7dbfe57d9224cf49aab6e2e PKG_MAINTAINER:=Petko Bordjukov PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING @@ -39,14 +39,13 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/libupnpp $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libupnpp-$(PKG_VERSION).so* $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libupnpp.{so,la} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libupnpp.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libupnpp.la $(1)/usr/lib/ endef define Package/libupnpp/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libupnpp-$(PKG_VERSION).so.* $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libupnpp.so $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libupnpp.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libupnpp)) From 96cfc0b5972212a8baa05ab43b5836efa8326a5b Mon Sep 17 00:00:00 2001 From: Petko Bordjukov Date: Mon, 11 May 2015 18:38:51 +0300 Subject: [PATCH 2/3] upmpdcli: Bump version to 0.11.0 upmpdcli 0.11 mainly improves on the Songcast support, in complement with the changes in sc2mpd. Especially, it now includes an utility (scctl) and web interface to set up multi-room Songcast. Signed-off-by: Petko Bordjukov --- sound/upmpdcli/Config.in | 17 +++++++++++++++++ sound/upmpdcli/Makefile | 19 +++++++++++++++---- 2 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 sound/upmpdcli/Config.in diff --git a/sound/upmpdcli/Config.in b/sound/upmpdcli/Config.in new file mode 100644 index 000000000..fe3272296 --- /dev/null +++ b/sound/upmpdcli/Config.in @@ -0,0 +1,17 @@ +config PACKAGE_UPMPDCLI_SCCTL + bool "scctl command for configuring SongCast receivers" + default no + depends on PACKAGE_upmpdcli + help + Installs the scctl command. See the following link for more info: + http://www.lesbonscomptes.com/upmpdcli/scmulti.html + +config PACKAGE_UPMPDCLI_SC_WEB_INTERFACE + bool "SongCast web server and associated files (depends on python)" + default no + depends on PACKAGE_upmpdcli + select PACKAGE_python + select PACKAGE_UPMPDCLI_SCCTL + help + Installs the SongCast web interface and web server. See the following + link for more info: http://www.lesbonscomptes.com/upmpdcli/scmulti.html diff --git a/sound/upmpdcli/Makefile b/sound/upmpdcli/Makefile index 385a96bee..42b98fa73 100644 --- a/sound/upmpdcli/Makefile +++ b/sound/upmpdcli/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=upmpdcli -PKG_VERSION:=0.9.0 -PKG_RELEASE:=2 +PKG_VERSION:=0.11.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.lesbonscomptes.com/upmpdcli/downloads -PKG_MD5SUM:=0e7b86037f19ea3a08067409af6f6902 +PKG_MD5SUM:=40eb2a1988ca367a690fb2506e0f73c1 PKG_MAINTAINER:=Petko Bordjukov PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING @@ -29,12 +29,17 @@ define Package/upmpdcli DEPENDS+= +libupnpp +libmpdclient TITLE:=A UPnP front-end to MPD, the Music Player Daemon USERID:=upmpdcli=89:upmpdcli=89 + MENU:=1 endef define Package/upmpdcli/description upmpdcli implements an UPnP Media Renderer, using MPD to perform the real work. endef +define Package/upmpdcli/config + source "$(SOURCE)/Config.in" +endef + define Package/upmpdcli/install $(INSTALL_DIR) $(1)/etc $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/upmpdcli.conf $(1)/etc/ @@ -42,8 +47,14 @@ define Package/upmpdcli/install $(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/ +ifeq ($(CONFIG_PACKAGE_UPMPDCLI_SCCTL),y) + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/scctl $(1)/usr/bin/ +endif $(INSTALL_DIR) $(1)/usr/share/upmpdcli - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/upmpdcli/* $(1)/usr/share/upmpdcli/ +ifneq ($(CONFIG_PACKAGE_UPMPDCLI_SC_WEB_INTERFACE),y) + $(RM) -rf $(PKG_INSTALL_DIR)/usr/share/upmpdcli/web +endif + $(CP) -r $(PKG_INSTALL_DIR)/usr/share/upmpdcli $(1)/usr/share/ $(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 From b839a8a398f5ba08e68c71999433460e3ed27ae4 Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Tue, 31 May 2016 12:09:34 -0400 Subject: [PATCH 3/3] upmpdcli/libupnpp: Update to latest versions, refresh patch upmpdcli: Version 1.1.3 libupnpp: Version 0.14 Signed-off-by: Ted Hess --- libs/libupnpp/Makefile | 6 +++--- sound/upmpdcli/Makefile | 6 +++--- .../patches/010-Add_icon_config.patch | 20 ++++++++++--------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/libs/libupnpp/Makefile b/libs/libupnpp/Makefile index 923187465..9a7db84a2 100644 --- a/libs/libupnpp/Makefile +++ b/libs/libupnpp/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2014 OpenWrt.org +# Copyright (C) 2016 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:=libupnpp -PKG_VERSION:=0.11.0 +PKG_VERSION:=0.14.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.lesbonscomptes.com/upmpdcli/downloads -PKG_MD5SUM:=faefaef9e7dbfe57d9224cf49aab6e2e +PKG_MD5SUM:=1b10905a365fc6277e1d8ced77278666 PKG_MAINTAINER:=Petko Bordjukov PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING diff --git a/sound/upmpdcli/Makefile b/sound/upmpdcli/Makefile index 42b98fa73..e10cea99a 100644 --- a/sound/upmpdcli/Makefile +++ b/sound/upmpdcli/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2015 OpenWrt.org +# Copyright (C) 2016 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:=upmpdcli -PKG_VERSION:=0.11.0 +PKG_VERSION:=1.1.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.lesbonscomptes.com/upmpdcli/downloads -PKG_MD5SUM:=40eb2a1988ca367a690fb2506e0f73c1 +PKG_MD5SUM:=de9f232d6d5f746ec81ec239e11bdda4 PKG_MAINTAINER:=Petko Bordjukov PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING diff --git a/sound/upmpdcli/patches/010-Add_icon_config.patch b/sound/upmpdcli/patches/010-Add_icon_config.patch index 9b1ca6db7..3030ae3a4 100644 --- a/sound/upmpdcli/patches/010-Add_icon_config.patch +++ b/sound/upmpdcli/patches/010-Add_icon_config.patch @@ -1,9 +1,11 @@ ---- 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 +--- a/src/upmpdcli.conf-dist ++++ b/src/upmpdcli.conf-dist +@@ -24,7 +24,7 @@ + + # You can set a path to an icon here. The icon will be displayed by a control + # point. The icon will only be read once, when upmpdcli starts up. +-# iconpath = /usr/share/upmpdcli/icon.png ++iconpath = /usr/share/upmpdcli/icon.png + + # You can set a path to an html file here, to replace the default + # presentation page. The page will only be read once, when upmpdcli starts