Merge from bittboy/buildroot@db180c0

package/libupnpp/Config.in

@@ -0,0 +1,16 @@
+config BR2_PACKAGE_LIBUPNPP
+	bool "libupnpp"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libupnp
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+	select BR2_PACKAGE_EXPAT
+	select BR2_PACKAGE_LIBCURL
+	select BR2_PACKAGE_LIBUPNP18 if !BR2_PACKAGE_LIBUPNP
+	help
+	  The libupnpp C++ library wraps libupnp for easier use by
+	  upmpdcli and upplay.
+
+	  http://www.lesbonscomptes.com/upmpdcli/
+
+comment "libupnpp needs a toolchain w/ C++, threads, gcc >= 4.9"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9

package/libupnpp/libupnpp.hash

@@ -0,0 +1,5 @@
+# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.17.1.tar.gz.sha256
+sha256  90403b55583e932a9a04905a01bf452016a56aecbeade5c9e1454a5fbb6f01b0  libupnpp-0.17.1.tar.gz
+
+# Hash for license file:
+sha256  00a89b0d18aacd4114decf79122db87bf35bddaf2bc50e383c9c9f4c263390b2  COPYING

package/libupnpp/libupnpp.mk

@@ -0,0 +1,23 @@
+################################################################################
+#
+# libupnpp
+#
+################################################################################
+
+LIBUPNPP_VERSION = 0.17.1
+LIBUPNPP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads
+LIBUPNPP_LICENSE = LGPL-2.1+
+LIBUPNPP_LICENSE_FILES = COPYING
+LIBUPNPP_INSTALL_STAGING = YES
+LIBUPNPP_DEPENDENCIES = expat libcurl \
+	$(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18)
+
+# configure script fails to link against the dependencies of libupnp
+# and libcurl causing detection to fail when statically linking
+ifeq ($(BR2_STATIC_LIBS),y)
+LIBUPNPP_DEPENDENCIES += host-pkgconf
+LIBUPNPP_CONF_ENV += \
+	LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libupnp libcurl`"
+endif
+
+$(eval $(autotools-package))