From 250f33d0ff4b7f687cd7c00d0b66c02c410ae59b Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Tue, 3 Aug 2021 06:29:06 +0000 Subject: [PATCH] package/paho-mqtt-cpp: bump version to 1.2.0 "This release brings in some missing MQTT v5 features, support for websocket headers and proxies, ALPN protocol lists, adds the builder pattern for options, and fixes a number of bugs in both the C++ library and the underlying C lib." https://github.com/eclipse/paho.mqtt.cpp/releases/tag/v1.2.0 This also makes the patch obsolete, since these changes have been merged upstream. Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 ++ ...FindMahoMqttC.cmake-fix-static-build.patch | 35 ------------------- package/paho-mqtt-cpp/paho-mqtt-cpp.hash | 2 +- package/paho-mqtt-cpp/paho-mqtt-cpp.mk | 2 +- 4 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 package/paho-mqtt-cpp/0001-cmake-FindMahoMqttC.cmake-fix-static-build.patch diff --git a/DEVELOPERS b/DEVELOPERS index 1547ff123b..5c663628b6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -606,6 +606,9 @@ F: package/odroidc2-firmware/ N: Daniel J. Leach F: package/dacapo/ +N: Daniel Lang +F: package/paho-mqtt-cpp/ + N: Damien Lanson F: package/libvdpau/ F: package/log4cpp/ diff --git a/package/paho-mqtt-cpp/0001-cmake-FindMahoMqttC.cmake-fix-static-build.patch b/package/paho-mqtt-cpp/0001-cmake-FindMahoMqttC.cmake-fix-static-build.patch deleted file mode 100644 index 934dca219e..0000000000 --- a/package/paho-mqtt-cpp/0001-cmake-FindMahoMqttC.cmake-fix-static-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8aeafa1c2ec90b0e95ba5944266eda115457e10d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 15 Jun 2020 13:40:22 +0200 -Subject: [PATCH] cmake/FindMahoMqttC.cmake: fix static build - -Static libraries of paho-mqtt-c are not suffixed with -static since -version 1.3.2 and -https://github.com/eclipse/paho.mqtt.c/commit/8cc51c78b76a1eabd1df3124b0887ce8b01070ff - -See: https://github.com/eclipse/paho.mqtt.c/pull/704 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/eclipse/paho.mqtt.cpp/pull/275] ---- - cmake/FindPahoMqttC.cmake | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/cmake/FindPahoMqttC.cmake b/cmake/FindPahoMqttC.cmake -index 53f15a3..0ec95bd 100644 ---- a/cmake/FindPahoMqttC.cmake -+++ b/cmake/FindPahoMqttC.cmake -@@ -5,10 +5,6 @@ if(PAHO_WITH_SSL) - else() - set(_PAHO_MQTT_C_LIB_NAME paho-mqtt3a) - endif() --# add suffix when using static Paho MQTT C library variant --if(PAHO_BUILD_STATIC) -- set(_PAHO_MQTT_C_LIB_NAME ${_PAHO_MQTT_C_LIB_NAME}-static) --endif() - - find_library(PAHO_MQTT_C_LIBRARIES NAMES ${_PAHO_MQTT_C_LIB_NAME}) - unset(_PAHO_MQTT_C_LIB_NAME) --- -2.26.2 - diff --git a/package/paho-mqtt-cpp/paho-mqtt-cpp.hash b/package/paho-mqtt-cpp/paho-mqtt-cpp.hash index e5406e0b81..d9b86ce207 100644 --- a/package/paho-mqtt-cpp/paho-mqtt-cpp.hash +++ b/package/paho-mqtt-cpp/paho-mqtt-cpp.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 cb0343349ed91ef51d0e76ae860d19435a730d3d355e57886bb090014cb70bbe paho-mqtt-cpp-1.1.tar.gz +sha256 435e97e4d5b1da13daa26cadd3e83fe9d154930abaa78b8ff1b8c854b5345d8b paho-mqtt-cpp-1.2.0.tar.gz sha256 83bbba033dc985487e321b6dfde111772affb73460be48726299fed3da684b1c edl-v10 sha256 44277b2bec6093e4ac313afec251a4de599d24c4e768f8574d95b13a9d2d97b5 epl-v10 diff --git a/package/paho-mqtt-cpp/paho-mqtt-cpp.mk b/package/paho-mqtt-cpp/paho-mqtt-cpp.mk index 161e53d484..827946605a 100644 --- a/package/paho-mqtt-cpp/paho-mqtt-cpp.mk +++ b/package/paho-mqtt-cpp/paho-mqtt-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -PAHO_MQTT_CPP_VERSION = 1.1 +PAHO_MQTT_CPP_VERSION = 1.2.0 PAHO_MQTT_CPP_SITE = $(call github,eclipse,paho.mqtt.cpp,v$(PAHO_MQTT_CPP_VERSION)) PAHO_MQTT_CPP_LICENSE = EPL-1.0 or BSD-3-Clause PAHO_MQTT_CPP_LICENSE_FILES = epl-v10 edl-v10 -- 2.30.2