From cdf268a8be5c8d966ea22212a48cf4be2d711472 Mon Sep 17 00:00:00 2001 From: kuoruan Date: Sun, 29 May 2016 14:43:39 +0800 Subject: [PATCH 1/2] xupnpd: Update to 2016-05-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Change source url to GitHub * Update to 2016-05-11 * Add LICENSE * Edit Makefile Signed-off-by: Hsing-Wang Liao Signed-off-by: Álvaro Fernández Rojas --- multimedia/xupnpd/Makefile | 28 +++++++++++-------- .../xupnpd/patches/100-default_config.patch | 4 +-- .../xupnpd/patches/101-root_dir_param.patch | 4 +-- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/multimedia/xupnpd/Makefile b/multimedia/xupnpd/Makefile index 9522e83fd7..35b1aad72a 100644 --- a/multimedia/xupnpd/Makefile +++ b/multimedia/xupnpd/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2013-2015 OpenWrt.org +# Copyright (C) 2013-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,15 +8,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xupnpd -PKG_REV:=404 -PKG_VERSION:=$(PKG_REV) +PKG_REV:=fdeeb919264c1dde4a2ead5045eefbe54011b2dc +PKG_VERSION:=2016-05-11 PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=svn +PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE_SUBDIR:=xupnpd-$(PKG_VERSION) -PKG_SOURCE_URL:=http://tsdemuxer.googlecode.com/svn/trunk/xupnpd/src/ +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_URL:=https://github.com/clark15b/xupnpd.git PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz + +PKG_LICENSE:=GPLv2 +PKG_LICENSE_FILES:=LICENSE + PKG_MAINTAINER:=Álvaro Fernández Rojas include $(INCLUDE_DIR)/package.mk @@ -24,7 +28,7 @@ include $(INCLUDE_DIR)/package.mk LUA_FLAGS:=-llua define Build/Compile - (cd $(PKG_BUILD_DIR); $(TARGET_CC) -v $(LUA_FLAGS) $(TARGET_CFLAGS) -fno-exceptions -fno-rtti -DWITH_URANDOM $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -lm -ldl -lcrypt -o xupnpd *.c *.cpp) + (cd $(PKG_BUILD_DIR)/src; $(TARGET_CC) -v $(LUA_FLAGS) $(TARGET_CFLAGS) -fno-exceptions -fno-rtti -DWITH_URANDOM $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -lm -ldl -lcrypt -o xupnpd *.c *.cpp) endef define Package/xupnpd @@ -50,18 +54,18 @@ endef define Package/xupnpd/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/xupnpd $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/xupnpd $(1)/usr/bin $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/xupnpd.init $(1)/etc/init.d/xupnpd $(INSTALL_DIR) $(1)/usr/share/xupnpd - $(CP) $(PKG_BUILD_DIR)/*.lua $(1)/usr/share/xupnpd + $(CP) $(PKG_BUILD_DIR)/src/*.lua $(1)/usr/share/xupnpd $(INSTALL_DIR) $(1)/usr/share/xupnpd/ui - $(CP) $(PKG_BUILD_DIR)/ui/* $(1)/usr/share/xupnpd/ui + $(CP) $(PKG_BUILD_DIR)/src/ui/* $(1)/usr/share/xupnpd/ui $(INSTALL_DIR) $(1)/usr/share/xupnpd/www - $(CP) $(PKG_BUILD_DIR)/www/* $(1)/usr/share/xupnpd/www + $(CP) $(PKG_BUILD_DIR)/src/www/* $(1)/usr/share/xupnpd/www $(INSTALL_DIR) $(1)/usr/share/xupnpd/playlists $(INSTALL_DIR) $(1)/usr/share/xupnpd/plugins - $(CP) $(PKG_BUILD_DIR)/plugins/* $(1)/usr/share/xupnpd/plugins + $(CP) $(PKG_BUILD_DIR)/src/plugins/* $(1)/usr/share/xupnpd/plugins $(INSTALL_DIR) $(1)/usr/share/xupnpd/config $(INSTALL_DIR) $(1)/etc/xupnpd (cd $(1)/etc/xupnpd; ln -s ../../usr/share/xupnpd/config ./; ln -s ../../usr/share/xupnpd/xupnpd.lua ./) diff --git a/multimedia/xupnpd/patches/100-default_config.patch b/multimedia/xupnpd/patches/100-default_config.patch index 89958c7fe6..dee21a9972 100644 --- a/multimedia/xupnpd/patches/100-default_config.patch +++ b/multimedia/xupnpd/patches/100-default_config.patch @@ -1,5 +1,5 @@ ---- a/xupnpd.lua -+++ b/xupnpd.lua +--- a/src/xupnpd.lua ++++ b/src/xupnpd.lua @@ -1,10 +1,10 @@ cfg={} diff --git a/multimedia/xupnpd/patches/101-root_dir_param.patch b/multimedia/xupnpd/patches/101-root_dir_param.patch index 68ea3e82e2..4dac9d9444 100644 --- a/multimedia/xupnpd/patches/101-root_dir_param.patch +++ b/multimedia/xupnpd/patches/101-root_dir_param.patch @@ -1,5 +1,5 @@ ---- a/main.cpp -+++ b/main.cpp +--- a/src/main.cpp ++++ b/src/main.cpp @@ -4,11 +4,14 @@ * https://tsdemuxer.googlecode.com/svn/trunk/xupnpd */ From db651ddd852b71d708e2cf9e98fe03f1864c8aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Mon, 5 Sep 2016 09:23:58 +0200 Subject: [PATCH 2/2] xupnpd: update to latest version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- multimedia/xupnpd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/multimedia/xupnpd/Makefile b/multimedia/xupnpd/Makefile index 35b1aad72a..a533a07737 100644 --- a/multimedia/xupnpd/Makefile +++ b/multimedia/xupnpd/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xupnpd -PKG_REV:=fdeeb919264c1dde4a2ead5045eefbe54011b2dc -PKG_VERSION:=2016-05-11 +PKG_REV:=5c08c051caa0062cc1c401b2d26d1f36dffe9c55 +PKG_VERSION:=2016-07-06 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git