wxwidgets: Enable webui and mediactrl packageconfigs by default
PATCH 1/7 wxwidgets: Enable webui and mediactrl packageconfigs by default
these are required by default configuration for python3-wxgtk4
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb +2 -0
@@ -46,6 +46,7 @@ EXTRA_OECMAKE:append:class-target = ' -DEGREP="/bin/grep -E"' PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk', 'no_gui', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \ " +PACKAGECONFIG:append:class-target = " mediactrl webkit" PACKAGECONFIG:remove:class-native = "opengl"
@@ -70,6 +71,7 @@ python () { PACKAGECONFIG[gstreamer] = "-DwxUSE_MEDIACTRL=ON,-DwxUSE_MEDIACTRL=OFF,gstreamer1.0-plugins-base,,,no_gui qt" PACKAGECONFIG[libsecret] = "-DwxUSE_SECRETSTORE=ON,-DwxUSE_SECRETSTORE=OFF,libsecret,,,no_gui" PACKAGECONFIG[lzma] = "-DwxUSE_LIBLZMA=ON,-DwxUSE_LIBLZMA=OFF,xz" +PACKAGECONFIG[mediactrl] = "-DwxUSE_MEDIACTRL=ON,-DwxUSE_MEDIACTRL=OFF," PACKAGECONFIG[mspack] = "-DwxUSE_LIBMSPACK=ON,-DwxUSE_LIBMSPACK=OFF,libmspack" PACKAGECONFIG[opengl] = "-DwxUSE_OPENGL=ON,-DwxUSE_OPENGL=OFF,libglu" PACKAGECONFIG[sdl_audio] = "-DwxUSE_LIBSDL=ON,-DwxUSE_LIBSDL=OFF,virtual/libsdl2"
PATCH 2/7 python3-wxgtk4: Upgrade to 4.2.3
Add missing build time dependency on requests python module
Signed-off-by Khem Raj <[email protected]>
---
.../{python3-wxgtk4_4.2.2.bb => python3-wxgtk4_4.2.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-python/recipes-devtools/python3-wxgtk4/{python3-wxgtk4_4.2.2.bb => python3-wxgtk4_4.2.3.bb} (89%)meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.3.bb renamed from meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.2.bb +2 -2
@@ -5,7 +5,7 @@ LICENSE = "LGPL-2.0-only & WXwindows & BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=102f37a0d23aa258e59e4cc8b5380b35" DEPENDS = "python3-attrdict3-native python3-six-native wxwidgets-native \ - wxwidgets \ + python3-requests-native wxwidgets \ " PYPI_PACKAGE = "wxPython"
@@ -16,7 +16,7 @@ SRC_URI += "file://add-back-option-build-base.patch \ file://not-overwrite-cflags-cxxflags.patch \ file://0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch \ " -SRC_URI[sha256sum] = "5dbcb0650f67fdc2c5965795a255ffaa3d7b09fb149aa8da2d0d9aa44e38e2ba" +SRC_URI[sha256sum] = "20d6e0c927e27ced85643719bd63e9f7fd501df6e9a8aab1489b039897fd7c01" S = "${UNPACKDIR}/wxPython-${PV}"
PATCH 3/7 obexftp: Fix build with cmake4
In reply to Khem RajSigned-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb | 1 + 1 file changed, 1 insertion(+)
meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb +1 -0
@@ -32,6 +32,7 @@ S = "${UNPACKDIR}/${BP}-Source" EXTRA_OECMAKE += "-DCMAKE_SKIP_RPATH=ON \ -DENABLE_PERL=OFF -DENABLE_PYTHON=OFF \ -DENABLE_RUBY=OFF -DENABLE_TCL=OFF \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ " do_compile:class-native () {
PATCH 4/7 ot-daemon: Update to latest of trunk
In reply to Khem RajFixes build with trunk
Disable prepending uptime to logs
Signed-off-by Khem Raj <[email protected]>
--- .../recipes-connectivity/openthread/ot-daemon_git.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb +3 -1
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=543b6fe90ec5901a683320a36390c65f \ file://third_party/mbedtls/repo/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d \ " DEPENDS = "readline" -SRCREV = "90adc86d34e21a9e8f86d093c2190030042c4a59" +SRCREV = "9f88ca02886595b5aad2b60007865812fd78aa98" PV = "0.1+git" SRC_URI = "git://github.com/openthread/openthread.git;protocol=https;branch=main \
@@ -26,3 +26,5 @@ EXTRA_OECMAKE = "-DOT_DAEMON=ON \ " EXTRA_OECMAKE:append:libc-musl = " -DOT_TARGET_OPENWRT=ON" + +CXXFLAGS += "-DOPENTHREAD_CONFIG_LOG_PREPEND_UPTIME=0"
PATCH 5/7 nngpp: Fix build with cmake4
In reply to Khem RajSigned-off-by Khem Raj <[email protected]>
--- ...1-cmake-Bump-minimum-version-to-3.10.patch | 25 +++++++++++++++++++ .../recipes-connectivity/nanomsg/nngpp_git.bb | 10 ++++---- 2 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 meta-networking/recipes-connectivity/nanomsg/nngpp/0001-cmake-Bump-minimum-version-to-3.10.patch
meta-networking/recipes-connectivity/nanomsg/nngpp/0001-cmake-Bump-minimum-version-to-3.10.patch new file +25 -0
@@ -0,0 +1,25 @@ +From c5004770784dc5ff80b88487de38c22275a7960a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 12 Jul 2025 16:04:38 -0700 +Subject: [PATCH] cmake: Bump minimum version to 3.10 + +Cmake4+ has dropped support for cmake < 3.5 [1] + +[1] https://cmake.org/cmake/help/latest/release/4.0.html#deprecated-and-removed-features + +Upstream-Status: Submitted [https://github.com/cwzx/nngpp/pull/38] +Signed-off-by: Khem Raj <[email protected]> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index caa7145..45a5ad5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 3.1) ++cmake_minimum_required (VERSION 3.10) + project(nngpp CXX) + + include(GNUInstallDirs)
meta-networking/recipes-connectivity/nanomsg/nngpp_git.bb +5 -5
@@ -4,10 +4,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://license.txt;md5=6d17d78c3597e0d4452fb1c63bf7c58e" DEPENDS = "nng" -SRCREV = "cc5d2641babab165d8a9943817c46d36c6dc17c2" -PV = "1.3.0" - -SRC_URI = "git://github.com/cwzx/nngpp;branch=master;protocol=https" - +SRCREV = "8da8c026bd551b7685a8a140909ff96cfe91bf90" +PV = "1.3.0+git" +SRC_URI = "git://github.com/cwzx/nngpp;branch=master;protocol=https \ + file://0001-cmake-Bump-minimum-version-to-3.10.patch \ + " inherit cmake
PATCH 6/7 ot-br-posix: Update to latest tip on trunk
In reply to Khem RajFix build with cmake4
Signed-off-by Khem Raj <[email protected]>
--- .../ot-br-posix/0001-Musl-build-fix.patch | 27 ------------------- .../openthread/ot-br-posix_git.bb | 6 ++--- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-Musl-build-fix.patch
meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-Musl-build-fix.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From 502aa4ab4bbc790fb2999ff2b5f10dabd7085190 Mon Sep 17 00:00:00 2001 -From: "deepan.shivap" <[email protected]> -Date: Mon, 2 Dec 2024 23:12:17 +0900 -Subject: [PATCH] Musl build fix - -usage of getaddrinfo_a creates dependency on libanl, which is specific -to glibc. - -Upstream-Status: Pending -Signed-off-by: deepan.shivap <[email protected]> ---- - src/posix/platform/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/posix/platform/CMakeLists.txt b/src/posix/platform/CMakeLists.txt -index b4ac241f5..7b2028e45 100644 ---- a/src/posix/platform/CMakeLists.txt -+++ b/src/posix/platform/CMakeLists.txt -@@ -175,7 +175,7 @@ target_link_libraries(openthread-posix - ) - - option(OT_TARGET_OPENWRT "enable openthread posix for OpenWRT" OFF) --if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT OT_TARGET_OPENWRT) -+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT OT_TARGET_OPENWRT AND NOT OT_TARGET_MUSL) - target_compile_definitions(ot-posix-config - INTERFACE "OPENTHREAD_POSIX_CONFIG_NAT64_AIL_PREFIX_ENABLE=1" - )
meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb +2 -4
@@ -7,18 +7,16 @@ LICENSE = "BSD-3-Clause & MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=87109e44b2fda96a8991f27684a7349c \ file://third_party/cJSON/repo/LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0 \ file://third_party/cpp-httplib/repo/LICENSE;md5=1321bdf796c67e3a8ab8e352dd81474b \ - file://third_party/http-parser/repo/LICENSE-MIT;md5=9bfa835d048c194ab30487af8d7b3778 \ file://third_party/openthread/repo/LICENSE;md5=543b6fe90ec5901a683320a36390c65f \ " DEPENDS = "autoconf-archive dbus readline avahi jsoncpp boost libnetfilter-queue protobuf protobuf-native" -SRCREV = "fe5855332e8f804944d737c65b75cf9a89c35e77" +SRCREV = "7142b740479e50f6f2c2a91a369b9c36e024fe0d" PV = "0.3.0+git" SRC_URI = "gitsm://github.com/openthread/ot-br-posix.git;protocol=https;branch=main \ file://0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch \ file://0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch \ file://default-cxx-std.patch \ - file://0001-Musl-build-fix.patch;patchdir=third_party/openthread/repo \ " SYSTEMD_SERVICE:${PN} = "otbr-agent.service"
@@ -57,8 +55,8 @@ EXTRA_OECMAKE = "-DBUILD_TESTING=OFF \ -DOT_REFERENCE_DEVICE=ON \ -DOT_DHCP6_CLIENT=ON \ -DOT_DHCP6_SERVER=ON \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ " -EXTRA_OECMAKE:append:libc-musl = " -DOT_TARGET_MUSL=ON" RDEPENDS:${PN} = "iproute2 ipset avahi-daemon"
PATCH 7/7 civetweb: Update to latest tip if trunk
In reply to Khem RajFixes build with cmake4+
Signed-off-by Khem Raj <[email protected]>
--- .../recipes-connectivity/civetweb/civetweb_1.16.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb +2 -2
@@ -4,8 +4,8 @@ HOMEPAGE = "https://github.com/civetweb/civetweb" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=ce6ce6eb1b2fd59ee6bab219470442a3" -SRCREV = "d7ba35bbb649209c66e582d5a0244ba988a15159" - +SRCREV = "5864b55a94f4b5238155cbf2baec707f0fa2ba6d" +PV .= "+git" SRC_URI = "git://github.com/civetweb/civetweb.git;branch=master;protocol=https \ file://0001-Unittest-Link-librt-and-libm-using-l-option.patch \ "