[ptxdist] [PATCH 1/2] bluez: version bump 5.84 -> 5.87

[ptxdist] [PATCH 1/2] bluez: version bump 5.84 -> 5.87

[Sven Püschel]

https://github.com/bluez/bluez/releases/tag/5.85
https://github.com/bluez/bluez/releases/tag/5.86
https://github.com/bluez/bluez/releases/tag/5.87

With 5.87 the legacy hcidump tool has been removed [1].

Disabled the new Telephony and Media Audio Profiles (TMAP) and
Gaming Audio Profiles (GMAP) as well as the Hands-Free Profile (HFP).

[1] https://github.com/bluez/bluez/commit/a035be775703bba1fa92b25769191ffb37ae4c76

Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
 rules/bluez.make | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/rules/bluez.make b/rules/bluez.make
index f46c27d4f..21a47f4f3 100644
--- a/rules/bluez.make
+++ b/rules/bluez.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BLUEZ) += bluez
 #
 # Paths and names
 #
-BLUEZ_VERSION	:= 5.84
-BLUEZ_SHA256	:= 2d7c71217c2410e91dca7be90a6e2a37aaf28840b531f65614b34ff5e522c3d7
+BLUEZ_VERSION	:= 5.87
+BLUEZ_SHA256	:= 8e086b38e7d269781fa78fb702fe2f38bd366d107cdc4debc1674ae9381988e4
 BLUEZ		:= bluez-$(BLUEZ_VERSION)
 BLUEZ_SUFFIX	:= tar.gz
 BLUEZ_URL	:= $(call ptx/mirror, KERNEL, bluetooth/$(BLUEZ).$(BLUEZ_SUFFIX))
@@ -48,13 +48,11 @@ BLUEZ_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--$(call ptx/endis, PTXCONF_BLUEZ_LIBBLUETOOTH)-library \
 	--$(call ptx/endis, PTXCONF_BLUEZ_INSTALL_TESTSCRIPTS)-test \
 	--disable-nfc \
-	--disable-sap \
 	--enable-a2dp \
 	--enable-avrcp \
 	--enable-network \
 	--enable-hid \
 	--enable-hog \
-	--disable-health \
 	--disable-bap \
 	--disable-bass \
 	--disable-mcp \
@@ -62,7 +60,10 @@ BLUEZ_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--disable-vcp \
 	--disable-micp \
 	--disable-csip \
+	--disable-tmap \
+	--disable-gmap \
 	--enable-asha \
+	--disable-hfp \
 	--$(call ptx/endis, PTXCONF_BLUEZ_TOOLS)-tools \
 	--$(call ptx/endis, PTXCONF_BLUEZ_TOOLS)-monitor \
 	--enable-udev \
@@ -120,7 +121,7 @@ ifdef PTXCONF_BLUEZ_TOOLS
 			/usr/bin/$(binprogram))$(ptx/nl))
 
 ifdef PTXCONF_BLUEZ_TOOLS_DEPRECATED
-	@$(foreach binprogram, ciptool hciattach hciconfig hcidump hcitool \
+	@$(foreach binprogram, ciptool hciattach hciconfig hcitool \
 			rfcomm sdptool, \
 		$(call install_copy, bluez, 0, 0, 0755, -, \
 			/usr/bin/$(binprogram))$(ptx/nl))
-- 
2.47.3

[ptxdist] [PATCH 2/2] libical: version bump 3.0.20 -> 4.0.7

[Sven Püschel]

All CMake options are now prefixed with LIBICAL. Also a new option for
64bit time_t support is added.

The license definition is now part of the README.md file and the
licenses are in a dedicated folder. The LGPL-2.1 license changed it's
hash due to reformatting the license to have no explicit line break
after a given character count.

Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
 rules/libical.make | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/rules/libical.make b/rules/libical.make
index 4c104df9b..6f35f8b9d 100644
--- a/rules/libical.make
+++ b/rules/libical.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBICAL) += libical
 #
 # Paths and names
 #
-LIBICAL_VERSION	:= 3.0.20
-LIBICAL_SHA256	:= e73de92f5a6ce84c1b00306446b290a2b08cdf0a80988eca0a2c9d5c3510b4c2
+LIBICAL_VERSION	:= 4.0.7
+LIBICAL_SHA256	:= 47c05bc96e41416578cf1803bb2ba3f8d292cb17d5ac2fca539dee922bae8a94
 LIBICAL		:= libical-$(LIBICAL_VERSION)
 LIBICAL_SUFFIX	:= tar.gz
 LIBICAL_URL	:= https://github.com/libical/libical/releases/download/v$(LIBICAL_VERSION)/$(LIBICAL).$(LIBICAL_SUFFIX)
@@ -23,9 +23,9 @@ LIBICAL_SOURCE	:= $(SRCDIR)/$(LIBICAL).$(LIBICAL_SUFFIX)
 LIBICAL_DIR	:= $(BUILDDIR)/$(LIBICAL)
 LIBICAL_LICENSE	:= LGPL-2.1-only OR MPL-2.0
 LIBICAL_LICENSE_FILES := \
-	file://LICENSE;md5=1910a2a76ddf6a9ba369182494170d87 \
-	file://LICENSE.LGPL21.txt;md5=8f690bb538f4b301d931374a6eb864d0 \
-	file://LICENSE.MPL2.txt;md5=f75d2927d3c1ed2414ef72048f5ad640
+	file://README.md;startline=28;endline=45;md5=c80c40d23d93ff0522c5541a03c97758 \
+	file://LICENSES/LGPL-2.1-only.txt;md5=41890f71f740302b785c27661123bff5 \
+	file://LICENSES/MPL-2.0.txt;md5=f75d2927d3c1ed2414ef72048f5ad640
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -36,16 +36,18 @@ LIBICAL_LICENSE_FILES := \
 LIBICAL_CONF_TOOL := cmake
 LIBICAL_CONF_OPT := \
 	$(CROSS_CMAKE_USR) \
-	-DGOBJECT_INTROSPECTION=OFF \
-	-DICAL_ALLOW_EMPTY_PROPERTIES=OFF \
-	-DICAL_BUILD_DOCS=OFF \
-	-DICAL_ERRORS_ARE_FATAL=OFF \
-	-DICAL_GLIB=OFF \
-	-DICAL_GLIB_VAPI=OFF \
+	-DLIBICAL_BUILD_DOCS=OFF \
+	-DLIBICAL_BUILD_EXAMPLES=OFF \
 	-DLIBICAL_BUILD_TESTING=OFF \
-	-DSHARED_ONLY=ON \
-	-DSTATIC_ONLY=OFF \
-	-DWITH_CXX_BINDINGS=$(call ptx/onoff,PTXCONF_LIBICAL_CXX) \
+	-DLIBICAL_BUILD_VZIC=OFF \
+	-DLIBICAL_CXX_BINDINGS=$(call ptx/onoff,PTXCONF_LIBICAL_CXX) \
+	-DLIBICAL_DEVMODE=OFF \
+	-DLIBICAL_ENABLE_64BIT_ICALTIME_T=$(call ptx/onoff, PTXDIST_Y2038) \
+	-DLIBICAL_GLIB=OFF \
+	-DLIBICAL_GLIB_VAPI=OFF \
+	-DLIBICAL_GOBJECT_INTROSPECTION=OFF \
+	-DLIBICAL_JAVA_BINDINGS=OFF \
+	-DLIBICAL_STATIC=OFF \
 	\
 	-DCMAKE_DISABLE_FIND_PACKAGE_BerkeleyDB=ON \
 	-DCMAKE_DISABLE_FIND_PACKAGE_ICU=ON
-- 
2.47.3