From 5df4beeb75d8cc5e7a0b221c131debc77983c634 Mon Sep 17 00:00:00 2001
From: Robert Middleton <robert.middleton@brivo.com>
Date: Tue, 13 Aug 2024 15:47:35 -0400
Subject: [PATCH] Upgrade dbus-cxx to 2.5.2

In addition, allow for other configuration options for dbus-cxx and split
into different packages.

SDK can now also be built with dbus-cxx tools, generally used to generate
C++ interface code from DBus introspection files.  This required adding
cppgenerate in a new recipe for dependency purposes.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../recipes-core/dbus-cxx/dbus-cxx_2.5.1.bb   | 25 ----------
 .../recipes-core/dbus-cxx/dbus-cxx_2.5.2.bb   | 49 +++++++++++++++++++
 .../libsigc++-2.0/libsigc++-3_3.6.0.bb        |  2 +-
 .../recipes-core/mm-common/mm-common_1.0.4.bb |  2 +-
 .../cppgenerate/cppgenerate_0.3.bb            | 14 ++++++
 5 files changed, 65 insertions(+), 27 deletions(-)
 delete mode 100644 meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.1.bb
 create mode 100644 meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.2.bb
 create mode 100644 meta-oe/recipes-devtools/cppgenerate/cppgenerate_0.3.bb

diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.1.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.1.bb
deleted file mode 100644
index e89d1327e8..0000000000
--- a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.1.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY = "D-Bus wrapper in C++ for dbus"
-HOMEPAGE = "https://dbus-cxx.github.io/"
-BUGTRACKER = "https://github.com/libsigcplusplus/libsigcplusplus/issues"
-SECTION = "base"
-LICENSE = "LGPL-3.0-or-later | BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=24594f493407a4cd401ce9794e0b9308"
-
-SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https"
-SRCREV = "732a5becb4349e02ffce407a3fd4d75cc3d82421"
-
-DEPENDS = "\
-	dbus \
-	libsigc++-3 \
-"
-
-RDEPENDS:${PN} = "\
-	dbus \
-	libsigc++-3 \
-"
-
-S = "${WORKDIR}/git"
-
-inherit pkgconfig cmake
-
-OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH"
diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.2.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.2.bb
new file mode 100644
index 0000000000..fbe1e34751
--- /dev/null
+++ b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.2.bb
@@ -0,0 +1,49 @@
+SUMMARY = "D-Bus implementation in C++"
+HOMEPAGE = "https://dbus-cxx.github.io/"
+BUGTRACKER = "https://github.com/dbus-cxx/dbus-cxx/issues"
+SECTION = "base"
+LICENSE = "LGPL-3.0-or-later | BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=24594f493407a4cd401ce9794e0b9308"
+
+SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https"
+SRCREV = "f2637e726207ecfbdaaf02744e1b36e54f929c9d"
+
+DEPENDS = "\
+	dbus \
+	libsigc++-3 \
+"
+
+RDEPENDS:${PN} = "\
+	dbus \
+	libsigc++-3 \
+"
+
+S = "${WORKDIR}/git"
+
+inherit pkgconfig cmake
+
+OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH"
+EXTRA_OECMAKE = "-DBUILD_TESTING=OFF -DTOOLS_BUNDLED_CPPGENERATE=OFF"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG:class-native ?= "tools"
+PACKAGECONFIG:class-nativesdk ?= "tools"
+
+PACKAGECONFIG[tools] = "-DENABLE_TOOLS=ON,-DENABLE_TOOS=OFF,popt cppgenerate"
+PACKAGECONFIG[glib] = "-DENABLE_GLIB_SUPPORT=ON,-DENABLE_GLIB_SUPPORT=OFF,glib-2.0"
+PACKAGECONFIG[uv] = "-DENABLE_UV_SUPPORT=ON,-DENABLE_UV_SUPPORT=OFF,libuv"
+
+PACKAGES =+ " ${PN}-tools ${PN}-glib ${PN}-uv ${PN}-glib-dev ${PN}-uv-dev "
+FILES:${PN}-tools = "${bindir}/dbus-cxx-xml2cpp ${bindir}/dbus-cxx-introspect"
+FILES:${PN}-glib = "${libdir}/libdbus-cxx-glib.so.* "
+FILES:${PN}-glib-dev = "${includedir}/dbus-cxx-glib-2.0/* \
+  ${libdir}/pkgconfig/dbus-cxx-glib-2.0.pc \
+  ${libdir}/libdbus-cxx-glib.so \
+  "
+FILES:${PN}-uv = "${libdir}/libdbus-cxx-uv.so.* "
+FILES:${PN}-uv-dev = "${includedir}/dbus-cxx-uv-2.0/* \
+  ${libdir}/pkgconfig/dbus-cxx-uv-2.0.pc\
+  ${libdir}/libdbus-cxx-uv.so \
+  "
+
+BBCLASSEXTEND="native nativesdk"
diff --git a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.6.0.bb b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.6.0.bb
index a25e6c1001..b3875e8436 100644
--- a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.6.0.bb
+++ b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.6.0.bb
@@ -18,5 +18,5 @@ inherit setuptools3 meson
 FILES:${PN}-dev += "${libdir}/sigc++-*/"
 FILES:${PN}-doc += "${datadir}/devhelp"
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
 SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}"
diff --git a/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb b/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb
index 56f7b5af6f..3e99b38eb7 100644
--- a/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb
+++ b/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb
@@ -11,7 +11,7 @@ inherit allarch
 SRC_URI[archive.sha256sum] = "e954c09b4309a7ef93e13b69260acdc5738c907477eb381b78bb1e414ee6dbd8"
 SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch"
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
 
 # These files aren't very usefull on target image, package them all in nnPN-dev
 FILES:${PN} = ""
diff --git a/meta-oe/recipes-devtools/cppgenerate/cppgenerate_0.3.bb b/meta-oe/recipes-devtools/cppgenerate/cppgenerate_0.3.bb
new file mode 100644
index 0000000000..0d7bdc83dc
--- /dev/null
+++ b/meta-oe/recipes-devtools/cppgenerate/cppgenerate_0.3.bb
@@ -0,0 +1,14 @@
+SUMMARY = "C++ Code Generator library"
+BUGTRACKER = "https://github.com/rm5248/libcppgenerate/issues"
+SECTION = "libs"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
+
+SRC_URI = "git://github.com/rm5248/libcppgenerate.git;branch=master;protocol=https"
+SRCREV = "930c5503f76c877b72b9ff8546353d6f422bd010"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+BBCLASSEXTEND="native nativesdk"