diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support')
42 files changed, 259 insertions, 479 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/btop/btop_1.2.13.bb b/meta-openembedded/meta-oe/recipes-support/btop/btop_1.2.13.bb new file mode 100644 index 0000000000..a944fe7b51 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/btop/btop_1.2.13.bb @@ -0,0 +1,23 @@ +SUMMARY = "Resource monitor that shows usage and stats for processor, memory, disks, network and processes." +HOMEPAGE = "https://github.com/aristocratos/btop" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" +SECTION = "console/utils" + +SRC_URI = "git://github.com/aristocratos/btop.git;protocol=https;branch=main" +SRCREV = "9edbf27f1b6d5844a97325fcda732762ba086a99" + +S = "${WORKDIR}/git" + +inherit cmake + +FILES:${PN} += " \ + ${datadir}/icons \ + ${datadir}/icons/hicolor \ + ${datadir}/icons/hicolor/48x48 \ + ${datadir}/icons/hicolor/scalable \ + ${datadir}/icons/hicolor/48x48/apps \ + ${datadir}/icons/hicolor/48x48/apps/btop.png \ + ${datadir}/icons/hicolor/scalable/apps \ + ${datadir}/icons/hicolor/scalable/apps/btop.svg \ +" diff --git a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.19.1.bb b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.22.1.bb index 1440d72711..8ba1b60995 100644 --- a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.19.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.22.1.bb @@ -3,10 +3,10 @@ SUMMARY = "c-ares is a C library that resolves names asynchronously." HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fdbc58a6da11a9f68aa73c453818decc" SRC_URI = "git://github.com/c-ares/c-ares.git;branch=main;protocol=https" -SRCREV = "6360e96b5cf8e5980c887ce58ef727e53d77243a" +SRCREV = "36466bb240661fa8fdc2ffa47d229d92ac762286" UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P<pver>\d+_(\d_?)+)" diff --git a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.5.2.bb b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.5.4.bb index 0802e80f7b..e53ffa40b3 100644 --- a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.5.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.5.4.bb @@ -10,7 +10,7 @@ SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ file://0001-Add-build-rule-for-README.patch \ " -SRC_URI[sha256sum] = "13934487e6f8b48f699a16d367cc7a1af7a3ca874de721ac6e9633beb86e7219" +SRC_URI[sha256sum] = "6e832adc172ecdcfdee2b56f33144684882cbe972daff1938e7a9c73a64f88bf" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.1.0.bb b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb index d3c6b421e6..18db0721de 100644 --- a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb @@ -1,12 +1,12 @@ DESCRIPTION = "Ceres Solver is an open source C++ library for modeling and solving large, complicated optimization problems." HOMEPAGE = "http://ceres-solver.org/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=bb761279816b72be19d7ce646e4e2a14" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3585a26c9cd9ec0cb36a7d65542878ca" DEPENDS = "libeigen glog" SRC_URI = "git://github.com/ceres-solver/ceres-solver.git;branch=master;protocol=https" -SRCREV = "f68321e7de8929fbcdb95dd42877531e64f72f66" +SRCREV = "85331393dc0dff09f6fb9903ab0c4bfa3e134b01" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb b/meta-openembedded/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb index 58e4fd6e88..f88d3b6ca1 100644 --- a/meta-openembedded/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb @@ -1,4 +1,5 @@ SUMMARY = "cpulimit is a tool which limits the CPU usage of a process" +DESCRIPTION = "cpulimit is a simple program that attempts to limit the CPU usage of a process (expressed in percentage, not in CPU time). This is useful to control batch jobs, when you don't want them to eat too much CPU. It does not act on the nice value or other priority stuff, but on the real CPU usage. Besides it is able to adapt itself to the overall system load, dynamically and quickly." HOMEPAGE = "http://cpulimit.sourceforge.net" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=86c1c0d961a437e529db93aa3bb32dc4" diff --git a/meta-openembedded/meta-oe/recipes-support/crucible/crucible_2023.04.12.bb b/meta-openembedded/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb index 4830acff1d..339bb35f2d 100644 --- a/meta-openembedded/meta-oe/recipes-support/crucible/crucible_2023.04.12.bb +++ b/meta-openembedded/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb @@ -1,6 +1,6 @@ SUMMARY = "Utility that provides userspace support for reading and writing to the i.MX fuses" -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=a64ced9463b8c81d08335d41966e0592" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=201414b6610203caed355323b1ab3116" GO_IMPORT = "github.com/usbarmory/crucible" SRC_URI = "git://${GO_IMPORT}.git;protocol=https;branch=master" @@ -9,7 +9,7 @@ GO_INSTALL = "\ ${GO_IMPORT}/cmd/crucible \ ${GO_IMPORT}/cmd/habtool \ " -SRCREV = "269c90b0067e469c20b11e7fc5f4681ad5f0af7e" +SRCREV = "358b5e7adb7f101f870f2b42fe5371460a3cccb6" # Workaround for network access issue during compile step. # This needs to be fixed in the recipes buildsystem so that diff --git a/meta-openembedded/meta-oe/recipes-support/edid-decode/edid-decode_git.bb b/meta-openembedded/meta-oe/recipes-support/edid-decode/edid-decode_git.bb index c1f512160d..48b52eefca 100644 --- a/meta-openembedded/meta-oe/recipes-support/edid-decode/edid-decode_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/edid-decode/edid-decode_git.bb @@ -7,7 +7,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=2ef696d66c156139232201f223c22592" SRC_URI= "git://git.linuxtv.org/edid-decode.git;protocol=https;branch=master" -SRCREV = "e052f5f9fdf74ca11aa1a8edfa62eff8d0aa3d0d" +SRCREV = "5920bf2a756b2f748c49ff6a08b9f421026473c5" PV = "0.0+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.11.1.bb b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.11.2.bb index 063a63b1e3..c8d996d416 100644 --- a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.11.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.11.2.bb @@ -13,7 +13,7 @@ inherit pkgconfig cmake gitpkgv PE = "1" PKGV = "${GITPKGVTAG}" -SRCREV = "9d3d40bf3e429c0cd6609f686c0e73ed0eff0a07" +SRCREV = "a38c1be9eee39a9bc22b511fffe96e63fdf8ebe7" SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ file://winpr-makecert-Build-with-install-RPATH.patch \ file://0001-Fix-const-qualifier-error.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.3.bb b/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.4.bb index 599c490359..2748b84f7c 100644 --- a/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.4.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Provides improved implementations of std::function." HOMEPAGE = "https://naios.github.io/function2" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRCREV = "9e303865d14f1204f09379e37bbeb30c4375139a" +SRCREV = "a354bd093d2b6e50c9325dbce84d20b4e77aabc6" PV .= "+git${SRCPV}" SRC_URI += "gitsm://github.com/Naios/function2;branch=master;protocol=https" diff --git a/meta-openembedded/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.0.bb b/meta-openembedded/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.3.bb index 209f51ea3d..f945a30f36 100644 --- a/meta-openembedded/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.3.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://github.com/google/benchmark.git;protocol=https;branch=main" -SRCREV = "2dd015dfef425c866d9a43f2c67d8b52d709acb6" +SRCREV = "344117638c8ff7e239044fd0fa7085839fc03021" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb b/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb index 68b91c0b0c..e716430673 100644 --- a/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb @@ -7,7 +7,7 @@ SECTION = "libs" LICENSE = "HDF5" LIC_FILES_CHKSUM = "file://COPYING;md5=9ba0f3d878ab6c2403c86e9b0362d998" -inherit cmake siteinfo qemu multilib_header +inherit cmake siteinfo qemu multilib_header multilib_script DEPENDS += "qemu-native zlib" @@ -40,6 +40,10 @@ EOF do_unpack[postfuncs] += "gen_emu" +MULTILIB_SCRIPTS += "${PN}:${bindir}/h5cc \ + ${PN}:${bindir}/h5hlcc \ +" + do_install:append() { # Used for generating config files on target install -m 755 ${B}/bin/H5detect ${D}${bindir} diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.370.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.376.bb index 56d4253772..1666d5e4da 100644 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.370.bb +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.376.bb @@ -5,7 +5,7 @@ SECTION = "System/Base" LICENSE = "GPL-2.0-or-later | XFree86-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -SRCREV = "21cb47beb1716545b25dfe8ae1b9e079c73b85d9" +SRCREV = "e27f08bda517100746000dacdd882b6a7e7ce19a" SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb b/meta-openembedded/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb index 2a0a129fee..3dbd8db63f 100644 --- a/meta-openembedded/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb @@ -10,7 +10,7 @@ DEPENDS = "libirecovery libimobiledevice libzip curl libimobiledevice-glue opens PV = "1.0.1+git${SRCPV}" -SRCREV = "163a1647dedb7ca4656c0f072e4733573f9f982b" +SRCREV = "ecae6c6e8ca6b6bad080a1c73f10ffd0e67d75a7" SRC_URI = "git://github.com/libimobiledevice/idevicerestore;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.9.bb b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb index dfc7b42dca..28e40f66e3 100644 --- a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" S = "${WORKDIR}/git" B = "${S}" -SRCREV = "2fa27aa3acccc70b9f6c3bf2e569e3d33a381e83" -SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master;protocol=https" +SRCREV = "6e83cc6f6dff4f126fc79284e0c3c1c50123380d" +SRC_URI = "git://github.com/storaged-project/libbytesize;branch=main;protocol=https" inherit gettext autotools pkgconfig python3native diff --git a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb index 28305c9854..72044427dd 100644 --- a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms." HOMEPAGE = "http://eigen.tuxfamily.org/" -LICENSE = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & GPL-3.0-only & LGPL-2.1-only & MINPACK" +LICENSE = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & GPL-2.0-only & LGPL-2.1-only & MINPACK" LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \ file://COPYING.BSD;md5=2dd0510ee95e59ca28834b875bc96596 \ file://COPYING.GPL;md5=d32239bcb673463ab874e80d47fae504 \ diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest index 9475f02535..29ec0d1027 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest @@ -1,6 +1,6 @@ #!/bin/sh -testbins="gpiod-test gpio-tools-test gpiod-cxx-test" +testbins="gpiod-test gpio-tools-test.bash gpiod-cxx-test" ptestdir=$(dirname "$(readlink -f "$0")") cd $ptestdir/tests diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc index 0eda47bba0..dc1fb4fe92 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc @@ -33,7 +33,6 @@ FILES:${PN}-tools += " \ FILES:libgpiodcxx = "${libdir}/libgpiodcxx.so.*" RRECOMMENDS:${PN}-ptest += "coreutils" -RDEPENDS:${PN}-ptest += "${@bb.utils.contains('PTEST_ENABLED', '1', 'bats', '', d)}" do_install:append() { rm -f ${D}${bindir}/gpiod-test @@ -50,8 +49,6 @@ do_install_ptest() { # Tools are always built so let's always install them for ptest even if # we're not selecting libgpiod-tools. - install -m 0755 ${S}/tools/gpio-tools-test ${D}${PTEST_PATH}/tests/ - install -m 0755 ${S}/tools/gpio-tools-test.bats ${D}${PTEST_PATH}/tests/ for tool in ${FILES:${PN}-tools}; do install ${B}/tools/.libs/$(basename $tool) ${D}${PTEST_PATH}/tests/ done diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb index b28aa8e698..111a5727ba 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb @@ -30,9 +30,15 @@ RRECOMMENDS:${PN}-ptest += " \ kernel-module-gpio-mockup \ ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-unittest', '', d)} \ " -RDEPENDS:${PN}-ptest += "python3-packaging" +RDEPENDS:${PN}-ptest += " \ + python3-packaging \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'bats', '', d)} \ +" do_install_ptest:append() { + install -m 0755 ${S}/tools/gpio-tools-test ${D}${PTEST_PATH}/tests/ + install -m 0755 ${S}/tools/gpio-tools-test.bats ${D}${PTEST_PATH}/tests/ + if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then install -m 0755 ${S}/bindings/python/tests/gpiod_py_test.py ${D}${PTEST_PATH}/tests/ fi diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_2.0.2.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_2.1.bb index 7533e0a258..1e92d00790 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_2.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_2.1.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:" -SRC_URI[sha256sum] = "c3c923dc63b7b1b02639c9179c81e3d9febf0887bbaa59775990229cdbedb88b" +SRC_URI[sha256sum] = "fa4024a080121c958502f9a46a5bda44bea85e7a4dd7fcb3dead463b6fc4261c" # Enable all project features for ptest PACKAGECONFIG[tests] = "--enable-tests --enable-tools --enable-bindings-cxx --enable-gpioset-interactive,--disable-tests,kmod util-linux glib-2.0 catch2 libedit" @@ -20,8 +20,13 @@ FILES:${PN}-tools += "${bindir}/gpionotify" FILES:${PN}-ptest += "${libdir}/libgpiosim.so.*" FILES:${PN}-ptest-dev += "${includedir}/gpiosim.h" +RDEPENDS:${PN}-ptest += " \ + bash \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'shunit2', '', d)} \ +" RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-sim" do_install_ptest:append() { + install -m 0755 ${S}/tools/gpio-tools-test.bash ${D}${PTEST_PATH}/tests/ install -m 0644 ${S}/tests/gpiosim/gpiosim.h ${D}${includedir}/gpiosim.h } diff --git a/meta-openembedded/meta-oe/recipes-support/libosinfo/libosinfo_1.10.bb b/meta-openembedded/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb index d724c52ea9..ca6f9ba3fa 100644 --- a/meta-openembedded/meta-oe/recipes-support/libosinfo/libosinfo_1.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb @@ -10,7 +10,7 @@ SRC_URI = " \ file://0001-meson.build-allow-crosscompiling-gir.patch \ " -SRCREV = "f503ff7a9e13963bcf396776bce0b209a819ba9b" +SRCREV = "ca9dd5b810dc04ea38048ae9be491654c8596ef9" S = "${WORKDIR}/git" @@ -18,6 +18,9 @@ inherit meson pkgconfig gtk-doc gobject-introspection vala DEPENDS = "glib-2.0 libsoup libxslt" +VALA_MESON_OPTION = 'enable-vala' +VALA_MESON_ENABLE_FLAG = 'enabled' +VALA_MESON_DISABLE_FLAG = 'disabled' GIR_MESON_OPTION = "enable-introspection" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' @@ -26,7 +29,6 @@ GTKDOC_MESON_OPTION = "enable-gtk-doc" EXTRA_OEMESON += " \ -Dwith-pci-ids-path=${datadir}/pci.ids \ -Dwith-usb-ids-path=${datadir}/usb.ids \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Denable-vala=enabled', '-Denable-vala=disabled', d)} \ " RDEPENDS:${PN} = "pciutils-ids usbids" diff --git a/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.20.2.bb b/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.21.1.bb index 1940864a20..a3bbbe39ef 100644 --- a/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.20.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.21.1.bb @@ -1,9 +1,9 @@ SUMMARY = "raw image decoder" LICENSE = "LGPL-2.1-only | CDDL-1.0" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=74c9dffdc42805f9c0de2f97df6031fc" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=1501ae0aa3c8544e63f08d6f7bf88a6f" SRC_URI = "git://github.com/LibRaw/LibRaw.git;branch=master;protocol=https" -SRCREV = "0209b6a2caec189e6d1a9b21c10e9e49f46e5a92" +SRCREV = "cccb97647fcee56801fa68231fa8a38aa8b52ef7" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb index 33e1b6fabd..07e2e29417 100644 --- a/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb @@ -14,13 +14,11 @@ SRC_URI = "https://www.ibr.cs.tu-bs.de/projects/${BPN}/download/${BP}.tar.gz \ SRC_URI[md5sum] = "4bf47483c06c9f07d1b10fbc74eddf11" SRC_URI[sha256sum] = "f21accdadb1bb328ea3f8a13fc34d715baac6e2db66065898346322c725754d3" -DEPENDS += "bison-native flex-native" - -RDEPENDS:${PN} += "wget" +DEPENDS += "bison-native flex-native wget-native gawk-native" inherit autotools-brokensep -EXTRA_OECONF = "ac_cv_path_SH=/bin/sh ac_cv_path_WGET=${bindir}/wget ac_cv_path_AWK=${bindir}/awk" +EXTRA_OECONF = "ac_cv_path_SH=/bin/sh" do_install:append () { install -d ${D}${sysconfdir} @@ -34,3 +32,5 @@ FILES:${PN}-pibs += "${datadir}/pibs" FILES:${PN}-yang += "${datadir}/yang" RRECOMMENDS:${PN} = "${BPN}-mibs" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_194.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_196.bb index 9b5c554d86..06aa30df05 100644 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_194.bb +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_196.bb @@ -11,7 +11,7 @@ SRC_URI = "\ file://run-ptest \ " -SRCREV = "8f33fdc47160edce09d75e1316b4d88129ca60a0" +SRCREV = "edfe78a0dc54a940f4916a9bd681eab7b3f746d1" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.3.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.3.bb index ae4b3b9bf6..a7a9019e33 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.3.bb @@ -29,7 +29,7 @@ DEPENDS = "libdevmapper \ LICENSE = "GPL-2.0-only" -SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=http;branch=master \ +SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=master \ file://multipathd.oe \ file://multipath.conf.example \ file://0021-RH-fixup-udev-rules-for-redhat.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch index 536060cfd9..265d723c6e 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch @@ -1,19 +1,60 @@ -From 5e4150826fea6f37276f348c65d94ce4847d1211 Mon Sep 17 00:00:00 2001 +From 75f7475fcfb35cbe4d8f5ccf5c4ac8bc78f2dc30 Mon Sep 17 00:00:00 2001 From: Kumataro <Kumataro@users.noreply.github.com> -Date: Sat, 7 Oct 2023 10:11:25 +0900 -Subject: [PATCH] 3rdparty: supporting protobuf v22 and later +Date: Thu, 19 Oct 2023 14:45:08 +0900 +Subject: [PATCH] Merge pull request #24372 from Kumataro:fix24369 -Upstream-Status: Submitted [https://github.com/opencv/opencv/pull/24372] +Supporting protobuf v22 and later(with abseil-cpp/C++17) #24372 + +fix https://github.com/opencv/opencv/issues/24369 +related https://github.com/opencv/opencv/issues/23791 + +1. This patch supports external protobuf v22 and later, it required abseil-cpp and c++17. + Even if the built-in protobuf is upgraded to v22 or later, + the dependency on abseil-cpp and the requirement for C++17 will continue. +2. Some test for caffe required patched protobuf, so this patch disable them. + +This patch is tested by following libraries. +- Protobuf: /usr/local/lib/libprotobuf.so (4.24.4) +- abseil-cpp: YES (20230125) + +See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request + +- [x] I agree to contribute to the project under Apache 2 License. +- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV +- [x] The PR is proposed to the proper branch +- [x] There is a reference to the original bug report and related work +- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable + Patch to opencv_extra has the same branch name. +- [x] The feature is well documented and sample code can be built with the project CMake + +Upstream-Status: Backport [https://github.com/opencv/opencv/commit/6e4280ea81b59c6dca45bb9801b758377beead55] --- - cmake/OpenCVFindProtobuf.cmake | 37 ++++++++++++++++++++++++++++++++++ - modules/dnn/CMakeLists.txt | 9 +++++++++ - 2 files changed, 46 insertions(+) + cmake/OpenCVFindProtobuf.cmake | 35 +++++++++++++++++++++++++++----- + modules/dnn/CMakeLists.txt | 6 ++++++ + modules/dnn/test/test_layers.cpp | 24 ++++++++++++++++++---- + 3 files changed, 56 insertions(+), 9 deletions(-) diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake -index 8835347d1d..9bd5c28db8 100644 +index 8835347d1d..5b1e17529f 100644 --- a/cmake/OpenCVFindProtobuf.cmake +++ b/cmake/OpenCVFindProtobuf.cmake -@@ -67,6 +67,38 @@ else() +@@ -30,8 +30,14 @@ if(BUILD_PROTOBUF) + set(Protobuf_LIBRARIES "libprotobuf") + set(HAVE_PROTOBUF TRUE) + else() ++ # we still need this for command PROTOBUF_GENERATE_CPP. ++ set(protobuf_MODULE_COMPATIBLE ON) ++ + unset(Protobuf_VERSION CACHE) +- find_package(Protobuf QUIET) ++ find_package(Protobuf QUIET CONFIG) ++ if(NOT Protobuf_FOUND) ++ find_package(Protobuf QUIET) ++ endif() + + # Backwards compatibility + # Define camel case versions of input variables +@@ -67,6 +73,20 @@ else() endif() endif() @@ -21,82 +62,49 @@ index 8835347d1d..9bd5c28db8 100644 +# In Protocol Buffers v22.0 and later drops C++11 support and depends abseil-cpp. +# Details: https://protobuf.dev/news/2022-08-03/ +# And if std::text_view is in abseil-cpp requests C++17 and later. -+if(HAVE_PROTOBUF) -+ if("${Protobuf_VERSION}" MATCHES [[[0-9]+.([0-9]+).[0-9]+]]) -+ string(COMPARE GREATER_EQUAL "${CMAKE_MATCH_1}" "22" REQUEST_ABSL) -+ -+ if(REQUEST_ABSL) -+ string(COMPARE GREATER_EQUAL "${CMAKE_CXX_STANDARD}" "17" USED_AFTER_CXX17) -+ if(NOT USED_AFTER_CXX17) -+ message("CMAKE_CXX_STANDARD : ${CMAKE_CXX_STANDARD}") -+ message("protobuf : ${Protobuf_VERSION}") -+ message(FATAL_ERROR "protobuf(v22 and later) and abseil-cpp request CMAKE_CXX_STANDARD=17 and later.") -+ endif() -+ -+ ocv_check_modules(ABSL_STRINGS absl_strings) -+ if(NOT ABSL_STRINGS_FOUND) -+ message(FATAL_ERROR "protobuf(v22 and later) requests abseil-cpp(strings), but missing.") -+ endif() -+ -+ ocv_check_modules(ABSL_LOG absl_log) -+ if(NOT ABSL_LOG_FOUND) -+ message(FATAL_ERROR "protobuf(v22 and later) requests abseil-cpp(log), but missing.") -+ endif() + -+ endif() -+ else() -+ message(FATAL_ERROR "Protobuf version(${Protobuf_VERSION}) is unexpected to split.") ++if(HAVE_PROTOBUF) ++ if(NOT (Protobuf_VERSION VERSION_LESS 22)) ++ if((CMAKE_CXX_STANDARD EQUAL 98) OR (CMAKE_CXX_STANDARD LESS 17)) ++ message(STATUS "CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} is too old to support protobuf(${Protobuf_VERSION}) and/or abseil-cpp. Use C++17 or later. Turning HAVE_PROTOBUF off") ++ set(HAVE_PROTOBUF FALSE) + endif() ++ endif() +endif() + if(HAVE_PROTOBUF AND PROTOBUF_UPDATE_FILES AND NOT COMMAND PROTOBUF_GENERATE_CPP) message(FATAL_ERROR "Can't configure protobuf dependency (BUILD_PROTOBUF=${BUILD_PROTOBUF} PROTOBUF_UPDATE_FILES=${PROTOBUF_UPDATE_FILES})") endif() -@@ -89,3 +121,8 @@ if(HAVE_PROTOBUF) - BUILD_PROTOBUF THEN "build (${Protobuf_VERSION})" - ELSE "${__location} (${Protobuf_VERSION})") - endif() -+ -+if(HAVE_ABSL_STRINGS AND HAVE_ABSL_LOG) -+ list(APPEND CUSTOM_STATUS absl) -+ list(APPEND CUSTOM_STATUS_absl " abseil-cpp:" "YES (${ABSL_STRINGS_VERSION})" ) -+endif() -diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt -index 804b78ead2..d32007b37e 100644 ---- a/modules/dnn/CMakeLists.txt -+++ b/modules/dnn/CMakeLists.txt -@@ -149,6 +149,15 @@ if(NOT BUILD_PROTOBUF) - list(APPEND include_dirs ${Protobuf_INCLUDE_DIRS}) - endif() - -+if(HAVE_ABSL_STRINGS) -+ list(APPEND libs ${ABSL_STRINGS_LIBRARIES}) -+ list(APPEND include_dirs ${ABSL_STRTRINGS_INCLUDE_DIRS}) -+endif() -+if(HAVE_ABSL_LOG) -+ list(APPEND libs ${ABSL_LOG_LIBRARIES}) -+ list(APPEND include_dirs ${ABSL_LOG_INCLUDE_DIRS}) -+endif() +@@ -74,15 +94,20 @@ endif() + if(HAVE_PROTOBUF) + list(APPEND CUSTOM_STATUS protobuf) + if(NOT BUILD_PROTOBUF) ++ unset( __location) + if(TARGET "${Protobuf_LIBRARIES}") + get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_RELEASE) + if(NOT __location) + get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION) + endif() +- elseif(Protobuf_LIBRARY) +- set(__location "${Protobuf_LIBRARY}") +- else() +- set(__location "${Protobuf_LIBRARIES}") ++ endif() + - set(sources_options "") - - list(APPEND libs ${LAPACK_LIBRARIES}) -From 06a7669521d205f647d3e718322ccd153cdbbb77 Mon Sep 17 00:00:00 2001 -From: Kumataro <Kumataro@users.noreply.github.com> -Date: Sun, 8 Oct 2023 09:39:35 +0900 -Subject: [PATCH] dnn: disable some tests for external protobuf - ---- - modules/dnn/CMakeLists.txt | 5 +++++ - modules/dnn/src/caffe/caffe_io.cpp | 24 ++++++++++++++++++++++-- - modules/dnn/test/test_layers.cpp | 16 ++++++++++++++++ - 3 files changed, 43 insertions(+), 2 deletions(-) - ++ if(NOT __location) ++ if(Protobuf_LIBRARY) ++ set(__location "${Protobuf_LIBRARY}") ++ else() ++ set(__location "${Protobuf_LIBRARIES}") ++ endif() + endif() + endif() + list(APPEND CUSTOM_STATUS_protobuf " Protobuf:" diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt -index d32007b37e..face38465f 100644 +index 804b78ead2..9fcc460909 100644 --- a/modules/dnn/CMakeLists.txt +++ b/modules/dnn/CMakeLists.txt -@@ -254,6 +254,12 @@ ocv_create_module(${libs} ${dnn_runtime_libs}) +@@ -245,6 +245,12 @@ ocv_create_module(${libs} ${dnn_runtime_libs}) ocv_add_samples() ocv_add_accuracy_tests(${dnn_runtime_libs}) @@ -109,215 +117,13 @@ index d32007b37e..face38465f 100644 set(perf_path "${CMAKE_CURRENT_LIST_DIR}/perf") file(GLOB_RECURSE perf_srcs "${perf_path}/*.cpp") file(GLOB_RECURSE perf_hdrs "${perf_path}/*.hpp" "${perf_path}/*.h") -@@ -318,3 +322,4 @@ if(OPENCV_TEST_DNN_TFLITE) - ocv_target_compile_definitions(opencv_perf_dnn PRIVATE "OPENCV_TEST_DNN_TFLITE=1") - endif() - endif() -+ -diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp -index ebecf95eea..ebceca84cf 100644 ---- a/modules/dnn/src/caffe/caffe_io.cpp -+++ b/modules/dnn/src/caffe/caffe_io.cpp -@@ -1130,7 +1130,17 @@ bool ReadProtoFromTextFile(const char* filename, Message* proto) { - parser.AllowUnknownField(true); - parser.SetRecursionLimit(1000); - #endif -- return parser.Parse(&input, proto); -+ const bool ret = parser.Parse(&input, proto); -+ -+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF -+ if(!ret) -+ { -+ LOG(ERROR) << "Some data requires patched protobuf (available in OpenCV source tree only)."; -+ CV_Error_(Error::StsError,("Some data requires patched protobuf (available in OpenCV source tree only).")); -+ } -+#endif -+ -+ return ret; - } - - bool ReadProtoFromBinaryFile(const char* filename, Message* proto) { -@@ -1148,7 +1158,17 @@ bool ReadProtoFromTextBuffer(const char* data, size_t len, Message* proto) { - parser.AllowUnknownField(true); - parser.SetRecursionLimit(1000); - #endif -- return parser.Parse(&input, proto); -+ const bool ret = parser.Parse(&input, proto); -+ -+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF -+ if(!ret) -+ { -+ LOG(ERROR) << "Some data requires patched protobuf (available in OpenCV source tree only)."; -+ CV_Error_(Error::StsError,("Some data requires patched protobuf (available in OpenCV source tree only).")); -+ } -+#endif -+ -+ return ret; - } - - diff --git a/modules/dnn/test/test_layers.cpp b/modules/dnn/test/test_layers.cpp -index 763d94b99c..a07d442d76 100644 +index 763d94b99c..6cb6d54b3f 100644 --- a/modules/dnn/test/test_layers.cpp +++ b/modules/dnn/test/test_layers.cpp -@@ -754,7 +754,11 @@ TEST_F(Layer_RNN_Test, get_set_test) - EXPECT_EQ(shape(outputs[1]), shape(nT, nS, nH)); - } +@@ -756,11 +756,15 @@ TEST_F(Layer_RNN_Test, get_set_test) -+#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF TEST_P(Test_Caffe_layers, Accum) -+#else -+TEST_P(Test_Caffe_layers, DISABLED_Accum) // requires patched protobuf (available in OpenCV source tree only) -+#endif - { - if (backend == DNN_BACKEND_OPENCV && target != DNN_TARGET_CPU) - applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL, CV_TEST_TAG_DNN_SKIP_OPENCL_FP16); -@@ -778,7 +782,11 @@ TEST_P(Test_Caffe_layers, ChannelNorm) - testLayerUsingCaffeModels("channel_norm", false, false); - } - -+#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF - TEST_P(Test_Caffe_layers, DataAugmentation) -+#else -+TEST_P(Test_Caffe_layers, DISABLED_DataAugmentation) // requires patched protobuf (available in OpenCV source tree only) -+#endif - { - if (backend == DNN_BACKEND_OPENCV && target == DNN_TARGET_OPENCL_FP16) - applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL_FP16); -@@ -787,7 +795,11 @@ TEST_P(Test_Caffe_layers, DataAugmentation) - testLayerUsingCaffeModels("data_augmentation_8x6", true, false); - } - -+#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF - TEST_P(Test_Caffe_layers, Resample) -+#else -+TEST_P(Test_Caffe_layers, DISABLED_Resample) // requires patched protobuf (available in OpenCV source tree only) -+#endif - { - if (backend != DNN_BACKEND_OPENCV) - applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER, CV_TEST_TAG_DNN_SKIP_IE_NGRAPH); -@@ -795,7 +807,11 @@ TEST_P(Test_Caffe_layers, Resample) - testLayerUsingCaffeModels("nearest", false, false); - } - -+#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF - TEST_P(Test_Caffe_layers, Correlation) -+#else -+TEST_P(Test_Caffe_layers, DISABLED_Correlation) // requires patched protobuf (available in OpenCV source tree only) -+#endif - { - if (backend == DNN_BACKEND_OPENCV && target == DNN_TARGET_OPENCL_FP16) - applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NGRAPH, CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER, -From 2c33798f41942aefc203183d673ce4846f32dba4 Mon Sep 17 00:00:00 2001 -From: Kumataro <Kumataro@users.noreply.github.com> -Date: Sun, 8 Oct 2023 13:28:40 +0900 -Subject: [PATCH] use GREATER instead of GREATER_EQUAL and remove new blank - line at EOF - ---- - cmake/OpenCVFindProtobuf.cmake | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake -index 9bd5c28db8..ba147526d6 100644 ---- a/cmake/OpenCVFindProtobuf.cmake -+++ b/cmake/OpenCVFindProtobuf.cmake -@@ -71,12 +71,14 @@ endif() - # In Protocol Buffers v22.0 and later drops C++11 support and depends abseil-cpp. - # Details: https://protobuf.dev/news/2022-08-03/ - # And if std::text_view is in abseil-cpp requests C++17 and later. -+ - if(HAVE_PROTOBUF) - if("${Protobuf_VERSION}" MATCHES [[[0-9]+.([0-9]+).[0-9]+]]) -- string(COMPARE GREATER_EQUAL "${CMAKE_MATCH_1}" "22" REQUEST_ABSL) -+ string(COMPARE GREATER "${CMAKE_MATCH_1}" "21" REQUEST_ABSL) # >=22 - - if(REQUEST_ABSL) -- string(COMPARE GREATER_EQUAL "${CMAKE_CXX_STANDARD}" "17" USED_AFTER_CXX17) -+ string(COMPARE GREATER "${CMAKE_CXX_STANDARD}" "16" USED_AFTER_CXX17) # >=17 -+ - if(NOT USED_AFTER_CXX17) - message("CMAKE_CXX_STANDARD : ${CMAKE_CXX_STANDARD}") - message("protobuf : ${Protobuf_VERSION}") -From cd709eefbeedd116bf3495b42280323b932791ff Mon Sep 17 00:00:00 2001 -From: Kumataro <Kumataro@users.noreply.github.com> -Date: Mon, 9 Oct 2023 21:51:04 +0900 -Subject: [PATCH] fix for review - ---- - cmake/OpenCVFindProtobuf.cmake | 5 ---- - modules/dnn/src/caffe/caffe_io.cpp | 24 ++---------------- - modules/dnn/test/test_layers.cpp | 40 +++++++++++++++--------------- - 3 files changed, 22 insertions(+), 47 deletions(-) - -diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake -index ba147526d6..2faf1010bf 100644 ---- a/cmake/OpenCVFindProtobuf.cmake -+++ b/cmake/OpenCVFindProtobuf.cmake -@@ -123,8 +123,3 @@ if(HAVE_PROTOBUF) - BUILD_PROTOBUF THEN "build (${Protobuf_VERSION})" - ELSE "${__location} (${Protobuf_VERSION})") - endif() -- --if(HAVE_ABSL_STRINGS AND HAVE_ABSL_LOG) -- list(APPEND CUSTOM_STATUS absl) -- list(APPEND CUSTOM_STATUS_absl " abseil-cpp:" "YES (${ABSL_STRINGS_VERSION})" ) --endif() -diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp -index ebceca84cf..ebecf95eea 100644 ---- a/modules/dnn/src/caffe/caffe_io.cpp -+++ b/modules/dnn/src/caffe/caffe_io.cpp -@@ -1130,17 +1130,7 @@ bool ReadProtoFromTextFile(const char* filename, Message* proto) { - parser.AllowUnknownField(true); - parser.SetRecursionLimit(1000); - #endif -- const bool ret = parser.Parse(&input, proto); -- --#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF -- if(!ret) -- { -- LOG(ERROR) << "Some data requires patched protobuf (available in OpenCV source tree only)."; -- CV_Error_(Error::StsError,("Some data requires patched protobuf (available in OpenCV source tree only).")); -- } --#endif -- -- return ret; -+ return parser.Parse(&input, proto); - } - - bool ReadProtoFromBinaryFile(const char* filename, Message* proto) { -@@ -1158,17 +1148,7 @@ bool ReadProtoFromTextBuffer(const char* data, size_t len, Message* proto) { - parser.AllowUnknownField(true); - parser.SetRecursionLimit(1000); - #endif -- const bool ret = parser.Parse(&input, proto); -- --#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF -- if(!ret) -- { -- LOG(ERROR) << "Some data requires patched protobuf (available in OpenCV source tree only)."; -- CV_Error_(Error::StsError,("Some data requires patched protobuf (available in OpenCV source tree only).")); -- } --#endif -- -- return ret; -+ return parser.Parse(&input, proto); - } - - -diff --git a/modules/dnn/test/test_layers.cpp b/modules/dnn/test/test_layers.cpp -index a07d442d76..5c6fc541d7 100644 ---- a/modules/dnn/test/test_layers.cpp -+++ b/modules/dnn/test/test_layers.cpp -@@ -754,17 +754,17 @@ TEST_F(Layer_RNN_Test, get_set_test) - EXPECT_EQ(shape(outputs[1]), shape(nT, nS, nH)); - } - --#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF - TEST_P(Test_Caffe_layers, Accum) --#else --TEST_P(Test_Caffe_layers, DISABLED_Accum) // requires patched protobuf (available in OpenCV source tree only) --#endif { +#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF + throw SkipTestException("Requires patched protobuf"); @@ -331,15 +137,9 @@ index a07d442d76..5c6fc541d7 100644 } TEST_P(Test_Caffe_layers, FlowWarp) -@@ -782,42 +782,42 @@ TEST_P(Test_Caffe_layers, ChannelNorm) - testLayerUsingCaffeModels("channel_norm", false, false); - } +@@ -780,27 +784,39 @@ TEST_P(Test_Caffe_layers, ChannelNorm) --#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF TEST_P(Test_Caffe_layers, DataAugmentation) --#else --TEST_P(Test_Caffe_layers, DISABLED_DataAugmentation) // requires patched protobuf (available in OpenCV source tree only) --#endif { +#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF + throw SkipTestException("Requires patched protobuf"); @@ -352,11 +152,7 @@ index a07d442d76..5c6fc541d7 100644 +#endif } --#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF TEST_P(Test_Caffe_layers, Resample) --#else --TEST_P(Test_Caffe_layers, DISABLED_Resample) // requires patched protobuf (available in OpenCV source tree only) --#endif { +#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF + throw SkipTestException("Requires patched protobuf"); @@ -368,11 +164,7 @@ index a07d442d76..5c6fc541d7 100644 +#endif } --#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF TEST_P(Test_Caffe_layers, Correlation) --#else --TEST_P(Test_Caffe_layers, DISABLED_Correlation) // requires patched protobuf (available in OpenCV source tree only) --#endif { +#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF + throw SkipTestException("Requires patched protobuf"); @@ -381,12 +173,11 @@ index a07d442d76..5c6fc541d7 100644 applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NGRAPH, CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER, CV_TEST_TAG_DNN_SKIP_OPENCL, CV_TEST_TAG_DNN_SKIP_OPENCL_FP16); testLayerUsingCaffeModels("correlation", false, false, 0.0, 0.0, 2); - } +#endif + } TEST_P(Test_Caffe_layers, Convolution2Inputs) - { -@@ -1657,12 +1657,11 @@ private: +@@ -1641,12 +1657,11 @@ private: int outWidth, outHeight, zoomFactor; }; @@ -402,7 +193,7 @@ index a07d442d76..5c6fc541d7 100644 #if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021030000) if (backend == DNN_BACKEND_INFERENCE_ENGINE_NGRAPH && target == DNN_TARGET_MYRIAD) applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_MYRIAD, CV_TEST_TAG_DNN_SKIP_IE_NGRAPH); // exception -@@ -1686,6 +1685,7 @@ TEST_P(Test_Caffe_layers, DISABLED_Interp) // requires patched protobuf (availa +@@ -1670,6 +1685,7 @@ TEST_P(Test_Caffe_layers, DISABLED_Interp) // requires patched protobuf (availa // Test an implemented layer. testLayerUsingCaffeModels("layer_interp", false, false); diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Fix-data-race-when-create-POSIX-thread.patch b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Fix-data-race-when-create-POSIX-thread.patch new file mode 100644 index 0000000000..1a7f4dcdca --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Fix-data-race-when-create-POSIX-thread.patch @@ -0,0 +1,33 @@ +From 03b68fc924b24e12c87512d790d37fc6ddc352ac Mon Sep 17 00:00:00 2001 +From: Dawid Drozd <drozddawid@gmail.com> +Date: Sat, 11 Feb 2023 14:48:39 +0400 +Subject: [PATCH] Fix data race when create POSIX thread + +When creating thread using pthread_create() `_pData->thread` will be set. +It could lead to data race as in runnableEntry() we refer to that variable. + +Instead use pthread_self(). +getName() is already under mutex. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Backport [https://github.com/pocoproject/poco/pull/3942/commits/9c8a79b994a367f626c5551e0f38c27d0d8431f1] +--- + Foundation/src/Thread_POSIX.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Foundation/src/Thread_POSIX.cpp b/Foundation/src/Thread_POSIX.cpp +index ceab76e82..3e52cd31f 100644 +--- a/Foundation/src/Thread_POSIX.cpp ++++ b/Foundation/src/Thread_POSIX.cpp +@@ -351,7 +351,7 @@ void* ThreadImpl::runnableEntry(void* pThread) + #endif + + ThreadImpl* pThreadImpl = reinterpret_cast<ThreadImpl*>(pThread); +- setThreadName(pThreadImpl->_pData->thread, reinterpret_cast<Thread*>(pThread)->getName()); ++ setThreadName(pthread_self(), reinterpret_cast<Thread*>(pThread)->getName()); + AutoPtr<ThreadData> pData = pThreadImpl->_pData; + try + { +-- +2.42.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.12.4.bb b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.12.4.bb index 8505f66e8b..12532e4ef1 100644 --- a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.12.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.12.4.bb @@ -11,6 +11,7 @@ DEPENDS = "libpcre2 zlib" SRC_URI = "git://github.com/pocoproject/poco.git;branch=master;protocol=https \ file://0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch \ file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \ + file://0001-Fix-data-race-when-create-POSIX-thread.patch \ file://run-ptest \ " SRCREV = "1211613642269b7d53bea58b02de7fcd25ece3b9" diff --git a/meta-openembedded/meta-oe/recipes-support/re2/re2/run-ptest b/meta-openembedded/meta-oe/recipes-support/re2/re2/run-ptest new file mode 100644 index 0000000000..8bd5fd1efb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/re2/re2/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +ctest --force-new-ctest-process | sed -u 's/\*\*\*/ /g' | awk '/Test +#/{gsub(/Passed/,"PASS"); gsub(/Failed/,"FAIL"); gsub(/Skipped/,"SKIP"); print $6": "$4; fflush();}' diff --git a/meta-openembedded/meta-oe/recipes-support/re2/re2_2023.03.01.bb b/meta-openembedded/meta-oe/recipes-support/re2/re2_2023.03.01.bb index 78bf695a4a..fe210d5107 100644 --- a/meta-openembedded/meta-oe/recipes-support/re2/re2_2023.03.01.bb +++ b/meta-openembedded/meta-oe/recipes-support/re2/re2_2023.03.01.bb @@ -6,17 +6,27 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5c31eb512bdf3cb11ffd5713963760" # tag 2023-03-01 SRCREV = "241e2e430836e80f93d704d1f06cd3e7fe3100f5" -SRC_URI = "git://github.com/google/re2.git;branch=main;protocol=https" +SRC_URI = "git://github.com/google/re2.git;branch=main;protocol=https \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \ + " S = "${WORKDIR}/git" -inherit cmake +inherit cmake ptest +RDEPENDS:${PN}-ptest += "cmake sed" EXTRA_OECMAKE += " \ -DBUILD_SHARED_LIBS=ON \ - -DRE2_BUILD_TESTING=OFF \ + ${@bb.utils.contains('PTEST_ENABLED', '1', '-DRE2_BUILD_TESTING=ON', '-DRE2_BUILD_TESTING=OFF', d)} \ " +do_install_ptest () { + cp -r ${B}/*_test ${D}${PTEST_PATH} + cp -r ${B}/CTestTestfile.cmake ${D}${PTEST_PATH} + sed -i -e 's#${B}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` + sed -i -e 's#${S}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` +} + # ignore .so in /usr/lib64 FILES:${PN} = "${libdir}" INSANE_SKIP:${PN} += "dev-so" diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.32.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.33.bb index 74c68a59d8..590f5089e5 100644 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.32.bb +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.33.bb @@ -25,7 +25,7 @@ DEPENDS = " \ DEPENDS:append:libc-musl = " libexecinfo" LDFLAGS:append:libc-musl = " -lexecinfo" -SRCREV = "4804f68f23045a38c3a7be46810fce14bac2fc3c" +SRCREV = "2c4e1479433e51418ecb6089f35182bfebc5b57e" SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb b/meta-openembedded/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb new file mode 100644 index 0000000000..57b31a78d9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb @@ -0,0 +1,29 @@ +SUMMARY = "Reparent a running program to a new terminal" +DESCRIPTION = "reptyr is a utility for taking an existing running program and \ +attaching it to a new terminal. Started a long-running process over ssh, but \ +have to leave and don't want to interrupt it? Just start a screen, use reptyr \ +to grab it, and then kill the ssh session and head on home." +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=25a0555028c71837623fa6dfa4cc45c0" + +SRC_URI = "git://github.com/nelhage/reptyr.git;protocol=https;branch=master" +SRCREV = "1238097fc2cd15db058d2185cc4985daa87bcd41" + +S = "${WORKDIR}/git" + +inherit bash-completion github-releases manpages pkgconfig + +GITHUB_BASE_URI = "https://github.com/nelhage/${BPN}/releases/" + +PACKAGECONFIG ?= "" +PACKAGECONFIG[manpages] = "" + +EXTRA_OEMAKE = "'BINDIR=${bindir}' 'MANDIR=${mandir}' 'PKG_CONFIG=${STAGING_BINDIR_NATIVE}/pkg-config'" + +do_compile () { + oe_runmake +} + +do_install () { + oe_runmake install 'DESTDIR=${D}' +} diff --git a/meta-openembedded/meta-oe/recipes-support/smarty/smarty_4.3.0.bb b/meta-openembedded/meta-oe/recipes-support/smarty/smarty_4.3.4.bb index bc6fc0d8c6..960d0665dc 100644 --- a/meta-openembedded/meta-oe/recipes-support/smarty/smarty_4.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/smarty/smarty_4.3.4.bb @@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2c0f216b2120ffc367e20f2b56df51b3" DEPENDS += "php" -SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;branch=master" +SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;branch=support/4.3" -SRCREV = "c02e9e135ea719b91f457a0072748ded0e852e7d" +SRCREV = "3931d8f54b8f7a4ffab538582d34d4397ba8daa5" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/tio/tio_2.6.bb b/meta-openembedded/meta-oe/recipes-support/tio/tio_2.7.bb index faef290737..59c772b5d0 100644 --- a/meta-openembedded/meta-oe/recipes-support/tio/tio_2.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/tio/tio_2.7.bb @@ -7,7 +7,7 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=0e1a95b7892d3015ecd6d0016f601f2c" SRC_URI = "git://github.com/tio/tio;protocol=https;branch=master" -SRCREV = "88ef473362c5a1ff0dcd389fd5b1d4d6bf202472" +SRCREV = "1c32555c2a4f26b60f94757656825fc6684d6892" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb b/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb deleted file mode 100644 index b9f26051a1..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "A very small and simple terminal emulator" -SECTION = "x11/applications" -DEPENDS = "vte9" - -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://main.c;start_line=5;end_line=16;md5=9ae4bf20caf291afa94530026bd15229" - -# 0.2 version -SRCREV = "8586d617aed19fc75f5ae1e07270752c1b2f9a30" -SRC_URI = "git://github.com/OSSystems/toscoterm.git;branch=master;protocol=https" - -S = "${WORKDIR}/git" - -inherit features_check gitpkgv pkgconfig - -REQUIRED_DISTRO_FEATURES = "x11" - -do_compile() { - oe_runmake \ - CC="${CC}" \ - CFLAGS="`pkg-config --cflags vte`${CFLAGS}" \ - LDFLAGS="`pkg-config --libs vte` ${LDFLAGS}" -} - -do_install() { - oe_runmake PREFIX="${prefix}" DESTDIR="${D}" install -} - -RDEPENDS:${PN}:append:libc-glibc = " glibc-gconv-ibm437" diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-vbox_fb-fix-kernel-v6.5-build.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-vbox_fb-fix-kernel-v6.5-build.patch deleted file mode 100644 index 01969d4a11..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-vbox_fb-fix-kernel-v6.5-build.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 4cf34517b0c793405dca154cc70c9b5d1a566a8a Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@gmail.com> -Date: Fri, 29 Sep 2023 14:52:50 -0400 -Subject: [PATCH] vbox_fb: fix kernel v6.5 build - -When building against the 6.5 kernel (and kernel headers), the following -build error is encountered: - - | vboxguestdrivers/7.0.10/vboxguestdrivers-7.0.10/vboxvideo/vbox_fb.c:194:24: error: 'drm_fb_helper_sys_fillrect' undeclared here (not in a function); did you mean 'drm_fb_helper_lastclose'? - | 194 | .fb_fillrect = drm_fb_helper_sys_fillrect, - | | ^~~~~~~~~~~~~~~~~~~~~~~~~~ - | | drm_fb_helper_lastclose - | vboxguestdrivers/7.0.10/vboxguestdrivers-7.0.10/vboxvideo/vbox_fb.c:195:24: error: 'drm_fb_helper_sys_copyarea' undeclared here (not in a function); did you mean 'drm_fb_helper_set_par'? - | 195 | .fb_copyarea = drm_fb_helper_sys_copyarea, - | | ^~~~~~~~~~~~~~~~~~~~~~~~~~ - | | drm_fb_helper_set_par - | vboxguestdrivers/7.0.10/vboxguestdrivers-7.0.10/vboxvideo/vbox_fb.c:196:25: error: 'drm_fb_helper_sys_imageblit' undeclared here (not in a function) - | 196 | .fb_imageblit = drm_fb_helper_sys_imageblit, - | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ - -We backport a patch from vbox-dev to fix the issue. - -Upstream-Status: Submitted [https://www.mail-archive.com/vbox-dev@virtualbox.org/msg10129.html] - -Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ---- - src/VBox/Additions/linux/drm/vbox_fb.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/VBox/Additions/linux/drm/vbox_fb.c b/src/VBox/Additions/linux/drm/vbox_fb.c -index 2a8c79ab..d453533c 100644 ---- a/src/VBox/Additions/linux/drm/vbox_fb.c -+++ b/src/VBox/Additions/linux/drm/vbox_fb.c -@@ -196,9 +196,13 @@ static struct fb_ops vboxfb_ops = { - .owner = THIS_MODULE, - .fb_check_var = drm_fb_helper_check_var, - .fb_set_par = drm_fb_helper_set_par, -+#if RTLNX_VER_MIN(6, 5, 0) -+ FB_DEFAULT_SYS_OPS, -+#else - .fb_fillrect = drm_fb_helper_sys_fillrect, - .fb_copyarea = drm_fb_helper_sys_copyarea, - .fb_imageblit = drm_fb_helper_sys_imageblit, -+#endif - .fb_pan_display = drm_fb_helper_pan_display, - .fb_blank = drm_fb_helper_blank, - .fb_setcmap = drm_fb_helper_setcmap, --- -2.34.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.10.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.12.bb index 8e90138244..6b493de7cc 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.12.bb @@ -13,10 +13,9 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ - file://0001-vbox_fb-fix-kernel-v6.5-build.patch \ " -SRC_URI[sha256sum] = "0b1e6d8b7f87d017c7fae37f80586acff04f799ffc1d51e995954d6415dee371" +SRC_URI[sha256sum] = "d76634c6ccf62503726a5aeae6c78a3462474c51a0ebe4942591ccc2d939890a" S ?= "${WORKDIR}/vbox_module" S:task-patch = "${WORKDIR}/${VBOX_NAME}" @@ -24,7 +23,7 @@ S:task-patch = "${WORKDIR}/${VBOX_NAME}" export VBOX_KBUILD_TARGET_ARCH="${ARCH}" export VBOX_KBUILD_TARGET_ARCH:x86-64="amd64" -EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1" +EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1 CC='${CC} ${DEBUG_PREFIX_MAP} -fdebug-prefix-map=${STAGING_KERNEL_DIR}=${KERNEL_SRC_PATH} -fdebug-prefix-map=${STAGING_KERNEL_BUILDDIR}=${KERNEL_SRC_PATH}'" # otherwise 5.2.22 builds just vboxguest MAKE_TARGETS = "all" diff --git a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.0.bb b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.2.bb index f682cd9f03..ac75afb90e 100644 --- a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.2.bb @@ -15,7 +15,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ file://no-musttail-arm.patch \ " -SRC_URI[sha256sum] = "828f95935861fae583fb8f2ae58cf64c63c178ae2b7c2d6f73070813ad64ed1b" +SRC_URI[sha256sum] = "5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen diff --git a/meta-openembedded/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.0.bb b/meta-openembedded/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.1.bb index b9173a9f3b..f8a07eb644 100644 --- a/meta-openembedded/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.1.bb @@ -31,13 +31,12 @@ SRC_URI = " \ " S = "${WORKDIR}/git" -SRCREV = "a4b27063222b16652e73b422e5448d75335199ef" +SRCREV = "37a6f7c8b8e08b9861f05e172cd4e0d07a832c4d" FILES:${PN} += "${libdir}/systemd ${datadir}/dbus-1" EXTRA_OEMESON += " \ --cross-file=${WORKDIR}/meson-${PN}.cross \ - -Dflatpak-interfaces-dir=${STAGING_DATADIR}/dbus-1/interfaces \ -Ddbus-service-dir=${datadir}/dbus-1/services \ " diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-xmldsigverify-Include-xmlsec-parser.h.patch b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-xmldsigverify-Include-xmlsec-parser.h.patch deleted file mode 100644 index 4347e925a3..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-xmldsigverify-Include-xmlsec-parser.h.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 30e1afe60820c18c89cd10e9dcb7208ad5676d1d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 19 Jan 2023 15:06:35 -0800 -Subject: [PATCH] xmldsigverify: Include xmlsec/parser.h - -this ensures that xmlSecParserSetDefaultOptions definition is made -available - -Fixes -| xmldsigverify.c:275:5: error: call to undeclared function 'xmlSecParserSetDefaultOptions'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] -| xmlSecParserSetDefaultOptions(XML_PARSE_NOENT | XML_PARSE_NOCDATA | -| ^ - -Upstream-Status: Submitted [https://github.com/lsh123/xmlsec/pull/463] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - examples/xmldsigverify.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/examples/xmldsigverify.c b/examples/xmldsigverify.c -index ed538c70..ff68120e 100644 ---- a/examples/xmldsigverify.c -+++ b/examples/xmldsigverify.c -@@ -25,6 +25,7 @@ - #include <xmlsec/xmldsig.h> - #include <xmlsec/crypto.h> - -+#include <xmlsec/parser.h> - /* #define XMLDSIGVERIFY_DEFAULT_TRUSTED_CERTS_FOLDER "/etc/httpd/conf/ssl.crt" */ - #define XMLDSIGVERIFY_DEFAULT_TRUSTED_CERTS_FOLDER "/var/www/cgi-bin/keys-certs.def" - #define XMLDSIGVERIFY_KEY_AND_CERTS_FOLDER "/var/www/cgi-bin/keys-certs" -@@ -36,7 +37,7 @@ int verify_request(xmlSecKeysMngrPtr mngr); - int url_decode(char *buf, size_t size); - - int --main(int , char **) { -+main() { - xmlSecKeysMngrPtr mngr; - #ifndef XMLSEC_NO_XSLT - xsltSecurityPrefsPtr xsltSecPrefs = NULL; --- -2.39.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest index a203c38f27..afd8c69853 100755 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest @@ -34,8 +34,8 @@ check_return verify-single-key echo "---------------------------------------------------" echo "Verifying a signature with keys manager..." -./verify2 sign1-res.xml rsapub.pem -./verify2 sign2-res.xml rsapub.pem +./verify2 sign1-res.xml rsakey.pem +./verify2 sign2-res.xml rsakey.pem check_return verify-keys-manager echo "---------------------------------------------------" diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.2.bb index a3da770943..ff5b6faeb4 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.2.bb @@ -13,17 +13,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=352791d62092ea8104f085042de7f4d0" SECTION = "libs" SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ - file://fix-ltmain.sh.patch \ - file://change-finding-path-of-nss.patch \ - file://makefile-ptest.patch \ - file://xmlsec1-examples-allow-build-in-separate-dir.patch \ - file://0001-nss-nspr-fix-for-multilib.patch \ - file://run-ptest \ - file://ensure-search-path-non-host.patch \ - file://0001-xmldsigverify-Include-xmlsec-parser.h.patch \ - " + file://fix-ltmain.sh.patch \ + file://change-finding-path-of-nss.patch \ + file://makefile-ptest.patch \ + file://xmlsec1-examples-allow-build-in-separate-dir.patch \ + file://0001-nss-nspr-fix-for-multilib.patch \ + file://run-ptest \ + file://ensure-search-path-non-host.patch \ + " -SRC_URI[sha256sum] = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c" +SRC_URI[sha256sum] = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf" inherit autotools-brokensep ptest pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.3.1.bb b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.3.2.bb index 2961e449f1..27ebd63949 100644 --- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.3.2.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=daf6e68539f564601a5a5869c31e5242" SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https;branch=main" -SRCREV = "b462b1587f7d3aa782689430e83e96c737748f33" +SRCREV = "bdd6d6fc150d53d89658bebbfa73a7bfd9a89cb4" S = "${WORKDIR}/git" DEPENDS = "zstd" |