miniupnpc: Update to 2.1.20190824
authorRosen Penev <rosenp@gmail.com>
Sat, 21 Sep 2019 22:35:09 +0000 (15:35 -0700)
committerRosen Penev <rosenp@gmail.com>
Sat, 21 Sep 2019 22:57:41 +0000 (15:57 -0700)
Switched to CMAKE_INSTALL to get rid of InstallDev.

Added PKG_BUILD_PARALLEL for faster compilation.

Fixed license information.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
net/miniupnpc/Makefile

index 99231b5ff8c8ba15e56ec6c0ace8efa8ec1ccf91..467b5b5743a84d3e3ae7d5b46eab434bbb0bd2a6 100644 (file)
@@ -8,19 +8,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpc
-PKG_VERSION:=2.1.20190625
+PKG_VERSION:=2.1.20190824
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files
-PKG_HASH:=8723f5d7fd7970de23635547700878cd29a5c2bb708b5e5475b2d1d2510317fb
+PKG_HASH:=1fadefea0ecdceb3e35bb5d901f0db880c826740e93148ddfb087b4b4389e165
 
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
-PKG_LICENSE:=BSD-3c
+PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 PKG_CPE_ID:=cpe:/a:miniupnp_project:miniupnp
 
-PKG_INSTALL:=1
+CMAKE_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -51,17 +52,6 @@ CMAKE_OPTIONS += -DUPNPC_BUILD_TESTS=OFF
 TARGET_CFLAGS += $(FPIC)
 TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
 
-define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/include/miniupnpc
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/include/miniupnpc/*.h \
-               $(1)/usr/include/miniupnpc/
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} \
-               $(1)/usr/lib/
-endef
-
 define Package/miniupnpc/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnpc-shared $(1)/usr/bin/upnpc