diff options
62 files changed, 1156 insertions, 722 deletions
diff --git a/meta-multimedia/recipes-mkv/libebml/libebml/0001-allow-build-with-cmake-4.patch b/meta-multimedia/recipes-mkv/libebml/libebml/0001-allow-build-with-cmake-4.patch new file mode 100644 index 0000000000..f62d412ac4 --- /dev/null +++ b/meta-multimedia/recipes-mkv/libebml/libebml/0001-allow-build-with-cmake-4.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From b54451a2cc63672284c7768ecf5562214826ea50 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
3 | Date: Tue, 8 Jul 2025 17:15:08 +0300 | ||
4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
5 | compatibility | ||
6 | |||
7 | Fix: | ||
8 | |||
9 | | CMake Error at CMakeLists.txt:1 (cmake_minimum_required): | ||
10 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
11 | | | ||
12 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
13 | | to tell CMake that the project requires at least <min> but has been updated | ||
14 | | to work with policies introduced by <max> or earlier. | ||
15 | | | ||
16 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
17 | | | ||
18 | | | ||
19 | | -- Configuring incomplete, errors occurred! | ||
20 | |||
21 | Upstream-Status: Backport [https://github.com/Matroska-Org/libebml/commit/cc63f6b3ed2007a3ef04206a26f9ad5a657331bd] | ||
22 | |||
23 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
24 | --- | ||
25 | CMakeLists.txt | 2 +- | ||
26 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
29 | index b168a38..a8b789f 100644 | ||
30 | --- a/CMakeLists.txt | ||
31 | +++ b/CMakeLists.txt | ||
32 | @@ -1,4 +1,4 @@ | ||
33 | -cmake_minimum_required(VERSION 3.1.2) | ||
34 | +cmake_minimum_required(VERSION 3.5) | ||
35 | |||
36 | project(ebml VERSION 1.4.5) | ||
37 | |||
38 | -- | ||
39 | 2.43.0 | ||
40 | |||
diff --git a/meta-multimedia/recipes-mkv/libebml/libebml_1.4.5.bb b/meta-multimedia/recipes-mkv/libebml/libebml_1.4.5.bb index 4b439e2ca5..1bc56b788b 100644 --- a/meta-multimedia/recipes-mkv/libebml/libebml_1.4.5.bb +++ b/meta-multimedia/recipes-mkv/libebml/libebml_1.4.5.bb | |||
@@ -3,9 +3,10 @@ HOMEPAGE = "https://github.com/Matroska-Org/libebml" | |||
3 | LICENSE = "LGPL-2.1-only" | 3 | LICENSE = "LGPL-2.1-only" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c" |
5 | 5 | ||
6 | SRC_URI = "git://github.com/Matroska-Org/libebml.git;branch=v1.x;protocol=https" | 6 | SRC_URI = "git://github.com/Matroska-Org/libebml.git;branch=v1.x;protocol=https \ |
7 | SRCREV = "1878e784321673561039a6a37076b2736f4dc98f" | 7 | file://0001-allow-build-with-cmake-4.patch" |
8 | 8 | ||
9 | SRCREV = "1878e784321673561039a6a37076b2736f4dc98f" | ||
9 | 10 | ||
10 | inherit pkgconfig cmake dos2unix | 11 | inherit pkgconfig cmake dos2unix |
11 | 12 | ||
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.4.5.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.4.6.bb index e41cfd221c..34415c4444 100644 --- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.4.5.bb +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.4.6.bb | |||
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS = "dbus ncurses" | 13 | DEPENDS = "dbus ncurses" |
14 | 14 | ||
15 | SRCREV = "83ada1e086f8fa49bf9652df2edd9ccee5efa48b" | 15 | SRCREV = "83a155d0c09d703bdc95ed4558277784e9751bd3" |
16 | BRANCH = "${@oe.utils.trim_version('${PV}', 2)}" | 16 | BRANCH = "${@oe.utils.trim_version('${PV}', 2)}" |
17 | SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=${BRANCH};protocol=https" | 17 | SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=${BRANCH};protocol=https" |
18 | 18 | ||
diff --git a/meta-networking/recipes-connectivity/cannelloni/cannelloni/0001-include-bits-stdc-.h-only-when-using-libstdc.patch b/meta-networking/recipes-connectivity/cannelloni/cannelloni/0001-include-bits-stdc-.h-only-when-using-libstdc.patch deleted file mode 100644 index 71f447c94b..0000000000 --- a/meta-networking/recipes-connectivity/cannelloni/cannelloni/0001-include-bits-stdc-.h-only-when-using-libstdc.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 7aed36765ae44b41ede7e139da0a11b3696f2e06 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 13 Nov 2023 00:07:23 -0800 | ||
4 | Subject: [PATCH] include bits/stdc++.h only when using libstdc++ | ||
5 | |||
6 | We have other c++ runtime implementations e.g. llvm's libc++ which does | ||
7 | not provide this header bits/stdc++.h, therefore make sure that this | ||
8 | header is only included when using libstdc++ | ||
9 | |||
10 | Fixes | ||
11 | | /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/cannelloni/1.1.0/git/tcpthread.cpp:27:10: fatal error: 'bits/stdc++.h' file not found | ||
12 | | 27 | #include <bits/stdc++.h> | ||
13 | | | ^~~~~~~~~~~~~~~ | ||
14 | |||
15 | Upstream-Status: Submitted [https://github.com/mguentner/cannelloni/pull/56] | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | tcpthread.cpp | 2 ++ | ||
19 | 1 file changed, 2 insertions(+) | ||
20 | |||
21 | diff --git a/tcpthread.cpp b/tcpthread.cpp | ||
22 | index a1b3047..bb5a7b2 100644 | ||
23 | --- a/tcpthread.cpp | ||
24 | +++ b/tcpthread.cpp | ||
25 | @@ -24,7 +24,9 @@ | ||
26 | #include <cstdint> | ||
27 | #include <cstdio> | ||
28 | |||
29 | +#ifdef __GLIBCXX__ | ||
30 | #include <bits/stdc++.h> | ||
31 | +#endif | ||
32 | |||
33 | #include <linux/can.h> | ||
34 | #include <string.h> | ||
35 | -- | ||
36 | 2.42.1 | ||
37 | |||
diff --git a/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.1.0.bb b/meta-networking/recipes-connectivity/cannelloni/cannelloni_2.0.0.bb index 835f33055a..287c7685e4 100644 --- a/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.1.0.bb +++ b/meta-networking/recipes-connectivity/cannelloni/cannelloni_2.0.0.bb | |||
@@ -2,15 +2,12 @@ SUMMARY = "a SocketCAN over Ethernet tunnel" | |||
2 | HOMEPAGE = "https://github.com/mguentner/cannelloni" | 2 | HOMEPAGE = "https://github.com/mguentner/cannelloni" |
3 | LICENSE = "GPL-2.0-only" | 3 | LICENSE = "GPL-2.0-only" |
4 | 4 | ||
5 | SRC_URI = "git://github.com/mguentner/cannelloni.git;protocol=https;branch=master \ | 5 | SRC_URI = "git://github.com/mguentner/cannelloni.git;protocol=https;branch=master" |
6 | file://0001-include-bits-stdc-.h-only-when-using-libstdc.patch \ | 6 | SRCREV = "9f649ef21710999c6f674bc3d914ab2e88363bac" |
7 | " | ||
8 | SRCREV = "3d4fb8c8b07f6d7c62b2bdad7e5a94de61c9a29b" | ||
9 | 7 | ||
10 | LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 8 | LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
11 | 9 | ||
12 | inherit cmake | 10 | inherit cmake |
13 | 11 | ||
14 | |||
15 | PACKAGECONFIG ??= "lksctp-tools" | 12 | PACKAGECONFIG ??= "lksctp-tools" |
16 | PACKAGECONFIG[lksctp-tools] = "-DSCTP_SUPPORT=true, -DSCTP_SUPPORT=false, lksctp-tools" | 13 | PACKAGECONFIG[lksctp-tools] = "-DSCTP_SUPPORT=true, -DSCTP_SUPPORT=false, lksctp-tools" |
diff --git a/meta-networking/recipes-protocols/freediameter/files/0002-allow-build-with-cmake-4.patch b/meta-networking/recipes-protocols/freediameter/files/0002-allow-build-with-cmake-4.patch new file mode 100644 index 0000000000..89a215d975 --- /dev/null +++ b/meta-networking/recipes-protocols/freediameter/files/0002-allow-build-with-cmake-4.patch | |||
@@ -0,0 +1,81 @@ | |||
1 | From a96a8f8debb457fd5bdcd34f005670678870ec70 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
3 | Date: Tue, 8 Jul 2025 20:58:10 +0300 | ||
4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
5 | compatibility | ||
6 | |||
7 | Fix: | ||
8 | |||
9 | | CMake Error at CMakeLists.txt:24 (CMAKE_MINIMUM_REQUIRED): | ||
10 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
11 | | | ||
12 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
13 | | to tell CMake that the project requires at least <min> but has been updated | ||
14 | | to work with policies introduced by <max> or earlier. | ||
15 | | | ||
16 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
17 | | | ||
18 | | | ||
19 | | -- Configuring incomplete, errors occurred! | ||
20 | |||
21 | Upstream-Status: Backport [https://github.com/freeDiameter/freeDiameter/commit/45106adf3bf4192b274ef6c5536200a0e19c84f2] | ||
22 | |||
23 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
24 | --- | ||
25 | CMakeLists.txt | 6 +++--- | ||
26 | libfdcore/CMakeLists.txt | 2 +- | ||
27 | libfdproto/CMakeLists.txt | 2 +- | ||
28 | 3 files changed, 5 insertions(+), 5 deletions(-) | ||
29 | |||
30 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
31 | index 870e1ef..f1e6dc5 100644 | ||
32 | --- a/CMakeLists.txt | ||
33 | +++ b/CMakeLists.txt | ||
34 | @@ -1,5 +1,8 @@ | ||
35 | # This file is the source for generating the Makefile for the project, using cmake tool (cmake.org) | ||
36 | |||
37 | +# CMake version | ||
38 | +CMAKE_MINIMUM_REQUIRED(VERSION 3.10) | ||
39 | + | ||
40 | # Name of the project | ||
41 | PROJECT("freeDiameter") | ||
42 | |||
43 | @@ -20,9 +23,6 @@ SET(FD_PROJECT_VERSION_API 7) | ||
44 | # The test framework, using CTest and CDash. | ||
45 | INCLUDE(CTest) | ||
46 | |||
47 | -# CMake version | ||
48 | -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12) | ||
49 | - | ||
50 | # Location of additional CMake modules | ||
51 | SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") | ||
52 | |||
53 | diff --git a/libfdcore/CMakeLists.txt b/libfdcore/CMakeLists.txt | ||
54 | index b1bc0f1..4fefcb7 100644 | ||
55 | --- a/libfdcore/CMakeLists.txt | ||
56 | +++ b/libfdcore/CMakeLists.txt | ||
57 | @@ -2,7 +2,7 @@ | ||
58 | Project("freeDiameter core library" C) | ||
59 | |||
60 | # Configuration for newer cmake | ||
61 | -cmake_policy(VERSION 2.8.12) | ||
62 | +cmake_policy(VERSION 3.10) | ||
63 | |||
64 | # Configuration parser | ||
65 | BISON_FILE(fdd.y) | ||
66 | diff --git a/libfdproto/CMakeLists.txt b/libfdproto/CMakeLists.txt | ||
67 | index c7164fb..4cedf65 100644 | ||
68 | --- a/libfdproto/CMakeLists.txt | ||
69 | +++ b/libfdproto/CMakeLists.txt | ||
70 | @@ -2,7 +2,7 @@ | ||
71 | Project("libfdproto" C) | ||
72 | |||
73 | # Configuration for newer cmake | ||
74 | -cmake_policy(VERSION 2.8.12) | ||
75 | +cmake_policy(VERSION 3.10) | ||
76 | |||
77 | # List of source files for the library | ||
78 | SET(LFDPROTO_SRC | ||
79 | -- | ||
80 | 2.43.0 | ||
81 | |||
diff --git a/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb b/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb index 89b2572c04..31ac1fb9b7 100644 --- a/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb +++ b/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb | |||
@@ -25,9 +25,9 @@ SRC_URI = "git://github.com/freeDiameter/freeDiameter;protocol=https;branch=mast | |||
25 | file://0001-tests-use-EXTENSIONS_DIR.patch \ | 25 | file://0001-tests-use-EXTENSIONS_DIR.patch \ |
26 | file://0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch \ | 26 | file://0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch \ |
27 | file://0001-fixes-for-gcc-15.patch \ | 27 | file://0001-fixes-for-gcc-15.patch \ |
28 | file://0002-allow-build-with-cmake-4.patch \ | ||
28 | " | 29 | " |
29 | 30 | ||
30 | |||
31 | LICENSE = "BSD-3-Clause" | 31 | LICENSE = "BSD-3-Clause" |
32 | LIC_FILES_CHKSUM = "file://LICENSE;md5=868c059b6147748b1d621e500feeac4f" | 32 | LIC_FILES_CHKSUM = "file://LICENSE;md5=868c059b6147748b1d621e500feeac4f" |
33 | 33 | ||
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd-efi/0001-efi-generate_binary.py-Use-env-to-detect-python3.patch b/meta-oe/recipes-bsp/fwupd/fwupd-efi/0001-efi-generate_binary.py-Use-env-to-detect-python3.patch deleted file mode 100644 index c362681421..0000000000 --- a/meta-oe/recipes-bsp/fwupd/fwupd-efi/0001-efi-generate_binary.py-Use-env-to-detect-python3.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | From 4c8f95fedecbc590eb7cd98aaf97912fa36b8f2e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jun 2024 23:58:36 -0700 | ||
4 | Subject: [PATCH] efi/generate_binary.py: Use env to detect python3 | ||
5 | |||
6 | This enables python3 from native sysroot correctly | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | efi/generate_binary.py | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/efi/generate_binary.py b/efi/generate_binary.py | ||
15 | index 443472a..a4611bb 100755 | ||
16 | --- a/efi/generate_binary.py | ||
17 | +++ b/efi/generate_binary.py | ||
18 | @@ -1,4 +1,4 @@ | ||
19 | -#!/usr/bin/python3 | ||
20 | +#!/usr/bin/env python3 | ||
21 | # | ||
22 | # Copyright (C) 2021 Javier Martinez Canillas <javierm@redhat.com> | ||
23 | # Copyright (C) 2021 Richard Hughes <richard@hughsie.com> | ||
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.6.bb b/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.7.bb index bbf2b1fdac..d6ace116e7 100644 --- a/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.6.bb +++ b/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.7.bb | |||
@@ -2,10 +2,9 @@ SUMMARY = "EFI executable for fwupd" | |||
2 | LICENSE = "LGPL-2.1-or-later" | 2 | LICENSE = "LGPL-2.1-or-later" |
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" |
4 | 4 | ||
5 | SRC_URI = "git://github.com/fwupd/fwupd-efi;protocol=https;branch=main \ | 5 | SRC_URI = "git://github.com/fwupd/fwupd-efi;protocol=https;branch=main" |
6 | file://0001-efi-generate_binary.py-Use-env-to-detect-python3.patch" | ||
7 | 6 | ||
8 | SRCREV = "58a2928f778278ab1f7f8fcddbab81ba587a8962" | 7 | SRCREV = "cfd0be286a9b050c1aa4bfa3f0820256903a264a" |
9 | 8 | ||
10 | DEPENDS = "gnu-efi python3-pefile-native" | 9 | DEPENDS = "gnu-efi python3-pefile-native" |
11 | 10 | ||
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd/0001-build-certs.py-use-usr-bin-env-for-python3.patch b/meta-oe/recipes-bsp/fwupd/fwupd/0001-build-certs.py-use-usr-bin-env-for-python3.patch new file mode 100644 index 0000000000..3a4ecb1f29 --- /dev/null +++ b/meta-oe/recipes-bsp/fwupd/fwupd/0001-build-certs.py-use-usr-bin-env-for-python3.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 2c3896878ba8118b48c55528c6bac98f05f223f3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mikko Rapeli <mikko.rapeli@linaro.org> | ||
3 | Date: Thu, 3 Jul 2025 13:34:21 +0000 | ||
4 | Subject: [PATCH] build-certs.py: use /usr/bin/env for python3 | ||
5 | |||
6 | Avoids errors if python3 install path is not | ||
7 | in /usr/bin. | ||
8 | |||
9 | Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org> | ||
10 | --- | ||
11 | data/tests/build-certs.py | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | Upstream-Status: Submitted [https://github.com/fwupd/fwupd/pull/8998] | ||
15 | |||
16 | diff --git a/data/tests/build-certs.py b/data/tests/build-certs.py | ||
17 | index 3b8503b72bcf..222e8a4a0f8b 100755 | ||
18 | --- a/data/tests/build-certs.py | ||
19 | +++ b/data/tests/build-certs.py | ||
20 | @@ -1,4 +1,4 @@ | ||
21 | -#!/usr/bin/python3 | ||
22 | +#!/usr/bin/env python3 | ||
23 | # SPDX-License-Identifier: LGPL-2.1+ | ||
24 | |||
25 | import os | ||
26 | -- | ||
27 | 2.43.0 | ||
28 | |||
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd/0001-fu-lzma-common.c-reduce-lzma-compression-level-from-.patch b/meta-oe/recipes-bsp/fwupd/fwupd/0001-fu-lzma-common.c-reduce-lzma-compression-level-from-.patch new file mode 100644 index 0000000000..b0d3863eaa --- /dev/null +++ b/meta-oe/recipes-bsp/fwupd/fwupd/0001-fu-lzma-common.c-reduce-lzma-compression-level-from-.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From c96668ab830d016eeff977d5ca4f99d288cf38c0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mikko Rapeli <mikko.rapeli@linaro.org> | ||
3 | Date: Tue, 8 Jul 2025 07:05:02 +0000 | ||
4 | Subject: [PATCH] fu-lzma-common.c: reduce lzma compression level from 9 to | ||
5 | default 6 | ||
6 | |||
7 | xz manual page says default is 6 and levels higher than that can cause | ||
8 | huge CPU and memory usage. On yocto qemu target, the fwupd tests | ||
9 | fail to run with compression level 9: | ||
10 | |||
11 | FuSelfTest:ERROR:../sources/fwupd-2.0.12/libfwupdplugin/fu-self-test.c:6342:fu_lzma_func: assertion failed (error == NULL): failed to set up LZMA encoder rc=5 (FwupdError, 10) | ||
12 | not ok /fwupd/lzma - FuSelfTest:ERROR:../sources/fwupd-2.0.12/libfwupdplugin/fu-self-test.c:6342:fu_lzma_func: assertion failed (error == NULL): failed to set up LZMA encoder rc=5 (FwupdError, 10) | ||
13 | |||
14 | With default compression level 6 the tests pass. | ||
15 | |||
16 | https://linux.die.net/man/1/xz | ||
17 | |||
18 | -6 ... -9 | ||
19 | Excellent compression with medium to high memory usage. | ||
20 | These are also slower than the lower preset levels. | ||
21 | The default is -6. Unless you want to maximize the compression ratio, | ||
22 | you probably don't want a higher preset level than -7 due to | ||
23 | speed and memory usage. | ||
24 | |||
25 | Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org> | ||
26 | --- | ||
27 | libfwupdplugin/fu-lzma-common.c | 2 +- | ||
28 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
29 | |||
30 | Upstream-Status: Submitted [https://github.com/fwupd/fwupd/pull/9019] | ||
31 | |||
32 | diff --git a/libfwupdplugin/fu-lzma-common.c b/libfwupdplugin/fu-lzma-common.c | ||
33 | index a64ec773da91..d381ed52e135 100644 | ||
34 | --- a/libfwupdplugin/fu-lzma-common.c | ||
35 | +++ b/libfwupdplugin/fu-lzma-common.c | ||
36 | @@ -89,7 +89,7 @@ fu_lzma_compress_bytes(GBytes *blob, GError **error) | ||
37 | strm.next_in = g_bytes_get_data(blob, NULL); | ||
38 | strm.avail_in = g_bytes_get_size(blob); | ||
39 | |||
40 | - rc = lzma_easy_encoder(&strm, 9, LZMA_CHECK_CRC64); | ||
41 | + rc = lzma_easy_encoder(&strm, 6, LZMA_CHECK_CRC64); | ||
42 | if (rc != LZMA_OK) { | ||
43 | lzma_end(&strm); | ||
44 | g_set_error(error, | ||
45 | -- | ||
46 | 2.43.0 | ||
47 | |||
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_1.9.25.bb b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.25.bb deleted file mode 100644 index a098bf8eea..0000000000 --- a/meta-oe/recipes-bsp/fwupd/fwupd_1.9.25.bb +++ /dev/null | |||
@@ -1,134 +0,0 @@ | |||
1 | SUMMARY = "A simple daemon to allow session software to update firmware" | ||
2 | LICENSE = "LGPL-2.1-or-later" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | ||
4 | |||
5 | DEPENDS = "glib-2.0 libxmlb json-glib libjcat gcab vala-native python3-jinja2-native" | ||
6 | |||
7 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ | ||
8 | file://run-ptest" | ||
9 | SRC_URI[sha256sum] = "a1d484778ae87c69b38f417659b33fe3d689373ce0831d1f95617b8aa76e8c37" | ||
10 | |||
11 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" | ||
12 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
13 | |||
14 | # Machine-specific as we examine MACHINE_FEATURES to decide whether to build the UEFI plugins | ||
15 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
16 | |||
17 | inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages | ||
18 | |||
19 | GIDOCGEN_MESON_OPTION = 'docs' | ||
20 | GIDOCGEN_MESON_ENABLE_FLAG = 'enabled' | ||
21 | GIDOCGEN_MESON_DISABLE_FLAG = 'disabled' | ||
22 | GIR_MESON_ENABLE_FLAG = 'enabled' | ||
23 | GIR_MESON_DISABLE_FLAG = 'disabled' | ||
24 | |||
25 | PACKAGECONFIG ??= "curl gnutls gudev gusb \ | ||
26 | ${@bb.utils.filter('DISTRO_FEATURES', 'bluetooth polkit', d)} \ | ||
27 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd offline', '', d)} \ | ||
28 | ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'plugin_uefi_capsule plugin_uefi_pk', '', d)} \ | ||
29 | ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ | ||
30 | hsi \ | ||
31 | plugin_android_boot \ | ||
32 | plugin_acpi_phat \ | ||
33 | plugin_bcm57xx \ | ||
34 | plugin_emmc \ | ||
35 | plugin_ep963x \ | ||
36 | plugin_fastboot \ | ||
37 | plugin_flashrom \ | ||
38 | plugin_gpio \ | ||
39 | plugin_igsc \ | ||
40 | plugin_intel_me \ | ||
41 | plugin_intel_spi \ | ||
42 | plugin_logitech_bulkcontroller \ | ||
43 | plugin_logitech_scribe \ | ||
44 | plugin_modem_manager \ | ||
45 | plugin_msr \ | ||
46 | plugin_nitrokey \ | ||
47 | plugin_nvme \ | ||
48 | plugin_parade_lspcon \ | ||
49 | plugin_pixart_rf \ | ||
50 | plugin_realtek_mst \ | ||
51 | plugin_redfish \ | ||
52 | plugin_synaptics_mst \ | ||
53 | plugin_synaptics_rmi \ | ||
54 | plugin_scsi \ | ||
55 | plugin_uf2 \ | ||
56 | plugin_upower \ | ||
57 | sqlite" | ||
58 | |||
59 | PACKAGECONFIG[bluetooth] = "-Dbluez=enabled,-Dbluez=disabled" | ||
60 | PACKAGECONFIG[compat-cli] = "-Dcompat_cli=true,-Dcompat_cli=false" | ||
61 | PACKAGECONFIG[consolekit] = "-Dconsolekit=enabled,-Dconsolekit=disabled,consolekit" | ||
62 | PACKAGECONFIG[curl] = "-Dcurl=enabled,-Dcurl=disabled,curl" | ||
63 | PACKAGECONFIG[firmware-packager] = "-Dfirmware-packager=true,-Dfirmware-packager=false" | ||
64 | PACKAGECONFIG[fish-completion] = "-Dfish_completion=true,-Dfish_completion=false" | ||
65 | PACKAGECONFIG[gnutls] = "-Dgnutls=enabled,-Dgnutls=disabled,gnutls" | ||
66 | PACKAGECONFIG[gudev] = "-Dgudev=enabled,-Dgudev=disabled,libgudev" | ||
67 | PACKAGECONFIG[gusb] = "-Dgusb=enabled,-Dgusb=disabled,libgusb" | ||
68 | PACKAGECONFIG[hsi] = "-Dhsi=enabled,-Dhsi=disabled" | ||
69 | PACKAGECONFIG[libarchive] = "-Dlibarchive=enabled,-Dlibarchive=disabled,libarchive" | ||
70 | PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false" | ||
71 | PACKAGECONFIG[metainfo] = "-Dmetainfo=true,-Dmetainfo=false" | ||
72 | PACKAGECONFIG[offline] = "-Doffline=enabled,-Doffline=disabled" | ||
73 | PACKAGECONFIG[polkit] = "-Dpolkit=enabled,-Dpolkit=disabled,polkit" | ||
74 | PACKAGECONFIG[sqlite] = "-Dsqlite=enabled,-Dsqlite=disabled,sqlite3" | ||
75 | PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" | ||
76 | PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,gcab-native" | ||
77 | |||
78 | |||
79 | # TODO plugins-all meta-option that expands to all plugin_*? | ||
80 | PACKAGECONFIG[plugin_acpi_phat] = "-Dplugin_acpi_phat=enabled,-Dplugin_acpi_phat=disabled" | ||
81 | PACKAGECONFIG[plugin_android_boot] = "-Dplugin_android_boot=enabled,-Dplugin_android_boot=disabled" | ||
82 | PACKAGECONFIG[plugin_bcm57xx] = "-Dplugin_bcm57xx=enabled,-Dplugin_bcm57xx=disabled" | ||
83 | PACKAGECONFIG[plugin_cfu] = "-Dplugin_cfu=enabled,-Dplugin_cfu=disabled" | ||
84 | PACKAGECONFIG[plugin_emmc] = "-Dplugin_emmc=enabled,-Dplugin_emmc=disabled" | ||
85 | PACKAGECONFIG[plugin_ep963x] = "-Dplugin_ep963x=enabled,-Dplugin_ep963x=disabled" | ||
86 | PACKAGECONFIG[plugin_fastboot] = "-Dplugin_fastboot=enabled,-Dplugin_fastboot=disabled" | ||
87 | PACKAGECONFIG[plugin_flashrom] = "-Dplugin_flashrom=enabled,-Dplugin_flashrom=disabled,flashrom" | ||
88 | PACKAGECONFIG[plugin_gpio] = "-Dplugin_gpio=enabled,-Dplugin_gpio=disabled" | ||
89 | PACKAGECONFIG[plugin_igsc] = "-Dplugin_igsc=enabled,-Dplugin_igsc=disabled" | ||
90 | PACKAGECONFIG[plugin_intel_me] = "-Dplugin_intel_me=enabled,-Dplugin_intel_me=disabled" | ||
91 | PACKAGECONFIG[plugin_intel_spi] = "-Dplugin_intel_spi=true -Dlzma=enabled,-Dplugin_intel_spi=false -Dlzma=disabled,xz" | ||
92 | PACKAGECONFIG[plugin_logitech_bulkcontroller] = "-Dplugin_logitech_bulkcontroller=enabled,-Dplugin_logitech_bulkcontroller=disabled,protobuf-c-native protobuf-c" | ||
93 | PACKAGECONFIG[plugin_logitech_scribe] = "-Dplugin_logitech_scribe=enabled,-Dplugin_logitech_scribe=disabled" | ||
94 | PACKAGECONFIG[plugin_modem_manager] = "-Dplugin_modem_manager=enabled,-Dplugin_modem_manager=disabled,libqmi modemmanager" | ||
95 | PACKAGECONFIG[plugin_msr] = "-Dplugin_msr=enabled,-Dplugin_msr=disabled,cpuid" | ||
96 | PACKAGECONFIG[plugin_nitrokey] = "-Dplugin_nitrokey=enabled,-Dplugin_nitrokey=disabled" | ||
97 | PACKAGECONFIG[plugin_nvme] = "-Dplugin_nvme=enabled,-Dplugin_nvme=disabled" | ||
98 | PACKAGECONFIG[plugin_parade_lspcon] = "-Dplugin_parade_lspcon=enabled,-Dplugin_parade_lspcon=disabled" | ||
99 | PACKAGECONFIG[plugin_pixart_rf] = "-Dplugin_pixart_rf=enabled,-Dplugin_pixart_rf=disabled" | ||
100 | PACKAGECONFIG[plugin_powerd] = "-Dplugin_powerd=enabled,-Dplugin_powerd=disabled" | ||
101 | PACKAGECONFIG[plugin_realtek_mst] = "-Dplugin_realtek_mst=enabled,-Dplugin_realtek_mst=disabled" | ||
102 | PACKAGECONFIG[plugin_redfish] = "-Dplugin_redfish=enabled,-Dplugin_redfish=disabled" | ||
103 | PACKAGECONFIG[plugin_scsi] = "-Dplugin_scsi=enabled,-Dplugin_scsi=disabled" | ||
104 | PACKAGECONFIG[plugin_synaptics_mst] = "-Dplugin_synaptics_mst=enabled,-Dplugin_synaptics_mst=disabled" | ||
105 | PACKAGECONFIG[plugin_synaptics_rmi] = "-Dplugin_synaptics_rmi=enabled,-Dplugin_synaptics_rmi=disabled" | ||
106 | PACKAGECONFIG[plugin_tpm] = "-Dplugin_tpm=enabled,-Dplugin_tpm=disabled,tpm2-tss" | ||
107 | # Turn off the capsule splash as it needs G-I at buildtime, which isn't currently supported | ||
108 | PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=enabled -Dplugin_uefi_capsule_splash=false,-Dplugin_uefi_capsule=disabled,efivar fwupd-efi" | ||
109 | PACKAGECONFIG[plugin_uefi_pk] = "-Dplugin_uefi_pk=enabled,-Dplugin_uefi_pk=disabled" | ||
110 | PACKAGECONFIG[plugin_uf2] = "-Dplugin_uf2=enabled,-Dplugin_uf2=disabled" | ||
111 | PACKAGECONFIG[plugin_upower] = "-Dplugin_upower=enabled,-Dplugin_upower=disabled" | ||
112 | |||
113 | # Always disable these plugins on non-x86 platforms as they don't compile or are useless | ||
114 | DISABLE_NON_X86 = "plugin_intel_me plugin_intel_spi plugin_msr" | ||
115 | DISABLE_NON_X86:x86 = "" | ||
116 | DISABLE_NON_X86:x86-64 = "" | ||
117 | PACKAGECONFIG:remove = "${DISABLE_NON_X86}" | ||
118 | |||
119 | FILES:${PN} += "${libdir}/fwupd-plugins-* \ | ||
120 | ${libdir}/fwupd-${PV} \ | ||
121 | ${systemd_unitdir} \ | ||
122 | ${nonarch_libdir}/sysusers.d/fwupd.conf \ | ||
123 | ${datadir}/fish \ | ||
124 | ${datadir}/metainfo \ | ||
125 | ${datadir}/icons \ | ||
126 | ${datadir}/dbus-1 \ | ||
127 | ${datadir}/polkit-1 \ | ||
128 | ${nonarch_libdir}/modules-load.d" | ||
129 | |||
130 | FILES:${PN}-ptest += "${libexecdir}/installed-tests/ \ | ||
131 | ${datadir}/installed-tests/" | ||
132 | RDEPENDS:${PN}-ptest += "gnome-desktop-testing" | ||
133 | |||
134 | INSANE_SKIP:${PN}-ptest += "buildpaths" | ||
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_2.0.12.bb b/meta-oe/recipes-bsp/fwupd/fwupd_2.0.12.bb new file mode 100644 index 0000000000..cdba7cf66d --- /dev/null +++ b/meta-oe/recipes-bsp/fwupd/fwupd_2.0.12.bb | |||
@@ -0,0 +1,90 @@ | |||
1 | SUMMARY = "A simple daemon to allow session software to update firmware" | ||
2 | LICENSE = "LGPL-2.1-or-later" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | ||
4 | |||
5 | DEPENDS = "\ | ||
6 | curl \ | ||
7 | gcab \ | ||
8 | glib-2.0 \ | ||
9 | json-glib \ | ||
10 | libjcat \ | ||
11 | libusb \ | ||
12 | libxmlb \ | ||
13 | python3-jinja2-native \ | ||
14 | vala-native \ | ||
15 | " | ||
16 | |||
17 | SRC_URI = "\ | ||
18 | https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ | ||
19 | file://0001-build-certs.py-use-usr-bin-env-for-python3.patch \ | ||
20 | file://0001-fu-lzma-common.c-reduce-lzma-compression-level-from-.patch \ | ||
21 | file://run-ptest \ | ||
22 | " | ||
23 | SRC_URI[sha256sum] = "83eab17ef2e65249491aef5e99419827b43ac56d40c5b0747b59ee94b147215e" | ||
24 | |||
25 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" | ||
26 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
27 | |||
28 | # Machine-specific as we examine MACHINE_FEATURES to decide whether to build the UEFI plugins | ||
29 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
30 | |||
31 | inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages | ||
32 | |||
33 | GIDOCGEN_MESON_OPTION = 'docs' | ||
34 | GIDOCGEN_MESON_ENABLE_FLAG = 'enabled' | ||
35 | GIDOCGEN_MESON_DISABLE_FLAG = 'disabled' | ||
36 | GIR_MESON_ENABLE_FLAG = 'enabled' | ||
37 | GIR_MESON_DISABLE_FLAG = 'disabled' | ||
38 | |||
39 | PACKAGECONFIG ??= "\ | ||
40 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | ||
41 | ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ | ||
42 | ${@bb.utils.filter('DISTRO_FEATURES', 'bluetooth polkit', d)} \ | ||
43 | gnutls \ | ||
44 | hsi \ | ||
45 | plugin_flashrom \ | ||
46 | plugin_modem_manager \ | ||
47 | protobuf \ | ||
48 | " | ||
49 | |||
50 | PACKAGECONFIG[bluetooth] = "-Dbluez=enabled,-Dbluez=disabled" | ||
51 | PACKAGECONFIG[firmware-packager] = "-Dfirmware-packager=true,-Dfirmware-packager=false" | ||
52 | PACKAGECONFIG[fish-completion] = "-Dfish_completion=true,-Dfish_completion=false" | ||
53 | PACKAGECONFIG[gnutls] = "-Dgnutls=enabled,-Dgnutls=disabled,gnutls" | ||
54 | PACKAGECONFIG[hsi] = "-Dhsi=enabled,-Dhsi=disabled" | ||
55 | PACKAGECONFIG[libarchive] = "-Dlibarchive=enabled,-Dlibarchive=disabled,libarchive" | ||
56 | PACKAGECONFIG[libdrm] = "-Dlibdrm=enabled,-Dlibdrm=disabled,libdrm" | ||
57 | PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false" | ||
58 | PACKAGECONFIG[metainfo] = "-Dmetainfo=true,-Dmetainfo=false" | ||
59 | PACKAGECONFIG[polkit] = "-Dpolkit=enabled,-Dpolkit=disabled,polkit" | ||
60 | PACKAGECONFIG[readline] = "-Dreadline=enabled,-Dreadline=disabled,readline" | ||
61 | PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" | ||
62 | PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,gcab-native" | ||
63 | |||
64 | # TODO plugins-all meta-option that expands to all plugin_*? | ||
65 | PACKAGECONFIG[plugin_flashrom] = "-Dplugin_flashrom=enabled,-Dplugin_flashrom=disabled,flashrom" | ||
66 | PACKAGECONFIG[protobuf] = "-Dprotobuf=enabled,-Dprotobuf=disabled,protobuf-c-native protobuf-c" | ||
67 | PACKAGECONFIG[plugin_modem_manager] = "-Dplugin_modem_manager=enabled,-Dplugin_modem_manager=disabled,libqmi modemmanager" | ||
68 | PACKAGECONFIG[plugin_uefi_capsule_splash] = "-Dplugin_uefi_capsule_splash=true,-Dplugin_uefi_capsule_splash=false,python3-pygobject" | ||
69 | |||
70 | FILES:${PN} += "\ | ||
71 | ${libdir}/fwupd-plugins-* \ | ||
72 | ${libdir}/fwupd-${PV} \ | ||
73 | ${systemd_unitdir} \ | ||
74 | ${nonarch_libdir}/sysusers.d/fwupd.conf \ | ||
75 | ${datadir}/fish \ | ||
76 | ${datadir}/metainfo \ | ||
77 | ${datadir}/icons \ | ||
78 | ${datadir}/dbus-1 \ | ||
79 | ${datadir}/polkit-1 \ | ||
80 | ${nonarch_libdir}/modules-load.d \ | ||
81 | " | ||
82 | |||
83 | FILES:${PN}-ptest += "${libexecdir}/installed-tests/ \ | ||
84 | ${datadir}/installed-tests/" | ||
85 | RDEPENDS:${PN}-ptest += "gnome-desktop-testing python3" | ||
86 | |||
87 | # ESP mounting, not strictly necessary | ||
88 | RRECOMMENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'udisks2', '', d)}" | ||
89 | |||
90 | INSANE_SKIP:${PN}-ptest += "buildpaths" | ||
diff --git a/meta-oe/recipes-connectivity/gammu/gammu/0001-allow-build-with-cmake-4.patch b/meta-oe/recipes-connectivity/gammu/gammu/0001-allow-build-with-cmake-4.patch new file mode 100644 index 0000000000..5ab63b809f --- /dev/null +++ b/meta-oe/recipes-connectivity/gammu/gammu/0001-allow-build-with-cmake-4.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From ea068ac152b9b375be51611ca04d0f833e2f6856 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
3 | Date: Tue, 8 Jul 2025 22:52:11 +0300 | ||
4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
5 | compatibility | ||
6 | |||
7 | Fix: | ||
8 | |||
9 | | CMake Error at CMakeLists.txt:5 (cmake_minimum_required): | ||
10 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
11 | | | ||
12 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
13 | | to tell CMake that the project requires at least <min> but has been updated | ||
14 | | to work with policies introduced by <max> or earlier. | ||
15 | | | ||
16 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
17 | | | ||
18 | | | ||
19 | | -- Configuring incomplete, errors occurred! | ||
20 | |||
21 | Upstream-Status: Pending | ||
22 | |||
23 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
24 | --- | ||
25 | CMakeLists.txt | 2 +- | ||
26 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
29 | index d0a79b3..23dba35 100644 | ||
30 | --- a/CMakeLists.txt | ||
31 | +++ b/CMakeLists.txt | ||
32 | @@ -2,7 +2,7 @@ | ||
33 | # Copyright (c) 2007 - 2018 Michal Cihar | ||
34 | # vim: expandtab sw=4 ts=4 sts=4: | ||
35 | |||
36 | -cmake_minimum_required (VERSION 3.0) | ||
37 | +cmake_minimum_required (VERSION 3.5) | ||
38 | INCLUDE (CMakeForceCompiler) | ||
39 | |||
40 | project (Gammu C) | ||
41 | -- | ||
42 | 2.43.0 | ||
43 | |||
diff --git a/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb b/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb index e6ec9c3573..353ee37f46 100644 --- a/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb +++ b/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb | |||
@@ -7,6 +7,7 @@ HOMEPAGE = "https://wammu.eu/" | |||
7 | SRC_URI = "https://dl.cihar.com/${BPN}/releases/${BP}.tar.xz \ | 7 | SRC_URI = "https://dl.cihar.com/${BPN}/releases/${BP}.tar.xz \ |
8 | file://gammurc \ | 8 | file://gammurc \ |
9 | file://gammu-smsdrc \ | 9 | file://gammu-smsdrc \ |
10 | file://0001-allow-build-with-cmake-4.patch \ | ||
10 | " | 11 | " |
11 | 12 | ||
12 | SRC_URI[sha256sum] = "d8f152314d7e4d3d643610d742845e0a016ce97c234ad4b1151574e1b09651ee" | 13 | SRC_URI[sha256sum] = "d8f152314d7e4d3d643610d742845e0a016ce97c234ad4b1151574e1b09651ee" |
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_3.8.bb b/meta-oe/recipes-connectivity/iwd/iwd_3.9.bb index 80e36054bd..3a4cf33e4d 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd_3.8.bb +++ b/meta-oe/recipes-connectivity/iwd/iwd_3.9.bb | |||
@@ -9,7 +9,7 @@ SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ | |||
9 | file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ | 9 | file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ |
10 | file://iwd \ | 10 | file://iwd \ |
11 | " | 11 | " |
12 | SRC_URI[sha256sum] = "c556a5a5376270af68940e04e26765026fbbbe4941668317c274c91042611cdf" | 12 | SRC_URI[sha256sum] = "0cd7dc9b32b9d6809a4a5e5d063b5c5fd279f5ad3a0bf03d7799da66df5cad45" |
13 | 13 | ||
14 | inherit autotools manpages pkgconfig python3native systemd update-rc.d | 14 | inherit autotools manpages pkgconfig python3native systemd update-rc.d |
15 | 15 | ||
diff --git a/meta-oe/recipes-devtools/cjson/cjson/0001-allow-build-with-cmake-4.patch b/meta-oe/recipes-devtools/cjson/cjson/0001-allow-build-with-cmake-4.patch new file mode 100644 index 0000000000..7bd608ca0a --- /dev/null +++ b/meta-oe/recipes-devtools/cjson/cjson/0001-allow-build-with-cmake-4.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 8622490d650ba4d107561a0e8f3cf881fa0247c7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
3 | Date: Tue, 8 Jul 2025 15:09:11 +0300 | ||
4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
5 | compatibility | ||
6 | |||
7 | Fix: | ||
8 | |||
9 | | CMake Error at CMakeLists.txt:2 (cmake_minimum_required): | ||
10 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
11 | | | ||
12 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
13 | | to tell CMake that the project requires at least <min> but has been updated | ||
14 | | to work with policies introduced by <max> or earlier. | ||
15 | | | ||
16 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
17 | | | ||
18 | | | ||
19 | | -- Configuring incomplete, errors occurred! | ||
20 | |||
21 | Upstream-Status: Submitted [https://github.com/DaveGamble/cJSON/pull/935] | ||
22 | |||
23 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
24 | --- | ||
25 | CMakeLists.txt | 2 +- | ||
26 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
29 | index 36a6cb5..9428da5 100644 | ||
30 | --- a/CMakeLists.txt | ||
31 | +++ b/CMakeLists.txt | ||
32 | @@ -1,5 +1,5 @@ | ||
33 | set(CMAKE_LEGACY_CYGWIN_WIN32 0) | ||
34 | -cmake_minimum_required(VERSION 3.0) | ||
35 | +cmake_minimum_required(VERSION 3.5) | ||
36 | |||
37 | project(cJSON | ||
38 | VERSION 1.7.18 | ||
39 | -- | ||
40 | 2.43.0 | ||
41 | |||
diff --git a/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb b/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb index 33c8c28531..7ece0065ba 100644 --- a/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb +++ b/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb | |||
@@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0" | |||
6 | 6 | ||
7 | SRC_URI = "git://github.com/DaveGamble/cJSON.git;branch=master;protocol=https \ | 7 | SRC_URI = "git://github.com/DaveGamble/cJSON.git;branch=master;protocol=https \ |
8 | file://run-ptest \ | 8 | file://run-ptest \ |
9 | file://0001-allow-build-with-cmake-4.patch \ | ||
9 | " | 10 | " |
10 | SRCREV = "acc76239bee01d8e9c858ae2cab296704e52d916" | 11 | SRCREV = "acc76239bee01d8e9c858ae2cab296704e52d916" |
11 | 12 | ||
12 | |||
13 | inherit cmake pkgconfig ptest | 13 | inherit cmake pkgconfig ptest |
14 | 14 | ||
15 | RDEPENDS:${PN}-ptest += "cmake" | 15 | RDEPENDS:${PN}-ptest += "cmake" |
diff --git a/meta-oe/recipes-devtools/cpp-argparse/cpp-argparse_3.2.bb b/meta-oe/recipes-devtools/cpp-argparse/cpp-argparse_3.2.bb new file mode 100644 index 0000000000..cb7ae45d38 --- /dev/null +++ b/meta-oe/recipes-devtools/cpp-argparse/cpp-argparse_3.2.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | SUMMARY = "Argument Parser for Modern C++" | ||
2 | HOMEPAGE = "https://github.com/p-ranav/argparse" | ||
3 | BUGTRACKER = "https://github.com/p-ranav/argparse/issues" | ||
4 | LICENSE = "MIT" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4f3ed9ec2c801700ac8fda1fcd29a330" | ||
6 | |||
7 | SRCREV = "3eda91b2e1ce7d569f84ba295507c4cd8fd96910" | ||
8 | SRC_URI = "git://github.com/p-ranav/argparse.git;branch=master;protocol=https;tag=v${PV}" | ||
9 | |||
10 | inherit cmake | ||
11 | EXTRA_OECMAKE = "-DARGPARSE_BUILD_TESTS=OFF" | ||
12 | |||
13 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0001-Set-Json_validator-Install-off-if-it-finds-it-via-li.patch b/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0001-Set-Json_validator-Install-off-if-it-finds-it-via-li.patch deleted file mode 100644 index 6e6a4b93e8..0000000000 --- a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0001-Set-Json_validator-Install-off-if-it-finds-it-via-li.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 35939115142db6cd366ab11b29692a0179338ddf Mon Sep 17 00:00:00 2001 | ||
2 | From: Parian Golchin <Parian.Golchin@iris-sensing.com> | ||
3 | Date: Fri, 18 Aug 2023 15:54:25 +0200 | ||
4 | Subject: [PATCH 1/3] Set Json_validator Install off if it finds it via linking | ||
5 | |||
6 | Upstream-Status: Inappropriate [newer version of cmake in main branch] | ||
7 | |||
8 | Signed-off-by: Parian Golchin <Parian.Golchin@iris-sensing.com> | ||
9 | --- | ||
10 | CMakeLists.txt | 3 +++ | ||
11 | 1 file changed, 3 insertions(+) | ||
12 | |||
13 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
14 | index f636734..9e4587f 100644 | ||
15 | --- a/CMakeLists.txt | ||
16 | +++ b/CMakeLists.txt | ||
17 | @@ -55,6 +55,9 @@ option(JSON_VALIDATOR_BUILD_EXAMPLES "Build examples" ${JSON_VALIDATOR_IS_TOP_LE | ||
18 | |||
19 | if(NOT TARGET nlohmann_json::nlohmann_json) | ||
20 | find_package(nlohmann_json REQUIRED) | ||
21 | +else() | ||
22 | + message(STATUS "Found nlohmann_json::nlohmann_json-target - linking with it") | ||
23 | + set(JSON_VALIDATOR_INSTALL OFF) | ||
24 | endif() | ||
25 | |||
26 | target_link_libraries( | ||
27 | -- | ||
28 | 2.25.1 | ||
29 | |||
diff --git a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0002-Fix-assumed-signed-char.patch b/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0002-Fix-assumed-signed-char.patch deleted file mode 100644 index 1c4b871bb6..0000000000 --- a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0002-Fix-assumed-signed-char.patch +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
1 | From 2065015da40cf79dd8ec9e3f186538e17c3b592f Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Joslyn <robert.joslyn@redrectangle.org> | ||
3 | Date: Wed, 30 Nov 2022 13:07:29 -0800 | ||
4 | Subject: [PATCH 2/3] Fix assumed signed char | ||
5 | |||
6 | The code assumes that char is signed, but whether char is signed or | ||
7 | unsigned is implementation defined. On some architectures like PowerPC, | ||
8 | GCC treats char as unsigned resulting in compile errors: | ||
9 | |||
10 | smtp-address-validator.cpp:213:1: error: narrowing conversion of '-32' from 'int' to 'char' [-Wnarrowing] | ||
11 | |||
12 | Fix this by specifying signed char. | ||
13 | |||
14 | Upstream-Status: Backport [https://github.com/pboettch/json-schema-validator/commit/491ac44026e08f31790f5cacffa62e168bb35e32] | ||
15 | |||
16 | Signed-off-by: Parian Golchin <Parian.Golchin@iris-sensing.com> | ||
17 | --- | ||
18 | src/smtp-address-validator.cpp | 16 ++++++++-------- | ||
19 | 1 file changed, 8 insertions(+), 8 deletions(-) | ||
20 | |||
21 | diff --git a/src/smtp-address-validator.cpp b/src/smtp-address-validator.cpp | ||
22 | index a63ead0..3903b51 100644 | ||
23 | --- a/src/smtp-address-validator.cpp | ||
24 | +++ b/src/smtp-address-validator.cpp | ||
25 | @@ -63,7 +63,7 @@ static const short _address_key_offsets[] = { | ||
26 | 1363, 1365, 1367, 1368, 1370, 1388, 0 | ||
27 | }; | ||
28 | |||
29 | -static const char _address_trans_keys[] = { | ||
30 | +static const signed char _address_trans_keys[] = { | ||
31 | -32, -19, -16, -12, 34, 45, 61, 63, | ||
32 | -62, -33, -31, -17, -15, -13, 33, 39, | ||
33 | 42, 43, 47, 57, 65, 90, 94, 126, | ||
34 | @@ -711,7 +711,7 @@ bool is_address(const char* p, const char* pe) | ||
35 | { | ||
36 | int _klen; | ||
37 | unsigned int _trans = 0; | ||
38 | - const char * _keys; | ||
39 | + const signed char * _keys; | ||
40 | const signed char * _acts; | ||
41 | unsigned int _nacts; | ||
42 | _resume: {} | ||
43 | @@ -728,9 +728,9 @@ bool is_address(const char* p, const char* pe) | ||
44 | |||
45 | _klen = (int)_address_single_lengths[cs]; | ||
46 | if ( _klen > 0 ) { | ||
47 | - const char *_lower = _keys; | ||
48 | - const char *_upper = _keys + _klen - 1; | ||
49 | - const char *_mid; | ||
50 | + const signed char *_lower = _keys; | ||
51 | + const signed char *_upper = _keys + _klen - 1; | ||
52 | + const signed char *_mid; | ||
53 | while ( 1 ) { | ||
54 | if ( _upper < _lower ) { | ||
55 | _keys += _klen; | ||
56 | @@ -752,9 +752,9 @@ bool is_address(const char* p, const char* pe) | ||
57 | |||
58 | _klen = (int)_address_range_lengths[cs]; | ||
59 | if ( _klen > 0 ) { | ||
60 | - const char *_lower = _keys; | ||
61 | - const char *_upper = _keys + (_klen<<1) - 2; | ||
62 | - const char *_mid; | ||
63 | + const signed char *_lower = _keys; | ||
64 | + const signed char *_upper = _keys + (_klen<<1) - 2; | ||
65 | + const signed char *_mid; | ||
66 | while ( 1 ) { | ||
67 | if ( _upper < _lower ) { | ||
68 | _trans += (unsigned int)_klen; | ||
69 | -- | ||
70 | 2.25.1 | ||
71 | |||
diff --git a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0003-For-root-value-use-empty-pointer.patch b/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0003-For-root-value-use-empty-pointer.patch deleted file mode 100644 index eac997ae58..0000000000 --- a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0003-For-root-value-use-empty-pointer.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From fa49c29942763285c51b7d2dea417d9f51e4961f Mon Sep 17 00:00:00 2001 | ||
2 | From: Sven Fink <sven.fink@wipotec.com> | ||
3 | Date: Fri, 13 Jan 2023 09:15:42 +0100 | ||
4 | Subject: [PATCH 3/3] For root value, use empty pointer | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/pboettch/json-schema-validator/commit/59c9d6200bf3cd54b4fc717ec1660c91eddb4d1a] | ||
7 | |||
8 | Signed-off-by: Parian Golchin <Parian.Golchin@iris-sensing.com> | ||
9 | --- | ||
10 | src/json-validator.cpp | 8 ++++++++ | ||
11 | 1 file changed, 8 insertions(+) | ||
12 | |||
13 | diff --git a/src/json-validator.cpp b/src/json-validator.cpp | ||
14 | index 7f34553..3c73d98 100644 | ||
15 | --- a/src/json-validator.cpp | ||
16 | +++ b/src/json-validator.cpp | ||
17 | @@ -553,6 +553,9 @@ class type_schema : public schema | ||
18 | else_->validate(ptr, instance, patch, e); | ||
19 | } | ||
20 | } | ||
21 | + if (instance.is_null()) { | ||
22 | + patch.add(nlohmann::json::json_pointer{}, default_value_); | ||
23 | + } | ||
24 | } | ||
25 | |||
26 | protected: | ||
27 | @@ -1134,6 +1137,11 @@ public: | ||
28 | propertyNames_ = schema::make(attr.value(), root, {"propertyNames"}, uris); | ||
29 | sch.erase(attr); | ||
30 | } | ||
31 | + | ||
32 | + attr = sch.find("default"); | ||
33 | + if (attr != sch.end()) { | ||
34 | + set_default_value(*attr); | ||
35 | + } | ||
36 | } | ||
37 | }; | ||
38 | |||
39 | -- | ||
40 | 2.25.1 | ||
41 | |||
diff --git a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0004-cmake-Use-GNUInstallDirs.patch b/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0004-cmake-Use-GNUInstallDirs.patch deleted file mode 100644 index 8199e4f8d4..0000000000 --- a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0004-cmake-Use-GNUInstallDirs.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From a42d374aa260caec5f683c75d0db322811e51ab9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 19 Mar 2022 22:40:49 -0700 | ||
4 | Subject: [PATCH] cmake: Use GNUInstallDirs | ||
5 | |||
6 | This helps it make it platform independent, some platforms e.g. | ||
7 | ppc64/linux use /usr/lib64 for system libraries | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/pboettch/json-schema-validator/pull/197] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | CMakeLists.txt | 8 +++++--- | ||
13 | 1 file changed, 5 insertions(+), 3 deletions(-) | ||
14 | |||
15 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
16 | index 9e4587f..3eff234 100644 | ||
17 | --- a/CMakeLists.txt | ||
18 | +++ b/CMakeLists.txt | ||
19 | @@ -93,11 +93,13 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") | ||
20 | endif() | ||
21 | endif() | ||
22 | |||
23 | +include(GNUInstallDirs) | ||
24 | + | ||
25 | if(JSON_VALIDATOR_INSTALL) | ||
26 | install(TARGETS nlohmann_json_schema_validator | ||
27 | EXPORT ${PROJECT_NAME}Targets | ||
28 | - LIBRARY DESTINATION lib | ||
29 | - ARCHIVE DESTINATION lib | ||
30 | + LIBRARY DESTINATION ${LIBDIR} | ||
31 | + ARCHIVE DESTINATION ${LIBDIR} | ||
32 | RUNTIME DESTINATION bin) | ||
33 | |||
34 | install(FILES src/nlohmann/json-schema.hpp | ||
35 | @@ -129,7 +131,7 @@ endif() | ||
36 | |||
37 | if(JSON_VALIDATOR_INSTALL) | ||
38 | # Set the install path to the cmake config files (Relative, so install works correctly under Hunter as well) | ||
39 | - set(INSTALL_CMAKE_DIR "lib/cmake/${PROJECT_NAME}") | ||
40 | + set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) | ||
41 | set(INSTALL_CMAKEDIR_ROOT share/cmake) | ||
42 | |||
43 | # Install Targets | ||
diff --git a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.2.0.bb b/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.3.0.bb index c6e910a137..4561f1b285 100644 --- a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.2.0.bb +++ b/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.3.0.bb | |||
@@ -2,19 +2,13 @@ SUMMARY = "JSON schema validator for JSON for Modern C++" | |||
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c441d022da1b1663c70181a32225d006" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c441d022da1b1663c70181a32225d006" |
4 | 4 | ||
5 | SRC_URI = "git://github.com/pboettch/json-schema-validator;branch=main;protocol=https \ | 5 | SRC_URI = "git://github.com/pboettch/json-schema-validator;branch=main;protocol=https" |
6 | file://0001-Set-Json_validator-Install-off-if-it-finds-it-via-li.patch \ | 6 | SRCREV = "349cba9f7e3cb423bbc1811bdd9f6770f520b468" |
7 | file://0002-Fix-assumed-signed-char.patch \ | ||
8 | file://0003-For-root-value-use-empty-pointer.patch \ | ||
9 | file://0004-cmake-Use-GNUInstallDirs.patch \ | ||
10 | " | ||
11 | |||
12 | SRCREV = "6b17782d6a5d1dee5d2c4fc5d25ffb1123913431" | ||
13 | |||
14 | 7 | ||
15 | DEPENDS += "nlohmann-json" | 8 | DEPENDS += "nlohmann-json" |
16 | 9 | ||
17 | inherit cmake | 10 | inherit cmake |
11 | |||
18 | EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON -DJSON_VALIDATOR_BUILD_TESTS=OFF -DJSON_VALIDATOR_BUILD_EXAMPLES=OFF" | 12 | EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON -DJSON_VALIDATOR_BUILD_TESTS=OFF -DJSON_VALIDATOR_BUILD_EXAMPLES=OFF" |
19 | 13 | ||
20 | BBCLASSEXTEND = "native nativesdk" | 14 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl/0001-Fix-initialization-in-test-1140.patch b/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl/0001-Fix-initialization-in-test-1140.patch deleted file mode 100644 index 84a585d3c5..0000000000 --- a/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl/0001-Fix-initialization-in-test-1140.patch +++ /dev/null | |||
@@ -1,113 +0,0 @@ | |||
1 | From 1b4d42ca2e97061042ec44a0b34ceb176c78c7e1 Mon Sep 17 00:00:00 2001 | ||
2 | From: d-winsor <danwin@microsoft.com> | ||
3 | Date: Mon, 26 Feb 2024 13:17:12 -0800 | ||
4 | Subject: [PATCH] Fix initialization in test (#1140) | ||
5 | |||
6 | * Suppress unsafe-buffer-usage | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/microsoft/GSL/commit/1b4d42ca2e97061042ec44a0b34ceb176c78c7e1] | ||
9 | |||
10 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
11 | --- | ||
12 | include/gsl/span | 10 ++++++++++ | ||
13 | include/gsl/util | 10 ++++++++++ | ||
14 | tests/CMakeLists.txt | 10 ++++++++++ | ||
15 | tests/span_tests.cpp | 2 +- | ||
16 | 4 files changed, 31 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/include/gsl/span b/include/gsl/span | ||
19 | index cc8a7b9..d254e4d 100644 | ||
20 | --- a/include/gsl/span | ||
21 | +++ b/include/gsl/span | ||
22 | @@ -58,6 +58,12 @@ | ||
23 | #pragma GCC diagnostic ignored "-Wsign-conversion" | ||
24 | #endif | ||
25 | |||
26 | +// Turn off clang unsafe buffer warnings as all accessed are guarded by runtime checks | ||
27 | +#if defined(__clang__) && __has_warning("-Wunsafe-buffer-usage") | ||
28 | +#pragma clang diagnostic push | ||
29 | +#pragma clang diagnostic ignored "-Wunsafe-buffer-usage" | ||
30 | +#endif // defined(__clang__) && __has_warning("-Wunsafe-buffer-usage") | ||
31 | + | ||
32 | namespace gsl | ||
33 | { | ||
34 | |||
35 | @@ -818,4 +824,8 @@ as_writable_bytes(span<ElementType, Extent> s) noexcept | ||
36 | #pragma GCC diagnostic pop | ||
37 | #endif // __GNUC__ > 6 | ||
38 | |||
39 | +#if defined(__clang__) && __has_warning("-Wunsafe-buffer-usage") | ||
40 | +#pragma clang diagnostic pop | ||
41 | +#endif | ||
42 | + | ||
43 | #endif // GSL_SPAN_H | ||
44 | diff --git a/include/gsl/util b/include/gsl/util | ||
45 | index a215bad..11735a8 100644 | ||
46 | --- a/include/gsl/util | ||
47 | +++ b/include/gsl/util | ||
48 | @@ -39,6 +39,12 @@ | ||
49 | |||
50 | #endif // _MSC_VER | ||
51 | |||
52 | +// Turn off clang unsafe buffer warnings as all accessed are guarded by runtime checks | ||
53 | +#if defined(__clang__) && __has_warning("-Wunsafe-buffer-usage") | ||
54 | +#pragma clang diagnostic push | ||
55 | +#pragma clang diagnostic ignored "-Wunsafe-buffer-usage" | ||
56 | +#endif // defined(__clang__) && __has_warning("-Wunsafe-buffer-usage") | ||
57 | + | ||
58 | #if defined(__cplusplus) && (__cplusplus >= 201703L) | ||
59 | #define GSL_NODISCARD [[nodiscard]] | ||
60 | #else | ||
61 | @@ -157,4 +163,8 @@ constexpr auto at(std::span<T, extent> sp, const index i) -> decltype(sp[sp.size | ||
62 | |||
63 | #endif // _MSC_VER | ||
64 | |||
65 | +#if defined(__clang__) && __has_warning("-Wunsafe-buffer-usage") | ||
66 | +#pragma clang diagnostic pop | ||
67 | +#endif | ||
68 | + | ||
69 | #endif // GSL_UTIL_H | ||
70 | diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt | ||
71 | index cab4e56..20de9e1 100644 | ||
72 | --- a/tests/CMakeLists.txt | ||
73 | +++ b/tests/CMakeLists.txt | ||
74 | @@ -167,6 +167,11 @@ else() | ||
75 | > | ||
76 | ) | ||
77 | endif(MSVC) | ||
78 | +check_cxx_compiler_flag("-Wno-unsafe-buffer-usage" WARN_UNSAFE_BUFFER) | ||
79 | +if (WARN_UNSAFE_BUFFER) | ||
80 | + # This test uses very greedy heuristics such as "no pointer arithmetic on raw buffer" | ||
81 | + target_compile_options(gsl_tests_config INTERFACE "-Wno-unsafe-buffer-usage") | ||
82 | +endif() | ||
83 | |||
84 | # for tests to find the gtest header | ||
85 | target_include_directories(gsl_tests_config SYSTEM INTERFACE | ||
86 | @@ -267,6 +272,11 @@ else() | ||
87 | > | ||
88 | ) | ||
89 | endif(MSVC) | ||
90 | +check_cxx_compiler_flag("-Wno-unsafe-buffer-usage" WARN_UNSAFE_BUFFER) | ||
91 | +if (WARN_UNSAFE_BUFFER) | ||
92 | + # This test uses very greedy heuristics such as "no pointer arithmetic on raw buffer" | ||
93 | + target_compile_options(gsl_tests_config_noexcept INTERFACE "-Wno-unsafe-buffer-usage") | ||
94 | +endif() | ||
95 | |||
96 | add_executable(gsl_noexcept_tests no_exception_ensure_tests.cpp) | ||
97 | target_link_libraries(gsl_noexcept_tests | ||
98 | diff --git a/tests/span_tests.cpp b/tests/span_tests.cpp | ||
99 | index 33ccf56..3c1dfe5 100644 | ||
100 | --- a/tests/span_tests.cpp | ||
101 | +++ b/tests/span_tests.cpp | ||
102 | @@ -330,7 +330,7 @@ TEST(span_test, from_array_constructor) | ||
103 | EXPECT_TRUE(s.data() == std::addressof(arr2d[0])); | ||
104 | } | ||
105 | |||
106 | - int arr3d[2][3][2] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}; | ||
107 | + int arr3d[2][3][2] = { { {1, 2}, {3, 4}, {5, 6} }, { {7, 8}, {9, 10}, {11, 12} } }; | ||
108 | |||
109 | #ifdef CONFIRM_COMPILATION_ERRORS | ||
110 | { | ||
111 | -- | ||
112 | 2.30.2 | ||
113 | |||
diff --git a/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl/0002-Fix-gcc-build-problem.patch b/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl/0002-Fix-gcc-build-problem.patch deleted file mode 100644 index 2f7542c62c..0000000000 --- a/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl/0002-Fix-gcc-build-problem.patch +++ /dev/null | |||
@@ -1,82 +0,0 @@ | |||
1 | From aa4fd1f57794964640005900c2b47af1a0940b7b Mon Sep 17 00:00:00 2001 | ||
2 | From: Werner Henze <w.henze@avm.de> | ||
3 | Date: Fri, 1 Mar 2024 15:53:50 +0100 | ||
4 | Subject: [PATCH] Fix gcc build problem | ||
5 | |||
6 | Closes issue #1148 by fixing problems introduced in PR #1140. | ||
7 | |||
8 | Upstream-Status: Submitted [https://github.com/microsoft/GSL/pull/1149] | ||
9 | |||
10 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
11 | --- | ||
12 | include/gsl/span | 12 ++++++++---- | ||
13 | include/gsl/util | 12 ++++++++---- | ||
14 | 2 files changed, 16 insertions(+), 8 deletions(-) | ||
15 | |||
16 | diff --git a/include/gsl/span b/include/gsl/span | ||
17 | index 0de2932..d2ef9f7 100644 | ||
18 | --- a/include/gsl/span | ||
19 | +++ b/include/gsl/span | ||
20 | @@ -59,10 +59,12 @@ | ||
21 | #endif | ||
22 | |||
23 | // Turn off clang unsafe buffer warnings as all accessed are guarded by runtime checks | ||
24 | -#if defined(__clang__) && __has_warning("-Wunsafe-buffer-usage") | ||
25 | +#if defined(__clang__) | ||
26 | +#if __has_warning("-Wunsafe-buffer-usage") | ||
27 | #pragma clang diagnostic push | ||
28 | #pragma clang diagnostic ignored "-Wunsafe-buffer-usage" | ||
29 | -#endif // defined(__clang__) && __has_warning("-Wunsafe-buffer-usage") | ||
30 | +#endif // __has_warning("-Wunsafe-buffer-usage") | ||
31 | +#endif // defined(__clang__) | ||
32 | |||
33 | namespace gsl | ||
34 | { | ||
35 | @@ -824,8 +826,10 @@ as_writable_bytes(span<ElementType, Extent> s) noexcept | ||
36 | #pragma GCC diagnostic pop | ||
37 | #endif // __GNUC__ > 6 | ||
38 | |||
39 | -#if defined(__clang__) && __has_warning("-Wunsafe-buffer-usage") | ||
40 | +#if defined(__clang__) | ||
41 | +#if __has_warning("-Wunsafe-buffer-usage") | ||
42 | #pragma clang diagnostic pop | ||
43 | -#endif | ||
44 | +#endif // __has_warning("-Wunsafe-buffer-usage") | ||
45 | +#endif // defined(__clang__) | ||
46 | |||
47 | #endif // GSL_SPAN_H | ||
48 | diff --git a/include/gsl/util b/include/gsl/util | ||
49 | index b853017..26b2f5f 100644 | ||
50 | --- a/include/gsl/util | ||
51 | +++ b/include/gsl/util | ||
52 | @@ -40,10 +40,12 @@ | ||
53 | #endif // _MSC_VER | ||
54 | |||
55 | // Turn off clang unsafe buffer warnings as all accessed are guarded by runtime checks | ||
56 | -#if defined(__clang__) && __has_warning("-Wunsafe-buffer-usage") | ||
57 | +#if defined(__clang__) | ||
58 | +#if __has_warning("-Wunsafe-buffer-usage") | ||
59 | #pragma clang diagnostic push | ||
60 | #pragma clang diagnostic ignored "-Wunsafe-buffer-usage" | ||
61 | -#endif // defined(__clang__) && __has_warning("-Wunsafe-buffer-usage") | ||
62 | +#endif // __has_warning("-Wunsafe-buffer-usage") | ||
63 | +#endif // defined(__clang__) | ||
64 | |||
65 | #if defined(__cplusplus) && (__cplusplus >= 201703L) | ||
66 | #define GSL_NODISCARD [[nodiscard]] | ||
67 | @@ -163,8 +165,10 @@ constexpr auto at(std::span<T, extent> sp, const index i) -> decltype(sp[sp.size | ||
68 | |||
69 | #endif // _MSC_VER | ||
70 | |||
71 | -#if defined(__clang__) && __has_warning("-Wunsafe-buffer-usage") | ||
72 | +#if defined(__clang__) | ||
73 | +#if __has_warning("-Wunsafe-buffer-usage") | ||
74 | #pragma clang diagnostic pop | ||
75 | -#endif | ||
76 | +#endif // __has_warning("-Wunsafe-buffer-usage") | ||
77 | +#endif // defined(__clang__) | ||
78 | |||
79 | #endif // GSL_UTIL_H | ||
80 | -- | ||
81 | 2.30.2 | ||
82 | |||
diff --git a/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl/0003-Adapt-check_cxx_compiler_flag-to-cmake-3.0.2.patch b/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl/0003-Adapt-check_cxx_compiler_flag-to-cmake-3.0.2.patch deleted file mode 100644 index ed057f5243..0000000000 --- a/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl/0003-Adapt-check_cxx_compiler_flag-to-cmake-3.0.2.patch +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | From 85e1c38bcf84bd4e2ce63ef74f0cfa1f5e92261e Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Marko <peter.marko@siemens.com> | ||
3 | Date: Wed, 27 Mar 2024 23:46:31 +0100 | ||
4 | Subject: [PATCH] Adapt check_cxx_compiler_flag to cmake 3.0.2 | ||
5 | |||
6 | Backporting commits which are upgrading cmake_minimum_required and | ||
7 | include check_cxx_compiler_flag have too many additional changes. | ||
8 | |||
9 | Let's just do a simple adaptation of our backported patch so | ||
10 | it works with older cmake version instead. | ||
11 | |||
12 | This can be safely removed when recipe version is upgraded. | ||
13 | |||
14 | Upstream-Status: Inappropriate | ||
15 | |||
16 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
17 | --- | ||
18 | tests/CMakeLists.txt | 5 +++-- | ||
19 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
20 | |||
21 | diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt | ||
22 | index 20de9e1..54c3ac5 100644 | ||
23 | --- a/tests/CMakeLists.txt | ||
24 | +++ b/tests/CMakeLists.txt | ||
25 | @@ -5,6 +5,7 @@ enable_testing() # again, for support standalone testing | ||
26 | |||
27 | include(FindPkgConfig) | ||
28 | include(ExternalProject) | ||
29 | +include(CheckCXXCompilerFlag) | ||
30 | |||
31 | # will make visual studio generated project group files | ||
32 | set_property(GLOBAL PROPERTY USE_FOLDERS ON) | ||
33 | @@ -167,7 +168,7 @@ else() | ||
34 | > | ||
35 | ) | ||
36 | endif(MSVC) | ||
37 | -check_cxx_compiler_flag("-Wno-unsafe-buffer-usage" WARN_UNSAFE_BUFFER) | ||
38 | +CHECK_CXX_COMPILER_FLAG("-Wno-unsafe-buffer-usage" WARN_UNSAFE_BUFFER) | ||
39 | if (WARN_UNSAFE_BUFFER) | ||
40 | # This test uses very greedy heuristics such as "no pointer arithmetic on raw buffer" | ||
41 | target_compile_options(gsl_tests_config INTERFACE "-Wno-unsafe-buffer-usage") | ||
42 | @@ -272,7 +273,7 @@ else() | ||
43 | > | ||
44 | ) | ||
45 | endif(MSVC) | ||
46 | -check_cxx_compiler_flag("-Wno-unsafe-buffer-usage" WARN_UNSAFE_BUFFER) | ||
47 | +CHECK_CXX_COMPILER_FLAG("-Wno-unsafe-buffer-usage" WARN_UNSAFE_BUFFER) | ||
48 | if (WARN_UNSAFE_BUFFER) | ||
49 | # This test uses very greedy heuristics such as "no pointer arithmetic on raw buffer" | ||
50 | target_compile_options(gsl_tests_config_noexcept INTERFACE "-Wno-unsafe-buffer-usage") | ||
51 | -- | ||
52 | 2.30.2 | ||
53 | |||
diff --git a/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.0.0.bb b/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.2.0.bb index 2fbbf8f06a..610c45a298 100644 --- a/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.0.0.bb +++ b/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.2.0.bb | |||
@@ -9,13 +9,9 @@ LICENSE = "MIT" | |||
9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=363055e71e77071107ba2bb9a54bd9a7" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=363055e71e77071107ba2bb9a54bd9a7" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/microsoft/GSL.git;protocol=https;branch=main \ | 11 | SRC_URI = "git://github.com/microsoft/GSL.git;protocol=https;branch=main \ |
12 | file://run-ptest \ | 12 | file://run-ptest \ |
13 | file://0001-Fix-initialization-in-test-1140.patch \ | ||
14 | file://0002-Fix-gcc-build-problem.patch \ | ||
15 | file://0003-Adapt-check_cxx_compiler_flag-to-cmake-3.0.2.patch \ | ||
16 | " | 13 | " |
17 | SRCREV = "a3534567187d2edc428efd3f13466ff75fe5805c" | 14 | SRCREV = "2828399820ef4928cc89b65605dca5dc68efca6e" |
18 | |||
19 | 15 | ||
20 | inherit cmake pkgconfig ptest | 16 | inherit cmake pkgconfig ptest |
21 | 17 | ||
diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-allow-build-with-cmake-4.patch b/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-allow-build-with-cmake-4.patch new file mode 100644 index 0000000000..e40b9fe06c --- /dev/null +++ b/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-allow-build-with-cmake-4.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From b855b1632f9afe5199e01d84da54068a4cb152a8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
3 | Date: Tue, 8 Jul 2025 18:46:59 +0300 | ||
4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
5 | compatibility | ||
6 | |||
7 | Fix: | ||
8 | |||
9 | | CMake Error at CMakeLists.txt:1 (CMAKE_MINIMUM_REQUIRED): | ||
10 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
11 | | | ||
12 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
13 | | to tell CMake that the project requires at least <min> but has been updated | ||
14 | | to work with policies introduced by <max> or earlier. | ||
15 | | | ||
16 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
17 | | | ||
18 | | | ||
19 | | -- Configuring incomplete, errors occurred! | ||
20 | |||
21 | Upstream-Status: Backport [https://github.com/Tencent/rapidjson/commit/ebd87cb468fb4cb060b37e579718c4a4125416c1] | ||
22 | |||
23 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
24 | --- | ||
25 | CMakeLists.txt | 2 +- | ||
26 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
29 | index 3b9ac512..6d4121e9 100644 | ||
30 | --- a/CMakeLists.txt | ||
31 | +++ b/CMakeLists.txt | ||
32 | @@ -1,4 +1,4 @@ | ||
33 | -CMAKE_MINIMUM_REQUIRED(VERSION 2.8) | ||
34 | +CMAKE_MINIMUM_REQUIRED(VERSION 3.5) | ||
35 | if(POLICY CMP0025) | ||
36 | # detect Apple's Clang | ||
37 | cmake_policy(SET CMP0025 NEW) | ||
38 | -- | ||
39 | 2.43.0 | ||
40 | |||
diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb index 724d329ee2..92858044c1 100644 --- a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb +++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb | |||
@@ -4,13 +4,13 @@ SECTION = "libs" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125" | 5 | LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125" |
6 | 6 | ||
7 | SRC_URI = "git://github.com/miloyip/rapidjson.git;branch=master;protocol=https" | 7 | SRC_URI = "git://github.com/miloyip/rapidjson.git;branch=master;protocol=https \ |
8 | file://0001-allow-build-with-cmake-4.patch" | ||
8 | 9 | ||
9 | SRCREV = "0ccdbf364c577803e2a751f5aededce935314313" | 10 | SRCREV = "0ccdbf364c577803e2a751f5aededce935314313" |
10 | 11 | ||
11 | PV = "1.1.0+git" | 12 | PV = "1.1.0+git" |
12 | 13 | ||
13 | |||
14 | inherit cmake | 14 | inherit cmake |
15 | 15 | ||
16 | EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF" | 16 | EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF" |
diff --git a/meta-oe/recipes-devtools/yajl/yajl/0001-allow-build-with-cmake-4.patch b/meta-oe/recipes-devtools/yajl/yajl/0001-allow-build-with-cmake-4.patch new file mode 100644 index 0000000000..c62a846da9 --- /dev/null +++ b/meta-oe/recipes-devtools/yajl/yajl/0001-allow-build-with-cmake-4.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 3dfd5276ab30ba7f6820cd4585d390c3706684b0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
3 | Date: Tue, 8 Jul 2025 18:17:56 +0300 | ||
4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
5 | compatibility | ||
6 | |||
7 | Fix: | ||
8 | |||
9 | | CMake Error at CMakeLists.txt:15 (CMAKE_MINIMUM_REQUIRED): | ||
10 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
11 | | | ||
12 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
13 | | to tell CMake that the project requires at least <min> but has been updated | ||
14 | | to work with policies introduced by <max> or earlier. | ||
15 | | | ||
16 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
17 | | | ||
18 | | | ||
19 | | -- Configuring incomplete, errors occurred! | ||
20 | |||
21 | Upstream-Status: Submitted [https://github.com/lloyd/yajl/pull/256] | ||
22 | |||
23 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
24 | --- | ||
25 | CMakeLists.txt | 2 +- | ||
26 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
29 | index 4c0a9be..a49e52c 100644 | ||
30 | --- a/CMakeLists.txt | ||
31 | +++ b/CMakeLists.txt | ||
32 | @@ -12,7 +12,7 @@ | ||
33 | # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
34 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
35 | |||
36 | -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) | ||
37 | +CMAKE_MINIMUM_REQUIRED(VERSION 3.5) | ||
38 | |||
39 | PROJECT(YetAnotherJSONParser C) | ||
40 | |||
41 | -- | ||
42 | 2.43.0 | ||
43 | |||
diff --git a/meta-oe/recipes-devtools/yajl/yajl/0002-cmake-Use-TARGET_FILE-instead-of-LOCATION-property-f.patch b/meta-oe/recipes-devtools/yajl/yajl/0002-cmake-Use-TARGET_FILE-instead-of-LOCATION-property-f.patch new file mode 100644 index 0000000000..8b64ffd7d1 --- /dev/null +++ b/meta-oe/recipes-devtools/yajl/yajl/0002-cmake-Use-TARGET_FILE-instead-of-LOCATION-property-f.patch | |||
@@ -0,0 +1,67 @@ | |||
1 | From 1b07726910d4ff7ce1829845471a066bb97dd411 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
3 | Date: Tue, 8 Jul 2025 18:33:48 +0300 | ||
4 | Subject: [PATCH] cmake: Use $<TARGET_FILE> instead of LOCATION property for | ||
5 | binary path | ||
6 | |||
7 | CMake 3.0 and newer disallow reading the LOCATION property of targets directly. | ||
8 | Instead, use the recommended $<TARGET_FILE:target> generator expression when | ||
9 | referencing the output binary in add_custom_command. | ||
10 | |||
11 | Fix: | ||
12 | |||
13 | | CMake Error at reformatter/CMakeLists.txt:38 (GET_TARGET_PROPERTY): | ||
14 | | The LOCATION property may not be read from target "json_reformat". Use the | ||
15 | | target name directly with add_custom_command, or use the generator | ||
16 | | expression $<TARGET_FILE>, as appropriate. | ||
17 | | | ||
18 | | | ||
19 | | | ||
20 | | CMake Error at verify/CMakeLists.txt:32 (GET_TARGET_PROPERTY): | ||
21 | | The LOCATION property may not be read from target "json_verify". Use the | ||
22 | | target name directly with add_custom_command, or use the generator | ||
23 | | expression $<TARGET_FILE>, as appropriate. | ||
24 | |||
25 | Upstream-Status: Pending | ||
26 | |||
27 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
28 | --- | ||
29 | reformatter/CMakeLists.txt | 5 +---- | ||
30 | verify/CMakeLists.txt | 5 +---- | ||
31 | 2 files changed, 2 insertions(+), 8 deletions(-) | ||
32 | |||
33 | diff --git a/reformatter/CMakeLists.txt b/reformatter/CMakeLists.txt | ||
34 | index 52a9bee..b202fa5 100644 | ||
35 | --- a/reformatter/CMakeLists.txt | ||
36 | +++ b/reformatter/CMakeLists.txt | ||
37 | @@ -34,10 +34,7 @@ IF (NOT WIN32) | ||
38 | TARGET_LINK_LIBRARIES(json_reformat m) | ||
39 | ENDIF (NOT WIN32) | ||
40 | |||
41 | -# copy the binary into the output directory | ||
42 | -GET_TARGET_PROPERTY(binPath json_reformat LOCATION) | ||
43 | - | ||
44 | ADD_CUSTOM_COMMAND(TARGET json_reformat POST_BUILD | ||
45 | - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir}) | ||
46 | + COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:json_reformat> ${binDir}) | ||
47 | |||
48 | INSTALL(TARGETS json_reformat RUNTIME DESTINATION bin) | ||
49 | diff --git a/verify/CMakeLists.txt b/verify/CMakeLists.txt | ||
50 | index 967fca1..37eac62 100644 | ||
51 | --- a/verify/CMakeLists.txt | ||
52 | +++ b/verify/CMakeLists.txt | ||
53 | @@ -28,10 +28,7 @@ ADD_EXECUTABLE(json_verify ${SRCS}) | ||
54 | |||
55 | TARGET_LINK_LIBRARIES(json_verify yajl_s) | ||
56 | |||
57 | -# copy in the binary | ||
58 | -GET_TARGET_PROPERTY(binPath json_verify LOCATION) | ||
59 | - | ||
60 | ADD_CUSTOM_COMMAND(TARGET json_verify POST_BUILD | ||
61 | - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir}) | ||
62 | + COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:json_verify> ${binDir}) | ||
63 | |||
64 | INSTALL(TARGETS json_verify RUNTIME DESTINATION bin) | ||
65 | -- | ||
66 | 2.43.0 | ||
67 | |||
diff --git a/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb b/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb index e4434bee45..8c0d84f811 100644 --- a/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb +++ b/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb | |||
@@ -12,10 +12,11 @@ SRC_URI = "git://github.com/lloyd/yajl;branch=master;protocol=https \ | |||
12 | file://CVE-2017-16516.patch \ | 12 | file://CVE-2017-16516.patch \ |
13 | file://CVE-2022-24795.patch \ | 13 | file://CVE-2022-24795.patch \ |
14 | file://CVE-2023-33460.patch \ | 14 | file://CVE-2023-33460.patch \ |
15 | file://0001-allow-build-with-cmake-4.patch \ | ||
16 | file://0002-cmake-Use-TARGET_FILE-instead-of-LOCATION-property-f.patch \ | ||
15 | " | 17 | " |
16 | SRCREV = "a0ecdde0c042b9256170f2f8890dd9451a4240aa" | 18 | SRCREV = "a0ecdde0c042b9256170f2f8890dd9451a4240aa" |
17 | 19 | ||
18 | |||
19 | inherit cmake lib_package | 20 | inherit cmake lib_package |
20 | 21 | ||
21 | EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" | 22 | EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" |
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0002-allow-build-with-cmake-4.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0002-allow-build-with-cmake-4.patch new file mode 100644 index 0000000000..f2fdb1fb10 --- /dev/null +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0002-allow-build-with-cmake-4.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 1b92ac43bab03a77cb497cd59f9c84d5650a4a68 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
3 | Date: Tue, 8 Jul 2025 20:09:41 +0300 | ||
4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
5 | compatibility | ||
6 | |||
7 | Fix: | ||
8 | |||
9 | | CMake Error at CMakeLists.txt:4 (cmake_minimum_required): | ||
10 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
11 | | | ||
12 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
13 | | to tell CMake that the project requires at least <min> but has been updated | ||
14 | | to work with policies introduced by <max> or earlier. | ||
15 | | | ||
16 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
17 | | | ||
18 | | | ||
19 | | -- Configuring incomplete, errors occurred! | ||
20 | |||
21 | Upstream-Status: Submitted [https://github.com/kkaempf/cmpi-bindings/pull/20] | ||
22 | |||
23 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
24 | --- | ||
25 | CMakeLists.txt | 2 +- | ||
26 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
29 | index 4ea24ce..7d54f9a 100644 | ||
30 | --- a/CMakeLists.txt | ||
31 | +++ b/CMakeLists.txt | ||
32 | @@ -1,7 +1,7 @@ | ||
33 | # | ||
34 | # CMakeLists.txt for cmpi-bindings | ||
35 | # | ||
36 | -cmake_minimum_required(VERSION 2.4) | ||
37 | +cmake_minimum_required(VERSION 3.5) | ||
38 | |||
39 | PROJECT(cmpi-bindings) | ||
40 | |||
41 | -- | ||
42 | 2.43.0 | ||
43 | |||
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.5.bb b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.5.bb index da710eaedb..e0d995226e 100644 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.5.bb +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.5.bb | |||
@@ -10,6 +10,7 @@ SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=https;branch=main | |||
10 | file://cmpi-bindings-0.4.17-no-ruby-perl.patch \ | 10 | file://cmpi-bindings-0.4.17-no-ruby-perl.patch \ |
11 | file://cmpi-bindings-0.4.17-sblim-sigsegv.patch \ | 11 | file://cmpi-bindings-0.4.17-sblim-sigsegv.patch \ |
12 | file://0001-Fix-error.patch \ | 12 | file://0001-Fix-error.patch \ |
13 | file://0002-allow-build-with-cmake-4.patch \ | ||
13 | " | 14 | " |
14 | 15 | ||
15 | SRCREV = "49d6dcfc71ca421100fcf325e31625817c469fc9" | 16 | SRCREV = "49d6dcfc71ca421100fcf325e31625817c469fc9" |
diff --git a/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb b/meta-oe/recipes-extended/hiredis/hiredis_1.3.0.bb index 8678447cf5..0cf03bfcda 100644 --- a/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb +++ b/meta-oe/recipes-extended/hiredis/hiredis_1.3.0.bb | |||
@@ -8,8 +8,7 @@ SRC_URI = " \ | |||
8 | git://github.com/redis/hiredis;protocol=https;branch=master \ | 8 | git://github.com/redis/hiredis;protocol=https;branch=master \ |
9 | file://run-ptest \ | 9 | file://run-ptest \ |
10 | " | 10 | " |
11 | SRCREV = "60e5075d4ac77424809f855ba3e398df7aacefe8" | 11 | SRCREV = "ccad7ebaf99310957004661d1c5f82d2a33ebd10" |
12 | |||
13 | 12 | ||
14 | inherit cmake ptest | 13 | inherit cmake ptest |
15 | 14 | ||
diff --git a/meta-oe/recipes-extended/jansson/jansson/0002-allow-build-with-cmake-4.patch b/meta-oe/recipes-extended/jansson/jansson/0002-allow-build-with-cmake-4.patch new file mode 100644 index 0000000000..5264f26f81 --- /dev/null +++ b/meta-oe/recipes-extended/jansson/jansson/0002-allow-build-with-cmake-4.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 5d7b2ced666b4fbccd0da6e06d504ae2960575c8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
3 | Date: Tue, 8 Jul 2025 14:54:08 +0300 | ||
4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
5 | compatibility | ||
6 | |||
7 | | CMake Error at CMakeLists.txt:1 (cmake_minimum_required): | ||
8 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
9 | | | ||
10 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
11 | | to tell CMake that the project requires at least <min> but has been updated | ||
12 | | to work with policies introduced by <max> or earlier. | ||
13 | | | ||
14 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
15 | | | ||
16 | | | ||
17 | | -- Configuring incomplete, errors occurred! | ||
18 | |||
19 | Upstream-Status: Backport [https://github.com/akheron/jansson/commit/96d160df90016066d04d493d1d69639474ba4f20] | ||
20 | |||
21 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
22 | --- | ||
23 | CMakeLists.txt | 2 +- | ||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
25 | |||
26 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
27 | index 72f9762..d07412e 100644 | ||
28 | --- a/CMakeLists.txt | ||
29 | +++ b/CMakeLists.txt | ||
30 | @@ -1,4 +1,4 @@ | ||
31 | -cmake_minimum_required (VERSION 3.1) | ||
32 | +cmake_minimum_required (VERSION 3.5) | ||
33 | project(jansson C) | ||
34 | |||
35 | # Options | ||
36 | -- | ||
37 | 2.43.0 | ||
38 | |||
diff --git a/meta-oe/recipes-extended/jansson/jansson_2.14.1.bb b/meta-oe/recipes-extended/jansson/jansson_2.14.1.bb index 715b1af5c5..e0916759c6 100644 --- a/meta-oe/recipes-extended/jansson/jansson_2.14.1.bb +++ b/meta-oe/recipes-extended/jansson/jansson_2.14.1.bb | |||
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d9911525d4128bee234ee2d3ccaa2537" | |||
7 | SRC_URI = "https://github.com/akheron/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ | 7 | SRC_URI = "https://github.com/akheron/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ |
8 | file://0001-Honour-multilib-paths.patch \ | 8 | file://0001-Honour-multilib-paths.patch \ |
9 | file://0001-Only-export-symbols-starting-with-json_-and-jansson_.patch \ | 9 | file://0001-Only-export-symbols-starting-with-json_-and-jansson_.patch \ |
10 | file://0002-allow-build-with-cmake-4.patch \ | ||
10 | " | 11 | " |
11 | SRC_URI[sha256sum] = "6bd82d3043dadbcd58daaf903d974891128d22aab7dada5d399cb39094af49ce" | 12 | SRC_URI[sha256sum] = "6bd82d3043dadbcd58daaf903d974891128d22aab7dada5d399cb39094af49ce" |
12 | 13 | ||
diff --git a/meta-oe/recipes-extended/qhull/qhull/0002-allow-build-with-cmake-4.patch b/meta-oe/recipes-extended/qhull/qhull/0002-allow-build-with-cmake-4.patch new file mode 100644 index 0000000000..5ca865316d --- /dev/null +++ b/meta-oe/recipes-extended/qhull/qhull/0002-allow-build-with-cmake-4.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 26db5aece1220e4142b5b82720123371a9223bc7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
3 | Date: Tue, 8 Jul 2025 17:44:57 +0300 | ||
4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
5 | compatibility | ||
6 | |||
7 | Fix: | ||
8 | |||
9 | | CMake Error at CMakeLists.txt:71 (cmake_minimum_required): | ||
10 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
11 | | | ||
12 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
13 | | to tell CMake that the project requires at least <min> but has been updated | ||
14 | | to work with policies introduced by <max> or earlier. | ||
15 | | | ||
16 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
17 | | | ||
18 | | | ||
19 | | -- Configuring incomplete, errors occurred! | ||
20 | |||
21 | Upstream-Status: Backport [https://github.com/qhull/qhull/commit/62ccc56af071eaa478bef6ed41fd7a55d3bb2d80] | ||
22 | |||
23 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
24 | --- | ||
25 | CMakeLists.txt | 2 +- | ||
26 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
29 | index c2248f9..b2303c6 100644 | ||
30 | --- a/CMakeLists.txt | ||
31 | +++ b/CMakeLists.txt | ||
32 | @@ -68,7 +68,7 @@ | ||
33 | # $DateTime: 2020/09/03 21:26:22 $$Author: bbarber $ | ||
34 | |||
35 | project(qhull) | ||
36 | -cmake_minimum_required(VERSION 3.0) | ||
37 | +cmake_minimum_required(VERSION 3.5) | ||
38 | |||
39 | # Define qhull_VERSION in README.txt, Announce.txt, qh-get.htm, CMakeLists.txt | ||
40 | # qhull-zip.sh (twice), qhull-wiki.md, qhull-news.htm, File_id.diz, index.htm | ||
41 | -- | ||
42 | 2.43.0 | ||
43 | |||
diff --git a/meta-oe/recipes-extended/qhull/qhull_2020.2.bb b/meta-oe/recipes-extended/qhull/qhull_2020.2.bb index 13638c391b..9efadbc7f4 100644 --- a/meta-oe/recipes-extended/qhull/qhull_2020.2.bb +++ b/meta-oe/recipes-extended/qhull/qhull_2020.2.bb | |||
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=484ee0cacf0472e8b40225b116f6296c" | |||
6 | 6 | ||
7 | SRC_URI = "http://www.qhull.org/download/qhull-2020-src-8.0.2.tgz \ | 7 | SRC_URI = "http://www.qhull.org/download/qhull-2020-src-8.0.2.tgz \ |
8 | file://0001-Use-LIB_INSTALL_DIR-for-cmake-and-pkgconfig-files-to.patch \ | 8 | file://0001-Use-LIB_INSTALL_DIR-for-cmake-and-pkgconfig-files-to.patch \ |
9 | file://0002-allow-build-with-cmake-4.patch \ | ||
9 | " | 10 | " |
10 | SRC_URI[sha256sum] = "b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e" | 11 | SRC_URI[sha256sum] = "b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e" |
11 | 12 | ||
diff --git a/meta-oe/recipes-extended/snappy/snappy/fix-build-on-32bit-arm.patch b/meta-oe/recipes-extended/snappy/snappy/fix-build-on-32bit-arm.patch deleted file mode 100644 index b6ab149e19..0000000000 --- a/meta-oe/recipes-extended/snappy/snappy/fix-build-on-32bit-arm.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From ecb3bcc283ce740a34d6342cbcda569f3193ade9 Mon Sep 17 00:00:00 2001 | ||
2 | From: David Michael <fedora.dm0@gmail.com> | ||
3 | Date: Mon, 1 May 2023 11:14:32 -0400 | ||
4 | Subject: [PATCH] Specifically check for NEON for ARMv8 CPUs. | ||
5 | |||
6 | The actual NEON implementation uses instructions that are not | ||
7 | supported on 32-bit CPUs. Make the CMake test reflect this so that | ||
8 | ARMv7 builds succeed again. | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/google/snappy/pull/169] | ||
11 | |||
12 | Signed-off-by: David Michael <fedora.dm0@gmail.com> | ||
13 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
14 | --- | ||
15 | CMakeLists.txt | 4 ++-- | ||
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
19 | index 85afe58e..e8775859 100644 | ||
20 | --- a/CMakeLists.txt | ||
21 | +++ b/CMakeLists.txt | ||
22 | @@ -207,9 +207,9 @@ int main() { | ||
23 | check_cxx_source_compiles(" | ||
24 | #include <arm_neon.h> | ||
25 | int main() { | ||
26 | - uint8_t val = 3, dup[8]; | ||
27 | + uint8_t val = 3; | ||
28 | uint8x16_t v = vld1q_dup_u8(&val); | ||
29 | - vst1q_u8(dup, v); | ||
30 | + val = vmaxvq_u8(v); | ||
31 | return 0; | ||
32 | }" SNAPPY_HAVE_NEON) | ||
33 | |||
diff --git a/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb b/meta-oe/recipes-extended/snappy/snappy_1.2.2.bb index 2a49ba99b0..7601fdde50 100644 --- a/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb +++ b/meta-oe/recipes-extended/snappy/snappy_1.2.2.bb | |||
@@ -10,11 +10,8 @@ compression ratio." | |||
10 | LICENSE = "BSD-3-Clause" | 10 | LICENSE = "BSD-3-Clause" |
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" | 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" |
12 | 12 | ||
13 | SRC_URI = "gitsm://github.com/google/snappy.git;protocol=https;branch=main \ | 13 | SRC_URI = "gitsm://github.com/google/snappy.git;protocol=https;branch=main" |
14 | file://fix-build-on-32bit-arm.patch" | 14 | SRCREV = "6af9287fbdb913f0794d0148c6aa43b58e63c8e3" |
15 | |||
16 | SRCREV = "dc05e026488865bc69313a68bcc03ef2e4ea8e83" | ||
17 | |||
18 | 15 | ||
19 | inherit cmake pkgconfig | 16 | inherit cmake pkgconfig |
20 | 17 | ||
diff --git a/meta-oe/recipes-graphics/gpicview/gpicview_0.3.1.bb b/meta-oe/recipes-graphics/gpicview/gpicview_0.3.1.bb index dab11a02bc..b4f100ffc4 100644 --- a/meta-oe/recipes-graphics/gpicview/gpicview_0.3.1.bb +++ b/meta-oe/recipes-graphics/gpicview/gpicview_0.3.1.bb | |||
@@ -8,14 +8,16 @@ SECTION = "x11" | |||
8 | LICENSE = "GPL-2.0-only" | 8 | LICENSE = "GPL-2.0-only" |
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" |
10 | 10 | ||
11 | DEPENDS = "glib-2.0-native intltool-native jpeg" | 11 | DEPENDS = "glib-2.0-native intltool-native jpeg libx11" |
12 | 12 | ||
13 | SRC_URI = "git://github.com/lxde/gpicview.git;protocol=https;branch=master;tag=${PV}" | 13 | SRC_URI = "git://github.com/lxde/gpicview.git;protocol=https;branch=master;tag=${PV}" |
14 | SRCREV = "ca13623c6176585db4759ce4371fbf89c56fa630" | 14 | SRCREV = "ca13623c6176585db4759ce4371fbf89c56fa630" |
15 | 15 | ||
16 | inherit autotools mime-xdg pkgconfig | 16 | inherit autotools mime-xdg pkgconfig features_check |
17 | 17 | ||
18 | PACKAGECONFIG ?= "gtk3" | 18 | REQUIRED_DISTRO_FEATURES = "x11" |
19 | |||
20 | PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk3', '', d)}" | ||
19 | PACKAGECONFIG[gtk2] = ",,gtk+" | 21 | PACKAGECONFIG[gtk2] = ",,gtk+" |
20 | PACKAGECONFIG[gtk3] = "--enable-gtk3,,gtk+3" | 22 | PACKAGECONFIG[gtk3] = "--enable-gtk3,,gtk+3" |
21 | 23 | ||
diff --git a/meta-oe/recipes-graphics/spir/spirv-shader-generator/0001-allow-build-with-cmake-4.patch b/meta-oe/recipes-graphics/spir/spirv-shader-generator/0001-allow-build-with-cmake-4.patch new file mode 100644 index 0000000000..31b3ef81fa --- /dev/null +++ b/meta-oe/recipes-graphics/spir/spirv-shader-generator/0001-allow-build-with-cmake-4.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From ba72528b21e024fe4f5464466976a8234d7c330c Mon Sep 17 00:00:00 2001 | ||
2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
3 | Date: Tue, 8 Jul 2025 20:27:11 +0300 | ||
4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
5 | compatibility | ||
6 | |||
7 | Fix: | ||
8 | |||
9 | | CMake Error at CMakeLists.txt:22 (cmake_minimum_required): | ||
10 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
11 | | | ||
12 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
13 | | to tell CMake that the project requires at least <min> but has been updated | ||
14 | | to work with policies introduced by <max> or earlier. | ||
15 | | | ||
16 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
17 | | | ||
18 | | | ||
19 | | -- Configuring incomplete, errors occurred! | ||
20 | |||
21 | Upstream-Status: Backport [https://github.com/KhronosGroup/SPIRV-Cross/commit/82331a2ca9f2ea90d05901e931aa8c21e70dc40c] | ||
22 | |||
23 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
24 | --- | ||
25 | CMakeLists.txt | 2 +- | ||
26 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
29 | index cf14c8d5..ef9695a9 100644 | ||
30 | --- a/CMakeLists.txt | ||
31 | +++ b/CMakeLists.txt | ||
32 | @@ -19,7 +19,7 @@ | ||
33 | # 2. The MIT License, found at <http://opensource.org/licenses/MIT>. | ||
34 | # | ||
35 | |||
36 | -cmake_minimum_required(VERSION 3.0) | ||
37 | +cmake_minimum_required(VERSION 3.5) | ||
38 | set(CMAKE_CXX_STANDARD 11) | ||
39 | set(CMAKE_CXX_EXTENSIONS OFF) | ||
40 | |||
41 | -- | ||
42 | 2.43.0 | ||
43 | |||
diff --git a/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb b/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb index 567f7a55e8..1ecd315a2e 100644 --- a/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb +++ b/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb | |||
@@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | |||
5 | SECTION = "graphics" | 5 | SECTION = "graphics" |
6 | 6 | ||
7 | SRCREV = "f09ba2777714871bddb70d049878af34b94fa54d" | 7 | SRCREV = "f09ba2777714871bddb70d049878af34b94fa54d" |
8 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Cross.git;branch=master;protocol=https" | 8 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Cross.git;branch=master;protocol=https \ |
9 | file://0001-allow-build-with-cmake-4.patch" | ||
10 | |||
9 | inherit cmake pkgconfig | 11 | inherit cmake pkgconfig |
10 | 12 | ||
11 | EXTRA_OECMAKE = "-DSPIRV_CROSS_SHARED=ON" | 13 | EXTRA_OECMAKE = "-DSPIRV_CROSS_SHARED=ON" |
diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 14aa5d0c0c..6a49ff2fdd 100644 --- a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb | |||
@@ -97,6 +97,12 @@ either install it and add it to HOSTTOOLS, or add clang-native from meta-clang t | |||
97 | sed -i -e '/mrecord-mcount/d' ${S}/Makefile | 97 | sed -i -e '/mrecord-mcount/d' ${S}/Makefile |
98 | sed -i -e '/Wno-alloc-size-larger-than/d' ${S}/Makefile | 98 | sed -i -e '/Wno-alloc-size-larger-than/d' ${S}/Makefile |
99 | sed -i -e '/Wno-alloc-size-larger-than/d' ${S}/scripts/Makefile.* | 99 | sed -i -e '/Wno-alloc-size-larger-than/d' ${S}/scripts/Makefile.* |
100 | |||
101 | # Add kernel headers to CFLAGS to fix PTP selftest compilation | ||
102 | # Required for PTP_MASK_CLEAR_ALL and PTP_MASK_EN_SINGLE definitions | ||
103 | # introduced in kernel v6.7 (commit c5a445b) | ||
104 | export CFLAGS="${CFLAGS} -I${STAGING_KERNEL_BUILDDIR}/usr/include" | ||
105 | |||
100 | oe_runmake -C ${S}/tools/testing/selftests TARGETS="${TEST_LIST}" | 106 | oe_runmake -C ${S}/tools/testing/selftests TARGETS="${TEST_LIST}" |
101 | } | 107 | } |
102 | 108 | ||
diff --git a/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb b/meta-oe/recipes-multimedia/wavpack/wavpack_5.8.1.bb index 651fbc4192..63d0db1b67 100644 --- a/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb +++ b/meta-oe/recipes-multimedia/wavpack/wavpack_5.8.1.bb | |||
@@ -1,16 +1,11 @@ | |||
1 | DESCRIPTION = "WavPack is a completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode." | 1 | DESCRIPTION = "WavPack is a completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode." |
2 | LICENSE = "BSD-3-Clause" | 2 | LICENSE = "BSD-3-Clause" |
3 | LIC_FILES_CHKSUM = "file://license.txt;md5=bb5d037e3ad41a3c84c9f2d8bb65a7b4" | 3 | LIC_FILES_CHKSUM = "file://license.txt;md5=3a6eec695493cff01ff6f7b7888c5631" |
4 | 4 | ||
5 | DEPENDS = "openssl" | 5 | DEPENDS = "openssl" |
6 | 6 | ||
7 | SRC_URI = "git://github.com/dbry/WavPack.git;branch=master;protocol=https \ | 7 | SRC_URI = "git://github.com/dbry/WavPack.git;branch=master;protocol=https" |
8 | file://set-soversion-and-version.patch \ | 8 | SRCREV = "4827b9889665b937b6ed71b9c6c0123152cd7a02" |
9 | file://extract-libtool-and-convert-to-soversion.patch \ | ||
10 | " | ||
11 | |||
12 | SRCREV = "e03e8e29dc618e08e7baba9636e57ba1254874ce" | ||
13 | |||
14 | 9 | ||
15 | inherit cmake pkgconfig lib_package | 10 | inherit cmake pkgconfig lib_package |
16 | 11 | ||
diff --git a/meta-oe/recipes-support/dc/double-conversion_3.3.1.bb b/meta-oe/recipes-support/dc/double-conversion_3.3.1.bb index 31330faa17..42777971d8 100644 --- a/meta-oe/recipes-support/dc/double-conversion_3.3.1.bb +++ b/meta-oe/recipes-support/dc/double-conversion_3.3.1.bb | |||
@@ -5,11 +5,10 @@ HOMEPAGE = "https://github.com/google/double-conversion.git" | |||
5 | LICENSE = "BSD-3-Clause" | 5 | LICENSE = "BSD-3-Clause" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1ea35644f0ec0d9767897115667e901f" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1ea35644f0ec0d9767897115667e901f" |
7 | 7 | ||
8 | |||
9 | |||
10 | SRC_URI = " \ | 8 | SRC_URI = " \ |
11 | git://github.com/google/double-conversion.git;protocol=https;branch=master \ | 9 | git://github.com/google/double-conversion.git;protocol=https;branch=master \ |
12 | file://run-ptest \ | 10 | file://run-ptest \ |
11 | file://0001-allow-build-with-cmake-4.patch \ | ||
13 | " | 12 | " |
14 | SRCREV = "ae0dbfeb9744efd216c95b30555049d75d47116a" | 13 | SRCREV = "ae0dbfeb9744efd216c95b30555049d75d47116a" |
15 | 14 | ||
diff --git a/meta-oe/recipes-support/dc/files/0001-allow-build-with-cmake-4.patch b/meta-oe/recipes-support/dc/files/0001-allow-build-with-cmake-4.patch new file mode 100644 index 0000000000..db8296c65d --- /dev/null +++ b/meta-oe/recipes-support/dc/files/0001-allow-build-with-cmake-4.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 1652f5b555b4b4a7916af40bebacc32c23e4aca5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
3 | Date: Tue, 8 Jul 2025 20:43:45 +0300 | ||
4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
5 | compatibility | ||
6 | |||
7 | Fix: | ||
8 | |||
9 | | CMake Error at CMakeLists.txt:1 (cmake_minimum_required): | ||
10 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
11 | | | ||
12 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
13 | | to tell CMake that the project requires at least <min> but has been updated | ||
14 | | to work with policies introduced by <max> or earlier. | ||
15 | | | ||
16 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
17 | | | ||
18 | | | ||
19 | | -- Configuring incomplete, errors occurred! | ||
20 | |||
21 | Upstream-Status: Backport [https://github.com/google/double-conversion/commit/101e1ba89dc41ceb75090831da97c43a76cd2906] | ||
22 | |||
23 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
24 | --- | ||
25 | CMakeLists.txt | 2 +- | ||
26 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
29 | index 8749ef8..3145772 100644 | ||
30 | --- a/CMakeLists.txt | ||
31 | +++ b/CMakeLists.txt | ||
32 | @@ -1,4 +1,4 @@ | ||
33 | -cmake_minimum_required(VERSION 3.0) | ||
34 | +cmake_minimum_required(VERSION 3.5) | ||
35 | project(double-conversion VERSION 3.3.0) | ||
36 | |||
37 | option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" OFF) | ||
38 | -- | ||
39 | 2.43.0 | ||
40 | |||
diff --git a/meta-oe/recipes-support/gflags/gflags/0001-allow-build-with-cmake-4.patch b/meta-oe/recipes-support/gflags/gflags/0001-allow-build-with-cmake-4.patch new file mode 100644 index 0000000000..bc3ca94de8 --- /dev/null +++ b/meta-oe/recipes-support/gflags/gflags/0001-allow-build-with-cmake-4.patch | |||
@@ -0,0 +1,69 @@ | |||
1 | From b533cf275db99b1d37ba20d96497cafcedc9ace0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
3 | Date: Tue, 8 Jul 2025 18:57:26 +0300 | ||
4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
5 | compatibility | ||
6 | |||
7 | Fix: | ||
8 | |||
9 | | CMake Error at CMakeLists.txt:73 (cmake_minimum_required): | ||
10 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
11 | | | ||
12 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
13 | | to tell CMake that the project requires at least <min> but has been updated | ||
14 | | to work with policies introduced by <max> or earlier. | ||
15 | | | ||
16 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
17 | | | ||
18 | | | ||
19 | | -- Configuring incomplete, errors occurred! | ||
20 | |||
21 | Upstream-Status: Backport [https://github.com/gflags/gflags/commit/70c01a642f08734b7bddc9687884844ca117e080] | ||
22 | |||
23 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
24 | --- | ||
25 | CMakeLists.txt | 2 +- | ||
26 | test/config/CMakeLists.txt | 2 +- | ||
27 | test/nc/CMakeLists.txt | 2 +- | ||
28 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
29 | |||
30 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
31 | index 657a1f4..a5440bb 100644 | ||
32 | --- a/CMakeLists.txt | ||
33 | +++ b/CMakeLists.txt | ||
34 | @@ -70,7 +70,7 @@ | ||
35 | ## - GFLAGS_INSTALL_SHARED_LIBS | ||
36 | ## - GFLAGS_INSTALL_STATIC_LIBS | ||
37 | |||
38 | -cmake_minimum_required (VERSION 3.0.2 FATAL_ERROR) | ||
39 | +cmake_minimum_required (VERSION 3.5 FATAL_ERROR) | ||
40 | |||
41 | if (POLICY CMP0042) | ||
42 | cmake_policy (SET CMP0042 NEW) | ||
43 | diff --git a/test/config/CMakeLists.txt b/test/config/CMakeLists.txt | ||
44 | index 6190b25..205121e 100644 | ||
45 | --- a/test/config/CMakeLists.txt | ||
46 | +++ b/test/config/CMakeLists.txt | ||
47 | @@ -1,6 +1,6 @@ | ||
48 | ## gflags package configuration tests | ||
49 | |||
50 | -cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) | ||
51 | +cmake_minimum_required (VERSION 3.5 FATAL_ERROR) | ||
52 | |||
53 | project (gflags_${TEST_NAME}) | ||
54 | |||
55 | diff --git a/test/nc/CMakeLists.txt b/test/nc/CMakeLists.txt | ||
56 | index d00b07d..1b4d511 100644 | ||
57 | --- a/test/nc/CMakeLists.txt | ||
58 | +++ b/test/nc/CMakeLists.txt | ||
59 | @@ -1,6 +1,6 @@ | ||
60 | ## gflags negative compilation tests | ||
61 | |||
62 | -cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) | ||
63 | +cmake_minimum_required (VERSION 3.5 FATAL_ERROR) | ||
64 | |||
65 | if (NOT TEST_NAME) | ||
66 | message (FATAL_ERROR "Missing TEST_NAME CMake flag") | ||
67 | -- | ||
68 | 2.43.0 | ||
69 | |||
diff --git a/meta-oe/recipes-support/gflags/gflags_2.2.2.bb b/meta-oe/recipes-support/gflags/gflags_2.2.2.bb index 8ea158eab3..925aa6d6e6 100644 --- a/meta-oe/recipes-support/gflags/gflags_2.2.2.bb +++ b/meta-oe/recipes-support/gflags/gflags_2.2.2.bb | |||
@@ -3,10 +3,10 @@ HOMEPAGE = "https://github.com/gflags/gflags" | |||
3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
4 | LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df" | 4 | LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df" |
5 | 5 | ||
6 | SRC_URI = "git://github.com/gflags/gflags.git;branch=master;protocol=https" | 6 | SRC_URI = "git://github.com/gflags/gflags.git;branch=master;protocol=https \ |
7 | file://0001-allow-build-with-cmake-4.patch" | ||
7 | SRCREV = "e171aa2d15ed9eb17054558e0b3a6a413bb01067" | 8 | SRCREV = "e171aa2d15ed9eb17054558e0b3a6a413bb01067" |
8 | 9 | ||
9 | |||
10 | inherit cmake | 10 | inherit cmake |
11 | 11 | ||
12 | EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON -DREGISTER_INSTALL_PREFIX=OFF -DLIB_INSTALL_DIR=${baselib}" | 12 | EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON -DREGISTER_INSTALL_PREFIX=OFF -DLIB_INSTALL_DIR=${baselib}" |
diff --git a/meta-oe/recipes-support/libfann/libfann/0001-allow-build-with-cmake-4.patch b/meta-oe/recipes-support/libfann/libfann/0001-allow-build-with-cmake-4.patch new file mode 100644 index 0000000000..db1600f96c --- /dev/null +++ b/meta-oe/recipes-support/libfann/libfann/0001-allow-build-with-cmake-4.patch | |||
@@ -0,0 +1,69 @@ | |||
1 | From a21c8455e2cfc5b19df1e42cd875c471d4e5cf63 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
3 | Date: Tue, 8 Jul 2025 19:40:46 +0300 | ||
4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
5 | compatibility | ||
6 | |||
7 | Fix: | ||
8 | |||
9 | | CMake Error at CMakeLists.txt:41 (cmake_minimum_required): | ||
10 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
11 | | | ||
12 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
13 | | to tell CMake that the project requires at least <min> but has been updated | ||
14 | | to work with policies introduced by <max> or earlier. | ||
15 | | | ||
16 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
17 | | | ||
18 | | | ||
19 | | -- Configuring incomplete, errors occurred! | ||
20 | |||
21 | | CMake Error at lib/googletest/CMakeLists.txt:48 (cmake_minimum_required): | ||
22 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
23 | | | ||
24 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
25 | | to tell CMake that the project requires at least <min> but has been updated | ||
26 | | to work with policies introduced by <max> or earlier. | ||
27 | | | ||
28 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
29 | | | ||
30 | | | ||
31 | | -- Configuring incomplete, errors occurred! | ||
32 | |||
33 | Upstream-Status: Submitted [https://github.com/libfann/fann/pull/152] | ||
34 | |||
35 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
36 | --- | ||
37 | CMakeLists.txt | 2 +- | ||
38 | lib/googletest/CMakeLists.txt | 2 +- | ||
39 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
40 | |||
41 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
42 | index 1b11d76..7e80be2 100644 | ||
43 | --- a/CMakeLists.txt | ||
44 | +++ b/CMakeLists.txt | ||
45 | @@ -38,7 +38,7 @@ IF(BIICODE) | ||
46 | ENDIF() | ||
47 | ENDIF() | ||
48 | ELSE() | ||
49 | -cmake_minimum_required (VERSION 2.8) | ||
50 | +cmake_minimum_required (VERSION 3.5) | ||
51 | |||
52 | if (NOT DEFINED CMAKE_BUILD_TYPE) | ||
53 | set (CMAKE_BUILD_TYPE Release CACHE STRING "Build type") | ||
54 | diff --git a/lib/googletest/CMakeLists.txt b/lib/googletest/CMakeLists.txt | ||
55 | index 961672a..3762d18 100644 | ||
56 | --- a/lib/googletest/CMakeLists.txt | ||
57 | +++ b/lib/googletest/CMakeLists.txt | ||
58 | @@ -45,7 +45,7 @@ endif() | ||
59 | # ${gtest_BINARY_DIR}. | ||
60 | # Language "C" is required for find_package(Threads). | ||
61 | project(gtest CXX C) | ||
62 | -cmake_minimum_required(VERSION 2.6.2) | ||
63 | +cmake_minimum_required(VERSION 3.5) | ||
64 | |||
65 | if (COMMAND set_up_hermetic_build) | ||
66 | set_up_hermetic_build() | ||
67 | -- | ||
68 | 2.43.0 | ||
69 | |||
diff --git a/meta-oe/recipes-support/libfann/libfann_git.bb b/meta-oe/recipes-support/libfann/libfann_git.bb index 2f68ea95a8..00b2af3829 100644 --- a/meta-oe/recipes-support/libfann/libfann_git.bb +++ b/meta-oe/recipes-support/libfann/libfann_git.bb | |||
@@ -10,9 +10,8 @@ inherit cmake | |||
10 | 10 | ||
11 | SRCREV ?= "7ec1fc7e5bd734f1d3c89b095e630e83c86b9be1" | 11 | SRCREV ?= "7ec1fc7e5bd734f1d3c89b095e630e83c86b9be1" |
12 | SRC_URI = "git://github.com/libfann/fann.git;branch=master;protocol=https \ | 12 | SRC_URI = "git://github.com/libfann/fann.git;branch=master;protocol=https \ |
13 | " | 13 | file://0001-allow-build-with-cmake-4.patch" |
14 | 14 | ||
15 | PV = "2.2.0+git" | 15 | PV = "2.2.0+git" |
16 | 16 | ||
17 | |||
18 | EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" | 17 | EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" |
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4945.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4945.patch new file mode 100644 index 0000000000..c9fbdbacc8 --- /dev/null +++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4945.patch | |||
@@ -0,0 +1,117 @@ | |||
1 | From 3844026f74a41dd9ccab955899e005995293d246 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Tue, 8 Jul 2025 14:58:30 +0800 | ||
4 | Subject: [PATCH] soup-date-utils: Add value checks for date/time parsing | ||
5 | |||
6 | Reject date/time when it does not represent a valid value. | ||
7 | |||
8 | Closes #448 | ||
9 | |||
10 | CVE: CVE-2025-4945 | ||
11 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/8988379984e33dcc7d3aa58551db13e48755959f] | ||
12 | |||
13 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
14 | --- | ||
15 | libsoup/soup-date.c | 21 +++++++++++++++------ | ||
16 | tests/cookies-test.c | 10 ++++++++++ | ||
17 | 2 files changed, 25 insertions(+), 6 deletions(-) | ||
18 | |||
19 | diff --git a/libsoup/soup-date.c b/libsoup/soup-date.c | ||
20 | index 9602d1f..4c114c1 100644 | ||
21 | --- a/libsoup/soup-date.c | ||
22 | +++ b/libsoup/soup-date.c | ||
23 | @@ -284,7 +284,7 @@ parse_day (SoupDate *date, const char **date_string) | ||
24 | while (*end == ' ' || *end == '-') | ||
25 | end++; | ||
26 | *date_string = end; | ||
27 | - return TRUE; | ||
28 | + return date->day >= 1 && date->day <= 31; | ||
29 | } | ||
30 | |||
31 | static inline gboolean | ||
32 | @@ -324,7 +324,7 @@ parse_year (SoupDate *date, const char **date_string) | ||
33 | while (*end == ' ' || *end == '-') | ||
34 | end++; | ||
35 | *date_string = end; | ||
36 | - return TRUE; | ||
37 | + return date->year > 0 && date->year < 9999; | ||
38 | } | ||
39 | |||
40 | static inline gboolean | ||
41 | @@ -348,7 +348,7 @@ parse_time (SoupDate *date, const char **date_string) | ||
42 | while (*p == ' ') | ||
43 | p++; | ||
44 | *date_string = p; | ||
45 | - return TRUE; | ||
46 | + return date->hour >= 0 && date->hour < 24 && date->minute >= 0 && date->minute < 60 && date->second >= 0 && date->second < 60; | ||
47 | } | ||
48 | |||
49 | static inline gboolean | ||
50 | @@ -361,8 +361,15 @@ parse_timezone (SoupDate *date, const char **date_string) | ||
51 | gulong val; | ||
52 | int sign = (**date_string == '+') ? -1 : 1; | ||
53 | val = strtoul (*date_string + 1, (char **)date_string, 10); | ||
54 | + if (val > 9999) | ||
55 | + return FALSE; | ||
56 | if (**date_string == ':') | ||
57 | - val = 60 * val + strtoul (*date_string + 1, (char **)date_string, 10); | ||
58 | + { | ||
59 | + gulong val2 = strtoul (*date_string + 1, (char **)date_string, 10); | ||
60 | + if (val > 99 || val2 > 99) | ||
61 | + return FALSE; | ||
62 | + val = 60 * val + val2; | ||
63 | + } | ||
64 | else | ||
65 | val = 60 * (val / 100) + (val % 100); | ||
66 | date->offset = sign * val; | ||
67 | @@ -407,7 +414,8 @@ parse_textual_date (SoupDate *date, const char *date_string) | ||
68 | if (!parse_month (date, &date_string) || | ||
69 | !parse_day (date, &date_string) || | ||
70 | !parse_time (date, &date_string) || | ||
71 | - !parse_year (date, &date_string)) | ||
72 | + !parse_year (date, &date_string) || | ||
73 | + !g_date_valid_dmy(date->day, date->month, date->year)) | ||
74 | return FALSE; | ||
75 | |||
76 | /* There shouldn't be a timezone, but check anyway */ | ||
77 | @@ -419,7 +427,8 @@ parse_textual_date (SoupDate *date, const char *date_string) | ||
78 | if (!parse_day (date, &date_string) || | ||
79 | !parse_month (date, &date_string) || | ||
80 | !parse_year (date, &date_string) || | ||
81 | - !parse_time (date, &date_string)) | ||
82 | + !parse_time (date, &date_string) || | ||
83 | + !g_date_valid_dmy(date->day, date->month, date->year)) | ||
84 | return FALSE; | ||
85 | |||
86 | /* This time there *should* be a timezone, but we | ||
87 | diff --git a/tests/cookies-test.c b/tests/cookies-test.c | ||
88 | index 2e2a54f..6035a86 100644 | ||
89 | --- a/tests/cookies-test.c | ||
90 | +++ b/tests/cookies-test.c | ||
91 | @@ -413,6 +413,15 @@ do_remove_feature_test (void) | ||
92 | soup_uri_free (uri); | ||
93 | } | ||
94 | |||
95 | +static void | ||
96 | +do_cookies_parsing_int32_overflow (void) | ||
97 | +{ | ||
98 | + SoupCookie *cookie = soup_cookie_parse ("Age=1;expires=3Mar9 999:9:9+ 999999999-age=main=gne=", NULL); | ||
99 | + g_assert_nonnull (cookie); | ||
100 | + g_assert_null (soup_cookie_get_expires (cookie)); | ||
101 | + soup_cookie_free (cookie); | ||
102 | +} | ||
103 | + | ||
104 | int | ||
105 | main (int argc, char **argv) | ||
106 | { | ||
107 | @@ -434,6 +443,7 @@ main (int argc, char **argv) | ||
108 | g_test_add_func ("/cookies/accept-policy-subdomains", do_cookies_subdomain_policy_test); | ||
109 | g_test_add_func ("/cookies/parsing", do_cookies_parsing_test); | ||
110 | g_test_add_func ("/cookies/parsing/no-path-null-origin", do_cookies_parsing_nopath_nullorigin); | ||
111 | + g_test_add_func ("/cookies/parsing/int32-overflow", do_cookies_parsing_int32_overflow); | ||
112 | g_test_add_func ("/cookies/get-cookies/empty-host", do_get_cookies_empty_host_test); | ||
113 | g_test_add_func ("/cookies/remove-feature", do_remove_feature_test); | ||
114 | g_test_add_func ("/cookies/secure-cookies", do_cookies_strict_secure_test); | ||
115 | -- | ||
116 | 2.34.1 | ||
117 | |||
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb b/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb index cbc886a2cb..68ec576d9b 100644 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb +++ b/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb | |||
@@ -39,6 +39,7 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ | |||
39 | file://CVE-2025-32907.patch \ | 39 | file://CVE-2025-32907.patch \ |
40 | file://CVE-2025-4948.patch \ | 40 | file://CVE-2025-4948.patch \ |
41 | file://CVE-2025-4969.patch \ | 41 | file://CVE-2025-4969.patch \ |
42 | file://CVE-2025-4945.patch \ | ||
42 | " | 43 | " |
43 | SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13" | 44 | SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13" |
44 | 45 | ||
diff --git a/meta-oe/recipes-support/portaudio/portaudio-v19/0001-allow-build-with-cmake-4.patch b/meta-oe/recipes-support/portaudio/portaudio-v19/0001-allow-build-with-cmake-4.patch new file mode 100644 index 0000000000..d6b17ce2be --- /dev/null +++ b/meta-oe/recipes-support/portaudio/portaudio-v19/0001-allow-build-with-cmake-4.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From ff000097d226f21cf05a94c22459e55cf1f5c5c6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
3 | Date: Tue, 8 Jul 2025 18:06:03 +0300 | ||
4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
5 | compatibility | ||
6 | |||
7 | Fix: | ||
8 | |||
9 | | CMake Error at CMakeLists.txt:1 (cmake_minimum_required): | ||
10 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
11 | | | ||
12 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
13 | | to tell CMake that the project requires at least <min> but has been updated | ||
14 | | to work with policies introduced by <max> or earlier. | ||
15 | | | ||
16 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
17 | | | ||
18 | | | ||
19 | | -- Configuring incomplete, errors occurred! | ||
20 | |||
21 | Upstream-Status: Backport [https://github.com/PortAudio/portaudio/commit/ccd16c85e64d8c1a5462541388b6fbcaedbb1cad] | ||
22 | |||
23 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
24 | --- | ||
25 | CMakeLists.txt | 2 +- | ||
26 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
29 | index 87d0bb8..eee16fd 100644 | ||
30 | --- a/CMakeLists.txt | ||
31 | +++ b/CMakeLists.txt | ||
32 | @@ -1,4 +1,4 @@ | ||
33 | -cmake_minimum_required(VERSION 3.1.0) | ||
34 | +cmake_minimum_required(VERSION 3.5) | ||
35 | project(PortAudio VERSION 19.8) | ||
36 | |||
37 | # | ||
38 | -- | ||
39 | 2.43.0 | ||
40 | |||
diff --git a/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb b/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb index 4451e96307..7376f7ca77 100644 --- a/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb +++ b/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb | |||
@@ -3,12 +3,10 @@ SECTION = "libs/multimedia" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=26107732c2ab637c5710446fcfaf02df" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=26107732c2ab637c5710446fcfaf02df" |
5 | 5 | ||
6 | PV .= "+git" | 6 | SRC_URI = "git://github.com/PortAudio/portaudio.git;branch=master;protocol=https \ |
7 | 7 | file://0001-allow-build-with-cmake-4.patch" | |
8 | SRC_URI = "git://github.com/PortAudio/portaudio.git;branch=master;protocol=https" | ||
9 | SRCREV = "929e2e8f7af281c5eb4fa07758930d542ec43d97" | 8 | SRCREV = "929e2e8f7af281c5eb4fa07758930d542ec43d97" |
10 | 9 | ||
11 | |||
12 | inherit cmake pkgconfig | 10 | inherit cmake pkgconfig |
13 | 11 | ||
14 | EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" | 12 | EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" |
diff --git a/meta-oe/recipes-support/uchardet/uchardet/0001-allow-build-with-cmake-4.patch b/meta-oe/recipes-support/uchardet/uchardet/0001-allow-build-with-cmake-4.patch new file mode 100644 index 0000000000..86a3b08277 --- /dev/null +++ b/meta-oe/recipes-support/uchardet/uchardet/0001-allow-build-with-cmake-4.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From b650c4c3385f7afeb70231cdbcad888d23cb0a5a Mon Sep 17 00:00:00 2001 | ||
2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
3 | Date: Tue, 8 Jul 2025 19:59:23 +0300 | ||
4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
5 | compatibility | ||
6 | |||
7 | Fix: | ||
8 | |||
9 | | CMake Error at CMakeLists.txt:2 (cmake_minimum_required): | ||
10 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
11 | | | ||
12 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
13 | | to tell CMake that the project requires at least <min> but has been updated | ||
14 | | to work with policies introduced by <max> or earlier. | ||
15 | | | ||
16 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
17 | | | ||
18 | | | ||
19 | | -- Configuring incomplete, errors occurred! | ||
20 | |||
21 | Upstream-Status: Pending | ||
22 | |||
23 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
24 | --- | ||
25 | CMakeLists.txt | 2 +- | ||
26 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
29 | index a570264..5a6281c 100644 | ||
30 | --- a/CMakeLists.txt | ||
31 | +++ b/CMakeLists.txt | ||
32 | @@ -1,5 +1,5 @@ | ||
33 | ######## Project settings | ||
34 | -cmake_minimum_required(VERSION 3.1) | ||
35 | +cmake_minimum_required(VERSION 3.5) | ||
36 | include(CheckCCompilerFlag) | ||
37 | set (PACKAGE_NAME uchardet) | ||
38 | project (${PACKAGE_NAME} CXX C) | ||
39 | -- | ||
40 | 2.43.0 | ||
41 | |||
diff --git a/meta-oe/recipes-support/uchardet/uchardet_0.0.8.bb b/meta-oe/recipes-support/uchardet/uchardet_0.0.8.bb index 3e164cc26f..75a04e6f80 100644 --- a/meta-oe/recipes-support/uchardet/uchardet_0.0.8.bb +++ b/meta-oe/recipes-support/uchardet/uchardet_0.0.8.bb | |||
@@ -4,5 +4,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6ecda54f6f525388d71d6b3cd92f7474" | |||
4 | 4 | ||
5 | inherit cmake | 5 | inherit cmake |
6 | 6 | ||
7 | SRC_URI = "https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.8.tar.xz" | 7 | SRC_URI = "https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.8.tar.xz \ |
8 | file://0001-allow-build-with-cmake-4.patch" | ||
8 | SRC_URI[sha256sum] = "e97a60cfc00a1c147a674b097bb1422abd9fa78a2d9ce3f3fdcc2e78a34ac5f0" | 9 | SRC_URI[sha256sum] = "e97a60cfc00a1c147a674b097bb1422abd9fa78a2d9ce3f3fdcc2e78a34ac5f0" |
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.7.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.7.bb index 0f4ae205b1..3e97bde86c 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.7.bb +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.7.bb | |||
@@ -59,7 +59,7 @@ do_install:append() { | |||
59 | ${libdir}/xmlsec1Conf.sh \ | 59 | ${libdir}/xmlsec1Conf.sh \ |
60 | ${libdir}/pkgconfig/xmlsec1-openssl.pc \ | 60 | ${libdir}/pkgconfig/xmlsec1-openssl.pc \ |
61 | ${libdir}/pkgconfig/xmlsec1-gnutls.pc; do | 61 | ${libdir}/pkgconfig/xmlsec1-gnutls.pc; do |
62 | sed -i -e "s@${RECIPE_SYSROOT}@@g" ${D}$i | 62 | [ -f ${D}$i ] && sed -i -e "s@${RECIPE_SYSROOT}@@g" ${D}$i || true |
63 | done | 63 | done |
64 | } | 64 | } |
65 | 65 | ||
diff --git a/meta-python/recipes-devtools/python/python3-jsonschema-default_1.8.1.bb b/meta-python/recipes-devtools/python/python3-jsonschema-default_1.8.1.bb new file mode 100644 index 0000000000..03cba50b99 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-jsonschema-default_1.8.1.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | DESCRIPTION = "A Python package that creates default objects from a JSON schema." | ||
2 | HOMEPAGE = "https://github.com/mnboos/jsonschema-default" | ||
3 | LICENSE = "AGPL-3.0-only" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4ae09d45eac4aa08d013b5f2e01c67f6" | ||
5 | |||
6 | SRC_URI[sha256sum] = "77e35e4a95519c7dbdbe25438c00af33c17bb766cbb0a29a2aa9d645ee3c1399" | ||
7 | |||
8 | PYPI_PACKAGE = "jsonschema_default" | ||
9 | |||
10 | inherit pypi python_hatchling | ||
11 | |||
12 | RDEPENDS:${PN} = "python3-rstr" | ||
13 | |||
14 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-python/recipes-devtools/python/python3-rstr_3.2.2.bb b/meta-python/recipes-devtools/python/python3-rstr_3.2.2.bb new file mode 100644 index 0000000000..1af7a3bc8f --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-rstr_3.2.2.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | DESCRIPTION = "Random Strings in Python" | ||
2 | HOMEPAGE = "https://github.com/leapfrogonline/rstr" | ||
3 | LICENSE = "BSD-3-Clause" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5c15c04f1cdbd42c6152066f0b02102a" | ||
5 | |||
6 | SRC_URI[sha256sum] = "c4a564d4dfb4472d931d145c43d1cf1ad78c24592142e7755b8866179eeac012" | ||
7 | |||
8 | inherit pypi python_setuptools_build_meta | ||
9 | |||
10 | DEPENDS += "python3-setuptools-scm-native" | ||
11 | |||
12 | BBCLASSEXTEND = "native nativesdk" | ||