From 86d80eeb399d82ff9e8f90214dfe1b6ac5fb17ec Mon Sep 17 00:00:00 2001 From: Moritz Haase Date: Mon, 14 Jul 2025 13:26:34 +0200 Subject: gattlib: upgrade 0.2.0 -> 0.7.2 New version includes support to build against CMake 4+. Release notes are available at [0]. [0]: https://github.com/labapart/gattlib/releases License-Update: Copyright year changed Signed-off-by: Moritz Haase Signed-off-by: Khem Raj --- .../gattlib/files/0001-Add-missing-include.patch | 24 +++++++++++++ .../recipes-connectivity/gattlib/gattlib_0.7.2.bb | 38 +++++++++++++++++++++ .../recipes-connectivity/gattlib/gattlib_git.bb | 39 ---------------------- 3 files changed, 62 insertions(+), 39 deletions(-) create mode 100644 meta-oe/recipes-connectivity/gattlib/files/0001-Add-missing-include.patch create mode 100644 meta-oe/recipes-connectivity/gattlib/gattlib_0.7.2.bb delete mode 100644 meta-oe/recipes-connectivity/gattlib/gattlib_git.bb diff --git a/meta-oe/recipes-connectivity/gattlib/files/0001-Add-missing-include.patch b/meta-oe/recipes-connectivity/gattlib/files/0001-Add-missing-include.patch new file mode 100644 index 0000000000..15fbb61ed3 --- /dev/null +++ b/meta-oe/recipes-connectivity/gattlib/files/0001-Add-missing-include.patch @@ -0,0 +1,24 @@ +From a074af0d6a21665d3dfbd785ffd788146afeacef Mon Sep 17 00:00:00 2001 +From: Davide Cavalca +Date: Thu, 25 Apr 2024 21:39:23 -0700 +Subject: [PATCH] Add missing include + +Upstream-Status: Backport [a074af0d6a21665d3dfbd785ffd788146afeacef] +Signed-off-by: Moritz Haase +--- + common/gattlib_common_adapter.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/common/gattlib_common_adapter.c b/common/gattlib_common_adapter.c +index d56ed5b..d4274c8 100644 +--- a/common/gattlib_common_adapter.c ++++ b/common/gattlib_common_adapter.c +@@ -4,6 +4,8 @@ + * Copyright (c) 2021-2024, Olivier Martin + */ + ++#include ++ + #include "gattlib_internal.h" + + // Keep track of the allocated adapters to avoid an adapter to be freed twice. diff --git a/meta-oe/recipes-connectivity/gattlib/gattlib_0.7.2.bb b/meta-oe/recipes-connectivity/gattlib/gattlib_0.7.2.bb new file mode 100644 index 0000000000..1ebb8350b2 --- /dev/null +++ b/meta-oe/recipes-connectivity/gattlib/gattlib_0.7.2.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "Bluetooth library with attribute support" +SECTION = "libs/network" + +LICENSE = "GPL-2.0-or-later | BSD-3-Clause" +LIC_FILES_CHKSUM = "file://CMakeLists.txt;beginline=1;endline=6;md5=f44a9a14d37330e7cd454e694e714ab8" + +DEPENDS = "bluez5 glib-2.0 glib-2.0-native python3-packaging-native" + +SRC_URI = "git://github.com/labapart/gattlib.git;branch=master;protocol=https;tag=${PV} \ + file://dbus-avoid-strange-chars-from-the-build-dir.patch \ + file://0001-Add-missing-include.patch \ + " + +SRCBRANCH = "master" +SRCREV = "f99558d9b8e3dbba2a952a0b292d3497aec8ee69" + + +CVE_STATUS[CVE-2019-6498] = "fixed-version: patch is already included in sources" + +PACKAGECONFIG[examples] = "-DGATTLIB_BUILD_EXAMPLES=ON,-DGATTLIB_BUILD_EXAMPLES=OFF" + +# Set this to force use of DBus API if Bluez version is older than 5.42 +PACKAGECONFIG[force-dbus] = "-DGATTLIB_FORCE_DBUS=TRUE,-DGATTLIB_FORCE_DBUS=FALSE" + +EXTRA_OECMAKE += "-DGATTLIB_PYTHON_INTERFACE=OFF" +EXTRA_OECMAKE += "-DGATTLIB_BUILD_DOCS=OFF" + +inherit pkgconfig cmake python3native + +do_compile:append() { + for f in org-bluez-gattdescriptor1.c org-bluez-battery1.c org-bluez-adaptater1.c \ + org-bluez-device1.c org-bluez-gattservice1.c org-bluez-gattcharacteristic1.c; do + sed -i -e 's|${B}/dbus/||g' ${B}/dbus/$f + done +} + +FILES:${PN} = "${libdir}/*" +FILES:${PN}-dev = "${includedir}/* ${libdir}/pkgconfig" diff --git a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb b/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb deleted file mode 100644 index 06f0b5bf0a..0000000000 --- a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "Bluetooth library with attribute support" -SECTION = "libs/network" - -LICENSE = "GPL-2.0-or-later | BSD-3-Clause" -LIC_FILES_CHKSUM = "file://CMakeLists.txt;beginline=1;endline=6;md5=a87ee154f005a6f035b8b34ac2191f3b" - -DEPENDS = "bluez5 glib-2.0 glib-2.0-native python3-packaging-native" - -PV = "0.2+git" - -SRC_URI = "git://github.com/labapart/gattlib.git;branch=master;protocol=https \ - file://dbus-avoid-strange-chars-from-the-build-dir.patch \ - " - -SRCBRANCH = "master" -SRCREV = "33a8a275928b186381bb0aea0f9778e330e57ec3" - - -CVE_STATUS[CVE-2019-6498] = "fixed-version: patch is already included in sources" - -PACKAGECONFIG[examples] = "-DGATTLIB_BUILD_EXAMPLES=ON,-DGATTLIB_BUILD_EXAMPLES=OFF" - -# Set this to force use of DBus API if Bluez version is older than 5.42 -PACKAGECONFIG[force-dbus] = "-DGATTLIB_FORCE_DBUS=TRUE,-DGATTLIB_FORCE_DBUS=FALSE" - -EXTRA_OECMAKE += "-DGATTLIB_PYTHON_INTERFACE=OFF" -EXTRA_OECMAKE += "-DGATTLIB_BUILD_DOCS=OFF" - -inherit pkgconfig cmake python3native - -do_compile:append() { - for f in org-bluez-gattdescriptor1.c org-bluez-battery1.c org-bluez-adaptater1.c \ - org-bluez-device1.c org-bluez-gattservice1.c org-bluez-gattcharacteristic1.c; do - sed -i -e 's|${B}/dbus/||g' ${B}/dbus/$f - done -} - -FILES:${PN} = "${libdir}/*" -FILES:${PN}-dev = "${includedir}/* ${libdir}/pkgconfig" -- cgit v1.2.3-54-g00ecf