Skip to contentSkip to conversation

package/libnpupnp: new package

PATCH New Fabrice Fontaine 2 participants 4 messages Jun 23, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 package/libnpupnp: new package

npupnp (new pupnp or not pupnp ?) is an UPnP library derived from the venerable pupnp (https://github.com/pupnp/pupnp), based on its 1.6.x branch (around 1.6.25).

https://www.lesbonscomptes.com/upmpdcli/libnpupnp.html

---
 DEVELOPERS                       |  1 +
 package/Config.in                |  1 +
 package/libnpupnp/Config.in      | 16 ++++++++++++++++
 package/libnpupnp/libnpupnp.hash |  5 +++++
 package/libnpupnp/libnpupnp.mk   | 14 ++++++++++++++
 5 files changed, 37 insertions(+)
 create mode 100644 package/libnpupnp/Config.in
 create mode 100644 package/libnpupnp/libnpupnp.hash
 create mode 100644 package/libnpupnp/libnpupnp.mk
DEVELOPERS +1 -0
index fb6d4cec64..4b6a346a05 100644
@@ -856,6 +856,7 @@ F:	package/libmatroska/
 F:	package/libmpdclient/
 F:	package/libnetfilter_conntrack/
 F:	package/libnetfilter_queue/
+F:	package/libnpupnp/
 F:	package/liboping/
 F:	package/libpfm4/
 F:	package/libraw/
package/Config.in +1 -0
index e2bb004015..6a34a895af 100644
@@ -1712,6 +1712,7 @@ menu "Networking"
 	source "package/libnice/Config.in"
 	source "package/libnids/Config.in"
 	source "package/libnl/Config.in"
+	source "package/libnpupnp/Config.in"
 	source "package/liboauth/Config.in"
 	source "package/liboping/Config.in"
 	source "package/libosip2/Config.in"
package/libnpupnp/Config.in new file +16 -0
new file mode 100644
index 0000000000..71016b069e
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_LIBNPUPNP
+	bool "libnpupnp"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_EXPAT
+	select BR2_PACKAGE_LIBCURL
+	select BR2_PACKAGE_LIBMICROHTTPD
+	help
+	  npupnp (new pupnp or not pupnp ?) is an UPnP library derived
+	  from the venerable pupnp (https://github.com/pupnp/pupnp),
+	  based on its 1.6.x branch (around 1.6.25).
+
+	  https://www.lesbonscomptes.com/upmpdcli/libnpupnp.html
+
+comment "libnpupnp needs a toolchain w/ C++, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
package/libnpupnp/libnpupnp.hash new file +5 -0
new file mode 100644
index 0000000000..41cc41955b
@@ -0,0 +1,5 @@
+# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-4.0.7.tar.gz.sha256
+sha256  30f15caa67dc83f76b0976438165aa4704a50c7e3e5444c50bb8cbad874877ca  libnpupnp-4.0.7.tar.gz
+
+# Hash for license file:
+sha256  c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3  COPYING
package/libnpupnp/libnpupnp.mk new file +14 -0
new file mode 100644
index 0000000000..abd80ab63b
@@ -0,0 +1,14 @@
+################################################################################
+#
+# libnpupnp
+#
+################################################################################
+
+LIBNPUPNP_VERSION = 4.0.7
+LIBNPUPNP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads
+LIBNPUPNP_LICENSE = BSD-3-Clause
+LIBNPUPNP_LICENSE_FILES = COPYING
+LIBNPUPNP_INSTALL_STAGING = YES
+LIBNPUPNP_DEPENDENCIES = expat libcurl libmicrohttpd
+
+$(eval $(autotools-package))
Signature · 1 line
2.26.2
#1 lore raw

PATCH 2/3 package/libupnpp: bump to version 0.19.2

Starting from this version libupnp has been replaced with libnpupnp

---
 package/libupnpp/Config.in     | 4 ++--
 package/libupnpp/libupnpp.hash | 4 ++--
 package/libupnpp/libupnpp.mk   | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)
package/libupnpp/Config.in +2 -2
index a71eff5423..41afa9300f 100644
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_LIBUPNPP
 	bool "libupnpp"
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libupnp
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libnpupnp
 	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
+	select BR2_PACKAGE_LIBNPUPNP
 	help
 	  The libupnpp C++ library wraps libupnp for easier use by
 	  upmpdcli and upplay.
package/libupnpp/libupnpp.hash +2 -2
index 993dbc89ae..fb510236a3 100644
@@ -1,5 +1,5 @@
-# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.17.2.tar.gz.sha256
-sha256  5abaaf353a1e9c3482d61ef2627b650285d59f27c1ee60d35b8951952261374f  libupnpp-0.17.2.tar.gz
+# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.19.2.tar.gz.sha256
+sha256  c9623533271605c92dfa603f5fe0ab6d3d5b4384a0c9173800784f4aa643a190  libupnpp-0.19.2.tar.gz
 
 # Hash for license file:
 sha256  00a89b0d18aacd4114decf79122db87bf35bddaf2bc50e383c9c9f4c263390b2  COPYING
package/libupnpp/libupnpp.mk +2 -3
index c9c103d9b5..ef1816166e 100644
@@ -4,12 +4,11 @@
 #
 ################################################################################
 
-LIBUPNPP_VERSION = 0.17.2
+LIBUPNPP_VERSION = 0.19.2
 LIBUPNPP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads
 LIBUPNPP_LICENSE = LGPL-2.1+
 LIBUPNPP_LICENSE_FILES = COPYING
 LIBUPNPP_INSTALL_STAGING = YES
-LIBUPNPP_DEPENDENCIES = host-pkgconf expat libcurl \
-	$(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18)
+LIBUPNPP_DEPENDENCIES = host-pkgconf expat libcurl libnpupnp
 
 $(eval $(autotools-package))
Signature · 1 line
2.26.2
#2 lore raw

PATCH 3/3 package/upmpdcli: bump to version 1.4.12

In reply to Fabrice Fontaine
---
 package/upmpdcli/upmpdcli.hash | 4 ++--
 package/upmpdcli/upmpdcli.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/upmpdcli/upmpdcli.hash +2 -2
index 6eb6c7b9ea..83fb5cf967 100644
@@ -1,5 +1,5 @@
-# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.9.tar.gz.sha256:
-sha256  ace5a3166891109d2a874f21306986857ee2620230a77751ed6209f7b5cc9c58  upmpdcli-1.4.9.tar.gz
+# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.12.tar.gz.sha256:
+sha256  bffc78c140ad688987894ea5a1e162e6dcbc7dcae7d2cc322a894f5ea2a2f53b  upmpdcli-1.4.12.tar.gz
 
 # Hash for license file:
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
package/upmpdcli/upmpdcli.mk +1 -1
index ab4b8bfd3c..1315022ee8 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-UPMPDCLI_VERSION = 1.4.9
+UPMPDCLI_VERSION = 1.4.12
 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads
 UPMPDCLI_LICENSE = LGPL-2.1+
 UPMPDCLI_LICENSE_FILES = COPYING
Signature · 1 line
2.26.2
#3 lore raw

PATCH 1/3 package/libnpupnp: new package

In reply to Fabrice Fontaine

Fabrice, All,

On 2020-06-23 18:30 +0200, Fabrice Fontaine spake thusly:

Quoted 7 lines

npupnp (new pupnp or not pupnp ?) is an UPnP library derived from the venerable pupnp (https://github.com/pupnp/pupnp), based on its 1.6.x branch (around 1.6.25).

https://www.lesbonscomptes.com/upmpdcli/libnpupnp.html

This does not build with all test-pkg configurations;

    $ echo BR2_PACKAGE_LIBNPUPNP=y >libnpupnp.conf
    $ ./utils/test-pkg -p libnpupnp -c libnpupnp.conf -d $(pwd)/run-tests
                 sourcery-arm [6/6]: FAILED

The errors are:

    src/ssdp/ssdpparser.cpp: In member function 'bool SSDPPacketParser::parse()':
    src/ssdp/ssdpparser.cpp:146:48: error: 'strcasecmp' was not declared in this scope
                 if (!strcasecmp("CACHE-CONTROL", nm)) {
                                                    ^
    src/ssdp/ssdpparser.cpp:151:39: error: 'strcasecmp' was not declared in this scope
                 if (!strcasecmp("DATE", nm)) {
                                           ^
    src/ssdp/ssdpparser.cpp:156:38: error: 'strcasecmp' was not declared in this scope
                 if (!strcasecmp("EXT", nm)) {
                                          ^
    src/ssdp/ssdpparser.cpp:161:39: error: 'strcasecmp' was not declared in this scope
                 if (!strcasecmp("HOST", nm)) {
                                           ^
    src/ssdp/ssdpparser.cpp:166:43: error: 'strcasecmp' was not declared in this scope
                 if (!strcasecmp("LOCATION", nm)) {
                                               ^
    src/ssdp/ssdpparser.cpp:171:38: error: 'strcasecmp' was not declared in this scope
                 if (!strcasecmp("MAN", nm)) {
                                          ^
    src/ssdp/ssdpparser.cpp:178:37: error: 'strcasecmp' was not declared in this scope
                 if (!strcasecmp("NT", nm)) {
                                         ^
    src/ssdp/ssdpparser.cpp:185:41: error: 'strcasecmp' was not declared in this scope
             if (!strcasecmp("SERVER", nm)) {
                                         ^
    src/ssdp/ssdpparser.cpp:192:45: error: 'strcasecmp' was not declared in this scope
             if (!strcasecmp("USER-AGENT", nm)) {
                                             ^
    src/ssdp/ssdpparser.cpp:215:33: error: 'strcmp' was not declared in this scope
         bool ret = strcmp(cp, "\r\n") == 0;
                                 ^
    src/ssdp/ssdp_device.cpp: In function 'int AdvertiseAndReply(SSDPDevMessageType, UpnpDevice_Handle, SsdpSearchType, sockaddr*, char*, char*, char*, int)':
    src/ssdp/ssdp_device.cpp:832:72: error: invalid initialization of reference of type 'const sockaddr_storage&' from expression of type '<brace-enclosed initializer list>'
                         const struct sockaddr_storage& fss{ipaddr.getaddr()};
                                                                            ^

The first ones are probably because of a too old glibc, while the later is probably due to C++11 correctness. Care to have a look and respin the whole series, please?

Regards,
Yann E. MORIN.

Quoted 95 lines
---
 DEVELOPERS                       |  1 +
 package/Config.in                |  1 +
 package/libnpupnp/Config.in      | 16 ++++++++++++++++
 package/libnpupnp/libnpupnp.hash |  5 +++++
 package/libnpupnp/libnpupnp.mk   | 14 ++++++++++++++
 5 files changed, 37 insertions(+)
 create mode 100644 package/libnpupnp/Config.in
 create mode 100644 package/libnpupnp/libnpupnp.hash
 create mode 100644 package/libnpupnp/libnpupnp.mk
DEVELOPERS +1 -0
index fb6d4cec64..4b6a346a05 100644
@@ -856,6 +856,7 @@ F:	package/libmatroska/
 F:	package/libmpdclient/
 F:	package/libnetfilter_conntrack/
 F:	package/libnetfilter_queue/
+F:	package/libnpupnp/
 F:	package/liboping/
 F:	package/libpfm4/
 F:	package/libraw/
package/Config.in +1 -0
index e2bb004015..6a34a895af 100644
@@ -1712,6 +1712,7 @@ menu "Networking"
 	source "package/libnice/Config.in"
 	source "package/libnids/Config.in"
 	source "package/libnl/Config.in"
+	source "package/libnpupnp/Config.in"
 	source "package/liboauth/Config.in"
 	source "package/liboping/Config.in"
 	source "package/libosip2/Config.in"
package/libnpupnp/Config.in new file +16 -0
new file mode 100644
index 0000000000..71016b069e
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_LIBNPUPNP
+	bool "libnpupnp"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_EXPAT
+	select BR2_PACKAGE_LIBCURL
+	select BR2_PACKAGE_LIBMICROHTTPD
+	help
+	  npupnp (new pupnp or not pupnp ?) is an UPnP library derived
+	  from the venerable pupnp (https://github.com/pupnp/pupnp),
+	  based on its 1.6.x branch (around 1.6.25).
+
+	  https://www.lesbonscomptes.com/upmpdcli/libnpupnp.html
+
+comment "libnpupnp needs a toolchain w/ C++, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
package/libnpupnp/libnpupnp.hash new file +5 -0
new file mode 100644
index 0000000000..41cc41955b
@@ -0,0 +1,5 @@
+# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-4.0.7.tar.gz.sha256
+sha256  30f15caa67dc83f76b0976438165aa4704a50c7e3e5444c50bb8cbad874877ca  libnpupnp-4.0.7.tar.gz
+
+# Hash for license file:
+sha256  c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3  COPYING
package/libnpupnp/libnpupnp.mk new file +14 -0
new file mode 100644
index 0000000000..abd80ab63b
@@ -0,0 +1,14 @@
+################################################################################
+#
+# libnpupnp
+#
+################################################################################
+
+LIBNPUPNP_VERSION = 4.0.7
+LIBNPUPNP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads
+LIBNPUPNP_LICENSE = BSD-3-Clause
+LIBNPUPNP_LICENSE_FILES = COPYING
+LIBNPUPNP_INSTALL_STAGING = YES
+LIBNPUPNP_DEPENDENCIES = expat libcurl libmicrohttpd
+
+$(eval $(autotools-package))
Signature · 6 lines
2.26.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'