Skip to contentSkip to conversation

package/libupnpp: bump to version 0.17.0

PATCH New Jörg Krause 2 participants 4 messages Jan 16, 2019 – Jan 19, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/libupnpp: bump to version 0.17.0

libupnpp 0.17.0 adds compatibility for libupnp 1.8. Therefore, we prefer selecting libupnp 1.8 and falling back to libupnp 1.6.

Drop patch 0001, which has been merged upstream.

---
 ...-compilation-with-uclibc-on-arm-m68k.patch | 36 -------------------
 package/libupnpp/Config.in                    |  2 +-
 package/libupnpp/libupnpp.hash                |  4 +--
 package/libupnpp/libupnpp.mk                  |  2 +-
 4 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 package/libupnpp/0001-Fix-cross-compilation-with-uclibc-on-arm-m68k.patch
package/libupnpp/0001-Fix-cross-compilation-with-uclibc-on-arm-m68k.patch deleted +0 -36
deleted file mode 100644
index 2c0a4ec79f..0000000000
@@ -1,36 +0,0 @@
-From 2828c2535d4380419ec5114cc3a0564d3686aba9 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Fri, 4 May 2018 11:45:59 +0200
-Subject: [PATCH] Fix cross-compilation with uclibc on arm/m68k
-
-Commit 3f1132ecd27186fa3f1a87ead6a0389802baccbb breaks cross-compilation
-with uclibc on arm and m68k because host_os is set to
-arm-buildroot-uclinux-uclibc or m68k-buildroot-uclinux-uclibc so add
-uclinux to the linux case
-
-Fixes:
- - http://autobuild.buildroot.net/results/cfb332a169863bcb3e6bc6ee7d6f6199f856b0b8
- - http://autobuild.buildroot.net/results/2f6f464f6360ed9ea4c238f503d2c3b8ab3cbd86
-
-[Sent upstream]: https://opensourceprojects.eu/p/libupnpp/code/merge-requests/3
-Signed-off-by: Fabrice Fontaine <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8903b72..3bb354c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -35,7 +35,7 @@ build_linux=no
- build_mac=no
- # Detect the target system
- case "${host_os}" in
--    linux*) build_linux=yes;;
-+    linux*|uclinux*) build_linux=yes;;
-     darwin*) build_mac=yes;;
-     *) AC_MSG_ERROR(["OS $host_os is not supported"]);;
- esac
--- 
-2.14.1
-
package/libupnpp/Config.in +1 -1
index 32877ff56c..a71eff5423 100644
@@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBUPNPP
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_LIBCURL
-	select BR2_PACKAGE_LIBUPNP
+	select BR2_PACKAGE_LIBUPNP18 if !BR2_PACKAGE_LIBUPNP
 	help
 	  The libupnpp C++ library wraps libupnp for easier use by
 	  upmpdcli and upplay.
package/libupnpp/libupnpp.hash +2 -2
index 742a0c7f62..f08c3a4f27 100644
@@ -1,5 +1,5 @@
-# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.16.1.tar.gz.sha256
-sha256  d2ab5a4bb6df035ddddd11542bd4631ab7031354259145f07fbc3c56a8f50fac  libupnpp-0.16.1.tar.gz
+# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.17.0.tar.gz.sha256
+sha256  7035dda48207c254cbd8cd64e4e679a9e5f085a35d28c19bc2ddeba0deaff58b  libupnpp-0.17.0.tar.gz
 
 # Hash for license file:
 sha256  00a89b0d18aacd4114decf79122db87bf35bddaf2bc50e383c9c9f4c263390b2  COPYING
package/libupnpp/libupnpp.mk +1 -1
index 852a72e822..69ce0768a9 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBUPNPP_VERSION = 0.16.1
+LIBUPNPP_VERSION = 0.17.0
 LIBUPNPP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads
 LIBUPNPP_LICENSE = LGPL-2.1+
 LIBUPNPP_LICENSE_FILES = COPYING
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 package/upmpdcli: bump to version 1.4.0

upmpdcli switched license from GPL-2.0+ to LGPL-2.1+, therefore update the hash file for the license file "COPYING".

Note, that upmpdcli depends on libupnpp 0.17.0.

---
 package/upmpdcli/upmpdcli.hash | 6 +++---
 package/upmpdcli/upmpdcli.mk   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
package/upmpdcli/upmpdcli.hash +3 -3
index c59655c9fe..cbd12fe293 100644
@@ -1,5 +1,5 @@
-# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.2.16.tar.gz.sha256:
-sha256  b0dfd33cd5c1c2e4f770660c12d7303b6d8b3fdca4f63530c6a235ce279a9d98  upmpdcli-1.2.16.tar.gz
+# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.0.tar.gz.sha256:
+sha256  28742910fa16b72f0c4e5b7dc561f59aa7f1a5fdd3e8e4f72f359d2e4af90d35  upmpdcli-1.4.0.tar.gz
 
 # Hash for license file:
-sha256  32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
+sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
package/upmpdcli/upmpdcli.mk +2 -2
index 069b143998..d88caac78b 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-UPMPDCLI_VERSION = 1.2.16
+UPMPDCLI_VERSION = 1.4.0
 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads
-UPMPDCLI_LICENSE = GPL-2.0+
+UPMPDCLI_LICENSE = LGPL-2.1+
 UPMPDCLI_LICENSE_FILES = COPYING
 UPMPDCLI_DEPENDENCIES = host-pkgconf libmpdclient libupnpp libmicrohttpd jsoncpp
 
Signature · 1 line
2.20.1
#2 lore raw

PATCH 2/2 package/upmpdcli: bump to version 1.4.0

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"J?rg" == J?rg Krause <[email protected]> writes:

upmpdcli switched license from GPL-2.0+ to LGPL-2.1+, therefore update the hash file for the license file "COPYING".

Note, that upmpdcli depends on libupnpp 0.17.0.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/2 package/libupnpp: bump to version 0.17.0

In reply to Jörg Krause
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"J?rg" == J?rg Krause <[email protected]> writes:

libupnpp 0.17.0 adds compatibility for libupnp 1.8. Therefore, we prefer selecting libupnp 1.8 and falling back to libupnp 1.6.

Drop patch 0001, which has been merged upstream.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard