From 3cde237d0fb8fdc12d5e6315426faccde6a287dd Mon Sep 17 00:00:00 2001 From: Caio Toledo Date: Tue, 15 Dec 2020 14:56:06 +0000 Subject: [PATCH 1/3] Add recipe for dbus-cxx Signed-off-by: Caio Toledo --- .../recipes-core/dbus-cxx/dbus-cxx_0.12.bb | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb new file mode 100644 index 00000000000..7a170d66f56 --- /dev/null +++ b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb @@ -0,0 +1,24 @@ +SUMMARY = "D-Bus wrapper in C++ for dbus" +HOMEPAGE = "https://dbus-cxx.github.io/" +SECTION = "base" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83" + +SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master" +SRCREV = "ea7f8e361d11dc7d41d9ae2c4128aed2cdadd84e" + +DEPENDS = "\ + dbus \ + libsigc++-2.0 \ +" + +RDEPENDS_${PN} = "\ + dbus \ + libsigc++-2.0 \ +" + +S = "${WORKDIR}/git/" + +inherit pkgconfig cmake + +OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" From 794e66d6e63d9ca5707bb69311e11b3927ab20df Mon Sep 17 00:00:00 2001 From: Caio Toledo Date: Tue, 15 Dec 2020 17:04:34 +0000 Subject: [PATCH 2/3] Add dbus-cxx to packagegroup-meta-oe Signed-off-by: Caio Toledo --- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 2c46d21b705..6b70253f9dc 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -179,6 +179,7 @@ RDEPENDS_packagegroup-meta-oe-core = "\ sdbus-c++ \ toybox \ usleep \ + dbus-cxx \ " RDEPENDS_packagegroup-meta-oe-core_append_libc-glibc = " glfw" RDEPENDS_packagegroup-meta-oe-core_remove_riscv64 = "safec" From a6ab428ead9cf7a68c43a0a97ac776db35fc93cd Mon Sep 17 00:00:00 2001 From: Caio Toledo Date: Thu, 17 Dec 2020 00:22:24 +0000 Subject: [PATCH 3/3] Fix dbus-cxx build for musl Signed-off-by: Caio Toledo --- .../recipes-core/dbus-cxx/dbus-cxx_0.12.bb | 2 ++ .../dbus-cxx/files/fix_build_musl.patch | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb index 7a170d66f56..944064fb96f 100644 --- a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb +++ b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb @@ -4,7 +4,9 @@ SECTION = "base" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83" +FILEEXTRAPATHS_prepend = "${THISDIR}/files" SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master" +SRC_URI += "file://fix_build_musl.patch" SRCREV = "ea7f8e361d11dc7d41d9ae2c4128aed2cdadd84e" DEPENDS = "\ diff --git a/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch b/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch new file mode 100644 index 00000000000..3d912e0b016 --- /dev/null +++ b/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch @@ -0,0 +1,26 @@ +diff --git a/dbus-cxx/timeout.cpp b/dbus-cxx/timeout.cpp +index 16e9f7e..aa0b99f 100644 +--- a/dbus-cxx/timeout.cpp ++++ b/dbus-cxx/timeout.cpp +@@ -132,7 +132,7 @@ namespace DBus + return m_cobj; + } + +- void Timeout::timer_callback_proxy( sigval_t sv ) { ++ void Timeout::timer_callback_proxy( union sigval sv ) { + SIMPLELOGGER_DEBUG( "dbus.Timeout","Timeout::timer_callback_proxy" ); + Timeout* t; + t = ( Timeout* ) sv.sival_ptr; +diff --git a/dbus-cxx/timeout.h b/dbus-cxx/timeout.h +index 1e469b5..5b69fbb 100644 +--- a/dbus-cxx/timeout.h ++++ b/dbus-cxx/timeout.h +@@ -83,7 +83,7 @@ namespace DBus + + std::mutex m_arming_mutex; + +- static void timer_callback_proxy( sigval_t sv ); ++ static void timer_callback_proxy( union sigval sv ); + + }; +