libupnp: update to 1.14.5

Switch to compiling with CMake. Faster.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/libs/libupnp/Makefile b/libs/libupnp/Makefile
index 15c4974e0d5d309227cf22360a024d7760cc99b5..52553f0d906ffa65da8032d83365f7c85b7f06ef 100644 (file)
--- a/libs/libupnp/Makefile
+++ b/libs/libupnp/Makefile
@@ -1,23 +1,24 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libupnp
-PKG_VERSION:=1.14.0
-PKG_RELEASE:=2
+PKG_VERSION:=1.14.5
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/pupnp
-PKG_HASH:=ecb23d4291968c8a7bdd4eb16fc2250dbacc16b354345a13342d67f571d35ceb
+PKG_HASH:=227ffa407be6b91d4e42abee1dd27e4b8d7e5ba8d3d45394cca4e1eadc65149a
 
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:libupnp_project:libupnp
 
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
+PKG_CONFIG_DEPENDS:= \
+       CONFIG_PACKAGE_libupnp-sample \
+       CONFIG_IPV6
 
 include $(INCLUDE_DIR)/package.mk
+include ../../devel/ninja/ninja-cmake.mk
 
 define Package/libupnp/Default
   SECTION:=libs
@@ -49,30 +50,33 @@ define Package/libupnp-sample/description
 TVcontrolpoint & tvdevice sample applications run inside /etc/upnp-tvdevice/
 endef
 
-CONFIGURE_ARGS += \
-       --enable-client \
-       --enable-device \
-       --enable-gena \
-       --enable-reuseaddr \
-       --enable-gena \
-       --enable-webserver \
-       --enable-ssdp \
-       --enable-soap \
-       --enable-tools \
-       --enable-blocking_tcp_connections \
-       --enable-samples \
-       --disable-debug \
-       --disable-optssdp \
-       --disable-unspecified_server \
-       --disable-open_ssl \
-       --disable-scriptsupport \
-       --disable-postwrite
+CMAKE_OPTIONS += \
+       -DBUILD_TESTING=OFF \
+       -Dclient=ON \
+       -Ddevice=ON \
+       -Dwebserver=OFF \
+       -Dssdp=ON \
+       -Doptssdp=OFF \
+       -Dsoap=ON \
+       -Dgena=ON \
+       -Dtools=O$(if $(CONFIG_PACKAGE_libupnp-sample),N,FF) \
+       -Dipv6=O$(if $(CONFIG_IPV6),N,FF) \
+       -Dunspecified_server=OFF \
+       -Dopen_ssl=OFF \
+       -Dblocking_tcp_connections=ON \
+       -Dscriptsupport=OFF \
+       -Dpostwrite=OFF \
+       -Dreuseaddr=ON \
+       -Dsamples=O$(if $(CONFIG_PACKAGE_libupnp-sample),N,FF) \
+       -DDOWNLOAD_AND_BUILD_DEPS=OFF
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/upnp $(1)/usr/include/
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ixml,upnp}.{a,so*,la} $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ixml,upnp}.{a,so*} $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib/cmake
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/cmake/* $(1)/usr/lib/cmake
        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libupnp.pc $(1)/usr/lib/pkgconfig/
 endef
@@ -84,9 +88,9 @@ endef
 
 define Package/libupnp-sample/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/.libs/* $(1)/usr/bin
-       $(INSTALL_DIR) $(1)/etc/upnp-tvdevice/web
-       $(INSTALL_DATA) $(PKG_BUILD_DIR)/upnp/sample/web/* $(1)/etc/upnp-tvdevice
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tv* $(1)/usr/bin
+       $(INSTALL_DIR) $(1)/usr/share/upnp
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/upnp/tv* $(1)/usr/share/upnp
 endef
 
 $(eval $(call BuildPackage,libupnp))