From a15e0fb81763dd325e350c584e202185a62fb2f2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 2 Oct 2021 11:21:03 +0100 Subject: gattlib: Upgrade to latest Drop upstreamed patch Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- .../files/0001-cmake-Use-GNUInstallDirs.patch | 53 ---------------------- .../recipes-connectivity/gattlib/gattlib_git.bb | 7 ++- 2 files changed, 3 insertions(+), 57 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/gattlib/files/0001-cmake-Use-GNUInstallDirs.patch diff --git a/meta-oe/recipes-connectivity/gattlib/files/0001-cmake-Use-GNUInstallDirs.patch b/meta-oe/recipes-connectivity/gattlib/files/0001-cmake-Use-GNUInstallDirs.patch deleted file mode 100644 index ffe0a00673..0000000000 --- a/meta-oe/recipes-connectivity/gattlib/files/0001-cmake-Use-GNUInstallDirs.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 63dc2d0c9384d85482dc4cbb3c179b4b0bb18d4e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 19 Dec 2019 22:32:01 -0800 -Subject: [PATCH] cmake: Use GNUInstallDirs - -Helps install cmakefiles in right libdir - -Upstream-Status: Submitted [https://github.com/labapart/gattlib/pull/139] -Signed-off-by: Khem Raj ---- - CMakeLists.txt | 5 +++-- - dbus/CMakeLists.txt | 18 ++++++++++-------- - 2 files changed, 13 insertions(+), 10 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 12d8d71..ded7239 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -152,7 +152,8 @@ endif() - # - # List of file to install - # --install(FILES include/gattlib.h DESTINATION include) --install(FILES ${PROJECT_BINARY_DIR}/gattlib.pc DESTINATION lib/pkgconfig) -+include(GNUInstallDirs) -+install(FILES include/gattlib.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+install(FILES ${PROJECT_BINARY_DIR}/gattlib.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - - include(CPack) -diff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt -index f5096ce..cef031f 100644 ---- a/dbus/CMakeLists.txt -+++ b/dbus/CMakeLists.txt -@@ -19,7 +19,7 @@ - # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - # - --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.0) - - find_package(PkgConfig REQUIRED) - -@@ -119,4 +119,6 @@ endif() - add_library(gattlib SHARED ${gattlib_SRCS}) - target_link_libraries(gattlib ${gattlib_LIBS}) - --install(TARGETS gattlib LIBRARY DESTINATION lib) -+include(GNUInstallDirs) -+ -+install(TARGETS gattlib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) --- -2.24.1 - diff --git a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb b/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb index 8485013ba6..ea4f4d5468 100644 --- a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb +++ b/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Bluetooth library with attribute support" SECTION = "libs/network" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://CMakeLists.txt;beginline=1;endline=20;md5=8d5efeb9189b60866baff80ff791bf00" +LICENSE = "GPL-2.0+ | BSD-3-Clause" +LIC_FILES_CHKSUM = "file://CMakeLists.txt;beginline=1;endline=6;md5=71fdd2be76b4e95fe28324a70d4981c5" DEPENDS = "bluez5 glib-2.0" DEPENDS += "glib-2.0-native" @@ -11,11 +11,10 @@ PV = "0.2+git${SRCPV}" SRC_URI = "git://github.com/labapart/gattlib.git \ file://dbus-avoid-strange-chars-from-the-build-dir.patch \ - file://0001-cmake-Use-GNUInstallDirs.patch \ " SRCBRANCH = "master" -SRCREV = "5c7ee43bd70ee09a7170ddd55b9fdbdef69e9080" +SRCREV = "fa54ae42ccb3d8f911e00b02ed1e581537e47f79" S = "${WORKDIR}/git" -- cgit 1.2.3-korg