summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-devtools/apitrace/apitrace/0001-Explicit-header-stdint.patch42
-rw-r--r--meta-oe/recipes-devtools/apitrace/apitrace_13.0.bb (renamed from meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb)8
-rw-r--r--meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0001-Set-Json_validator-Install-off-if-it-finds-it-via-li.patch29
-rw-r--r--meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0002-Fix-assumed-signed-char.patch71
-rw-r--r--meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0003-For-root-value-use-empty-pointer.patch41
-rw-r--r--meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0004-cmake-Use-GNUInstallDirs.patch43
-rw-r--r--meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.3.0.bb (renamed from meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.2.0.bb)12
-rw-r--r--meta-oe/recipes-devtools/json-spirit/json-spirit/0002-allow-build-with-cmake-4.patch40
-rw-r--r--meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb1
-rw-r--r--meta-oe/recipes-devtools/mbpoll/mbpoll/0001-allow-build-with-cmake-4.patch42
-rw-r--r--meta-oe/recipes-devtools/mbpoll/mbpoll_1.5.2.bb4
-rw-r--r--meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-allow-build-with-cmake-4.patch40
-rw-r--r--meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb3
-rw-r--r--meta-oe/recipes-extended/liblightmodbus/liblightmodbus/0001-cmake-Use-GNUInstallDirs-instead-of-hardcoding-lib-p.patch37
-rw-r--r--meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb14
-rw-r--r--meta-oe/recipes-extended/liblightmodbus/liblightmodbus_3.0.bb17
-rw-r--r--meta-oe/recipes-graphics/xorg-app/xterm_401.bb (renamed from meta-oe/recipes-graphics/xorg-app/xterm_394.bb)4
-rw-r--r--meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb1
-rw-r--r--meta-oe/recipes-multimedia/cdrkit/files/0003-allow-build-with-cmake-4.patch37
-rw-r--r--meta-oe/recipes-support/avro/avro-c++/0001-Remove-cpp-unittest-compilation.patch35
-rw-r--r--meta-oe/recipes-support/avro/avro-c++/0002-Add-package-configuration-files.patch32
-rw-r--r--meta-oe/recipes-support/avro/avro-c++/0003-Update-CXX-standard-to-CXX14.patch24
-rw-r--r--meta-oe/recipes-support/avro/avro-c++_1.11.3.bb27
-rw-r--r--meta-oe/recipes-support/avro/avro-c++_1.12.bb29
-rw-r--r--meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch41
-rw-r--r--meta-oe/recipes-support/cli11/cli11_2.3.2.bb25
-rw-r--r--meta-oe/recipes-support/cli11/cli11_2.5.0.bb18
27 files changed, 278 insertions, 439 deletions
diff --git a/meta-oe/recipes-devtools/apitrace/apitrace/0001-Explicit-header-stdint.patch b/meta-oe/recipes-devtools/apitrace/apitrace/0001-Explicit-header-stdint.patch
deleted file mode 100644
index 9ce6693061..0000000000
--- a/meta-oe/recipes-devtools/apitrace/apitrace/0001-Explicit-header-stdint.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 952bad1469ea747012bdc48c48993bd5f13eec04 Mon Sep 17 00:00:00 2001
2From: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
3Date: Fri, 21 Mar 2025 05:02:23 +0000
4Subject: [PATCH] Explicit header: stdint
5
6Fix building with GCC-15. It no longer includes it by default.
7
8Upstream-Status: Backport [https://github.com/apitrace/apitrace/commit/952bad1469ea747012bdc48c48993bd5f13eec04]
9
10Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
11---
12 frametrim/ft_dependecyobject.hpp | 1 +
13 retrace/metric_writer.cpp | 1 +
14 2 files changed, 2 insertions(+)
15
16diff --git a/frametrim/ft_dependecyobject.hpp b/frametrim/ft_dependecyobject.hpp
17index 2cd0b768..0f17b601 100644
18--- a/frametrim/ft_dependecyobject.hpp
19+++ b/frametrim/ft_dependecyobject.hpp
20@@ -28,6 +28,7 @@
21 #pragma once
22
23 #include "ft_tracecall.hpp"
24+#include <stdint.h>
25
26 namespace frametrim {
27
28diff --git a/retrace/metric_writer.cpp b/retrace/metric_writer.cpp
29index e923ed1d..4e4ce748 100644
30--- a/retrace/metric_writer.cpp
31+++ b/retrace/metric_writer.cpp
32@@ -24,6 +24,7 @@
33 **************************************************************************/
34
35 #include <iostream>
36+#include <stdint.h>
37
38 #include "metric_writer.hpp"
39
40--
412.34.1
42
diff --git a/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb b/meta-oe/recipes-devtools/apitrace/apitrace_13.0.bb
index 244d9a3c6f..1e41548c9b 100644
--- a/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb
+++ b/meta-oe/recipes-devtools/apitrace/apitrace_13.0.bb
@@ -5,12 +5,8 @@ LICENSE = "MIT & BSD-3-Clause"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50 \ 5LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50 \
6 file://thirdparty/snappy/COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" 6 file://thirdparty/snappy/COPYING;md5=f62f3080324a97b3159a7a7e61812d0c"
7 7
8SRCREV = "9352fc02bba106fbbeef9e8452ef34643c0d0764" 8SRCREV = "ed44bd4c6cce224e2d64533d197bea6ca4fee266"
9PV .= "+11.1+git" 9SRC_URI = "gitsm://github.com/${BPN}/${BPN}.git;branch=master;protocol=https"
10SRC_URI = "gitsm://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \
11 file://0001-Explicit-header-stdint.patch \
12 "
13
14 10
15DEPENDS += "zlib libpng python3-native" 11DEPENDS += "zlib libpng python3-native"
16 12
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 @@
1From 35939115142db6cd366ab11b29692a0179338ddf Mon Sep 17 00:00:00 2001
2From: Parian Golchin <Parian.Golchin@iris-sensing.com>
3Date: Fri, 18 Aug 2023 15:54:25 +0200
4Subject: [PATCH 1/3] Set Json_validator Install off if it finds it via linking
5
6Upstream-Status: Inappropriate [newer version of cmake in main branch]
7
8Signed-off-by: Parian Golchin <Parian.Golchin@iris-sensing.com>
9---
10 CMakeLists.txt | 3 +++
11 1 file changed, 3 insertions(+)
12
13diff --git a/CMakeLists.txt b/CMakeLists.txt
14index 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--
282.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 @@
1From 2065015da40cf79dd8ec9e3f186538e17c3b592f Mon Sep 17 00:00:00 2001
2From: Robert Joslyn <robert.joslyn@redrectangle.org>
3Date: Wed, 30 Nov 2022 13:07:29 -0800
4Subject: [PATCH 2/3] Fix assumed signed char
5
6The code assumes that char is signed, but whether char is signed or
7unsigned is implementation defined. On some architectures like PowerPC,
8GCC 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
12Fix this by specifying signed char.
13
14Upstream-Status: Backport [https://github.com/pboettch/json-schema-validator/commit/491ac44026e08f31790f5cacffa62e168bb35e32]
15
16Signed-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
21diff --git a/src/smtp-address-validator.cpp b/src/smtp-address-validator.cpp
22index 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--
702.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 @@
1From fa49c29942763285c51b7d2dea417d9f51e4961f Mon Sep 17 00:00:00 2001
2From: Sven Fink <sven.fink@wipotec.com>
3Date: Fri, 13 Jan 2023 09:15:42 +0100
4Subject: [PATCH 3/3] For root value, use empty pointer
5
6Upstream-Status: Backport [https://github.com/pboettch/json-schema-validator/commit/59c9d6200bf3cd54b4fc717ec1660c91eddb4d1a]
7
8Signed-off-by: Parian Golchin <Parian.Golchin@iris-sensing.com>
9---
10 src/json-validator.cpp | 8 ++++++++
11 1 file changed, 8 insertions(+)
12
13diff --git a/src/json-validator.cpp b/src/json-validator.cpp
14index 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--
402.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 @@
1From a42d374aa260caec5f683c75d0db322811e51ab9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 19 Mar 2022 22:40:49 -0700
4Subject: [PATCH] cmake: Use GNUInstallDirs
5
6This helps it make it platform independent, some platforms e.g.
7ppc64/linux use /usr/lib64 for system libraries
8
9Upstream-Status: Submitted [https://github.com/pboettch/json-schema-validator/pull/197]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 CMakeLists.txt | 8 +++++---
13 1 file changed, 5 insertions(+), 3 deletions(-)
14
15diff --git a/CMakeLists.txt b/CMakeLists.txt
16index 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++"
2LICENSE = "MIT" 2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://LICENSE;md5=c441d022da1b1663c70181a32225d006" 3LIC_FILES_CHKSUM = "file://LICENSE;md5=c441d022da1b1663c70181a32225d006"
4 4
5SRC_URI = "git://github.com/pboettch/json-schema-validator;branch=main;protocol=https \ 5SRC_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 \ 6SRCREV = "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
12SRCREV = "6b17782d6a5d1dee5d2c4fc5d25ffb1123913431"
13
14 7
15DEPENDS += "nlohmann-json" 8DEPENDS += "nlohmann-json"
16 9
17inherit cmake 10inherit cmake
11
18EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON -DJSON_VALIDATOR_BUILD_TESTS=OFF -DJSON_VALIDATOR_BUILD_EXAMPLES=OFF" 12EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON -DJSON_VALIDATOR_BUILD_TESTS=OFF -DJSON_VALIDATOR_BUILD_EXAMPLES=OFF"
19 13
20BBCLASSEXTEND = "native nativesdk" 14BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-devtools/json-spirit/json-spirit/0002-allow-build-with-cmake-4.patch b/meta-oe/recipes-devtools/json-spirit/json-spirit/0002-allow-build-with-cmake-4.patch
new file mode 100644
index 0000000000..4aecdc817f
--- /dev/null
+++ b/meta-oe/recipes-devtools/json-spirit/json-spirit/0002-allow-build-with-cmake-4.patch
@@ -0,0 +1,40 @@
1From 046312620cbc282fcc1ad5db0acece3a3615fb7c Mon Sep 17 00:00:00 2001
2From: Alper Ak <alperyasinak1@gmail.com>
3Date: Mon, 7 Jul 2025 21:51:01 +0300
4Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+
5 compatibility
6
7Fix:
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
21Upstream-Status: Pending
22
23Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
24---
25 CMakeLists.txt | 2 +-
26 1 file changed, 1 insertion(+), 1 deletion(-)
27
28diff --git a/CMakeLists.txt b/CMakeLists.txt
29index b292f0f..0c797fa 100644
30--- a/CMakeLists.txt
31+++ b/CMakeLists.txt
32@@ -1,4 +1,4 @@
33-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
34+CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
35
36 PROJECT(json_spirit)
37 SUBDIRS(json_spirit json_demo json_headers_only_demo json_map_demo)
38--
392.43.0
40
diff --git a/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb b/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
index 56ddaf59a5..001d52d597 100644
--- a/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
+++ b/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
@@ -14,6 +14,7 @@ DEPENDS = "boost"
14SRC_URI = "file://json_spirit_v${PV}.zip \ 14SRC_URI = "file://json_spirit_v${PV}.zip \
15 file://0001-Adjust-the-cmake-files.patch \ 15 file://0001-Adjust-the-cmake-files.patch \
16 file://0001-Link-to-libatomic.patch \ 16 file://0001-Link-to-libatomic.patch \
17 file://0002-allow-build-with-cmake-4.patch \
17" 18"
18 19
19S = "${UNPACKDIR}/json_spirit_v${PV}" 20S = "${UNPACKDIR}/json_spirit_v${PV}"
diff --git a/meta-oe/recipes-devtools/mbpoll/mbpoll/0001-allow-build-with-cmake-4.patch b/meta-oe/recipes-devtools/mbpoll/mbpoll/0001-allow-build-with-cmake-4.patch
new file mode 100644
index 0000000000..25f4692856
--- /dev/null
+++ b/meta-oe/recipes-devtools/mbpoll/mbpoll/0001-allow-build-with-cmake-4.patch
@@ -0,0 +1,42 @@
1From 765fbaea85b723893c0c27d5527df479ab6abc46 Mon Sep 17 00:00:00 2001
2From: Alper Ak <alperyasinak1@gmail.com>
3Date: Mon, 7 Jul 2025 20:09:45 +0300
4Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+
5 compatibility
6
7Fix:
8
9| CMake Error at CMakeLists.txt:3 (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
21Upstream-Status: Submitted [https://github.com/epsilonrt/mbpoll/pull/95]
22
23Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
24---
25 CMakeLists.txt | 2 +-
26 1 file changed, 1 insertion(+), 1 deletion(-)
27
28diff --git a/CMakeLists.txt b/CMakeLists.txt
29index 6daa039..af32354 100644
30--- a/CMakeLists.txt
31+++ b/CMakeLists.txt
32@@ -1,6 +1,6 @@
33 # -*- CMakeLists.txt generated by CodeLite IDE. Do not edit by hand -*-
34
35-cmake_minimum_required(VERSION 2.9)
36+cmake_minimum_required(VERSION 3.5)
37
38 # Workspace name
39 project(mbpoll)
40--
412.43.0
42
diff --git a/meta-oe/recipes-devtools/mbpoll/mbpoll_1.5.2.bb b/meta-oe/recipes-devtools/mbpoll/mbpoll_1.5.2.bb
index 4590b49955..82afe632fd 100644
--- a/meta-oe/recipes-devtools/mbpoll/mbpoll_1.5.2.bb
+++ b/meta-oe/recipes-devtools/mbpoll/mbpoll_1.5.2.bb
@@ -8,8 +8,8 @@ HOMEPAGE = "https://github.com/epsilonrt/mbpoll"
8LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" 8LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
9DEPENDS = "libmodbus (>=3.1.4)" 9DEPENDS = "libmodbus (>=3.1.4)"
10 10
11SRC_URI = "git://github.com/epsilonrt/mbpoll;protocol=https;branch=master" 11SRC_URI = "git://github.com/epsilonrt/mbpoll;protocol=https;branch=master \
12 file://0001-allow-build-with-cmake-4.patch"
12SRCREV = "a0bd6c08d3d15b086f2104477295c0705aed366a" 13SRCREV = "a0bd6c08d3d15b086f2104477295c0705aed366a"
13 14
14
15inherit pkgconfig cmake 15inherit pkgconfig cmake
diff --git a/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-allow-build-with-cmake-4.patch b/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-allow-build-with-cmake-4.patch
new file mode 100644
index 0000000000..1990325d92
--- /dev/null
+++ b/meta-oe/recipes-extended/docopt.cpp/docopt.cpp/0001-allow-build-with-cmake-4.patch
@@ -0,0 +1,40 @@
1From 60c7540d1633e1bf14f0858bba8a8ea313a55e7d Mon Sep 17 00:00:00 2001
2From: Alper Ak <alperyasinak1@gmail.com>
3Date: Mon, 7 Jul 2025 21:03:52 +0300
4Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+
5 compatibility
6
7Fix:
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
21Upstream-Status: Submitted [https://github.com/docopt/docopt.cpp/pull/164]
22
23Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
24---
25 CMakeLists.txt | 2 +-
26 1 file changed, 1 insertion(+), 1 deletion(-)
27
28diff --git a/CMakeLists.txt b/CMakeLists.txt
29index feff32e..2768144 100644
30--- a/CMakeLists.txt
31+++ b/CMakeLists.txt
32@@ -1,4 +1,4 @@
33-cmake_minimum_required(VERSION 3.1)
34+cmake_minimum_required(VERSION 3.5)
35 project(docopt.cpp VERSION 0.6.2)
36
37 include(GNUInstallDirs)
38--
392.43.0
40
diff --git a/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb b/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
index 71305cc35f..cc13fd1067 100644
--- a/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
+++ b/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
@@ -18,8 +18,7 @@ PV = "0.6.3+git"
18 18
19SRC_URI = "\ 19SRC_URI = "\
20 git://github.com/docopt/docopt.cpp.git;protocol=https;branch=master \ 20 git://github.com/docopt/docopt.cpp.git;protocol=https;branch=master \
21" 21 file://0001-allow-build-with-cmake-4.patch"
22
23 22
24inherit cmake 23inherit cmake
25 24
diff --git a/meta-oe/recipes-extended/liblightmodbus/liblightmodbus/0001-cmake-Use-GNUInstallDirs-instead-of-hardcoding-lib-p.patch b/meta-oe/recipes-extended/liblightmodbus/liblightmodbus/0001-cmake-Use-GNUInstallDirs-instead-of-hardcoding-lib-p.patch
deleted file mode 100644
index 321b41289d..0000000000
--- a/meta-oe/recipes-extended/liblightmodbus/liblightmodbus/0001-cmake-Use-GNUInstallDirs-instead-of-hardcoding-lib-p.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 066c49158a71ea77598c9e1ae16bba63d6ac6bb5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 19 Dec 2019 23:41:35 -0800
4Subject: [PATCH] cmake: Use GNUInstallDirs instead of hardcoding lib path
5
6Upstream-Status: Submitted [https://github.com/Jacajack/liblightmodbus/pull/12]
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 CMakeLists.txt | 6 +++---
10 1 file changed, 3 insertions(+), 3 deletions(-)
11
12diff --git a/CMakeLists.txt b/CMakeLists.txt
13index ce6cc88..bee83aa 100644
14--- a/CMakeLists.txt
15+++ b/CMakeLists.txt
16@@ -242,14 +242,14 @@ if ( DEFINED AVR )
17 )
18 endif( )
19
20-
21+include(GNUInstallDirs)
22 #Installation
23 install(
24 TARGETS lightmodbus
25- ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/"
26+ ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/"
27 )
28
29 #Install headers
30 install(
31 DIRECTORY "${CMAKE_SOURCE_DIR}/include/" DESTINATION "${CMAKE_INSTALL_PREFIX}/include/" FILES_MATCHING PATTERN "*.h"
32-)
33\ No newline at end of file
34+)
35--
362.24.1
37
diff --git a/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb b/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb
deleted file mode 100644
index c310e0f527..0000000000
--- a/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1SUMMARY = "A cross-platform, lightweight Modbus RTU library"
2DESCRIPTION = "liblightmodbus is a very lightweight, highly configurable, \
3 platform-independent Modbus RTU library."
4
5LICENSE = "GPL-3.0-only"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
7
8inherit cmake pkgconfig
9
10SRC_URI = "git://github.com/Jacajack/liblightmodbus.git;protocol=https;branch=master \
11 file://0001-cmake-Use-GNUInstallDirs-instead-of-hardcoding-lib-p.patch \
12 "
13SRCREV = "59d2b405f95701e5b04326589786dbb43ce49e81"
14
diff --git a/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_3.0.bb b/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_3.0.bb
new file mode 100644
index 0000000000..5f1233b2b4
--- /dev/null
+++ b/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_3.0.bb
@@ -0,0 +1,17 @@
1SUMMARY = "A cross-platform, lightweight Modbus RTU library"
2DESCRIPTION = "liblightmodbus is a very lightweight, highly configurable, \
3 platform-independent Modbus RTU library."
4
5LICENSE = "GPL-3.0-only"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
7
8SRC_URI = "git://github.com/Jacajack/liblightmodbus.git;protocol=https;nobranch=1;tag=v${PV}"
9SRCREV = "e7be88bc65abec4a902f4e5194d7235ebd3a19aa"
10
11do_install() {
12 install -d ${D}${includedir}/lightmodbus
13 install -m 0644 ${S}/include/lightmodbus/*.h ${D}${includedir}/lightmodbus/
14
15 install -d ${D}${libdir}/cmake/lightmodbus
16 install -m 0644 ${S}/lightmodbusConfig.cmake ${D}${libdir}/cmake/lightmodbus/
17}
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_394.bb b/meta-oe/recipes-graphics/xorg-app/xterm_401.bb
index 94953b288e..3543eff33c 100644
--- a/meta-oe/recipes-graphics/xorg-app/xterm_394.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xterm_401.bb
@@ -2,12 +2,12 @@ require recipes-graphics/xorg-app/xorg-app-common.inc
2SUMMARY = "xterm is the standard terminal emulator for the X Window System" 2SUMMARY = "xterm is the standard terminal emulator for the X Window System"
3DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native" 3DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native"
4 4
5LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=1a3032aa728f8fda9d686948940ca58d" 5LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=170620b648626a97057ff6ea99e6396e"
6 6
7SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ 7SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \
8 file://0001-include-missing-pty.h-header-for-openpty.patch \ 8 file://0001-include-missing-pty.h-header-for-openpty.patch \
9 " 9 "
10SRC_URI[sha256sum] = "a2a0cb206eb0423dedc34794f5c2d38c83390d2dd1106b66aba0960c3a976c7a" 10SRC_URI[sha256sum] = "3da2b5e64cb49b03aa13057d85e62e1f2e64f7c744719c00d338d11cd3e6ca1a"
11 11
12PACKAGECONFIG ?= "" 12PACKAGECONFIG ?= ""
13PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" 13PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native"
diff --git a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
index 4b57957cfc..16b15f745e 100644
--- a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
+++ b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
@@ -14,6 +14,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \
14 file://0001-add-new-option-eltorito-platform.patch \ 14 file://0001-add-new-option-eltorito-platform.patch \
15 file://0001-genisoimage-Add-checksum.h-and-md5.h-for-function-pr.patch \ 15 file://0001-genisoimage-Add-checksum.h-and-md5.h-for-function-pr.patch \
16 file://fix-incompatible-pointer-type-error.patch \ 16 file://fix-incompatible-pointer-type-error.patch \
17 file://0003-allow-build-with-cmake-4.patch \
17 " 18 "
18SRC_URI:append:class-nativesdk = " \ 19SRC_URI:append:class-nativesdk = " \
19 file://0001-install-netscsid-to-bin-for-nativesdk.patch \ 20 file://0001-install-netscsid-to-bin-for-nativesdk.patch \
diff --git a/meta-oe/recipes-multimedia/cdrkit/files/0003-allow-build-with-cmake-4.patch b/meta-oe/recipes-multimedia/cdrkit/files/0003-allow-build-with-cmake-4.patch
new file mode 100644
index 0000000000..bcab44a5a4
--- /dev/null
+++ b/meta-oe/recipes-multimedia/cdrkit/files/0003-allow-build-with-cmake-4.patch
@@ -0,0 +1,37 @@
1From 4ce4c135f83f9d7894ccbb0901391f5cbf2b1935 Mon Sep 17 00:00:00 2001
2From: Alper Ak <alperyasinak1@gmail.com>
3Date: Mon, 7 Jul 2025 21:34:32 +0300
4Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+
5 compatibility
6
7| CMake Error in CMakeLists.txt:
8| No cmake_minimum_required command is present. A line of code such as
9|
10| cmake_minimum_required(VERSION 4.0)
11|
12| should be added at the top of the file. The version specified may be lower
13| if you wish to support older CMake versions for this project. For more
14| information run "cmake --help-policy CMP0000".
15|
16|
17| -- Configuring incomplete, errors occurred!
18
19Upstream-Status: Pending
20
21Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
22---
23 CMakeLists.txt | 1 +
24 1 file changed, 1 insertion(+)
25
26diff --git a/CMakeLists.txt b/CMakeLists.txt
27index 57edba6..bdfb8bb 100644
28--- a/CMakeLists.txt
29+++ b/CMakeLists.txt
30@@ -1,3 +1,4 @@
31+cmake_minimum_required(VERSION 3.5)
32 PROJECT (cdrkit C)
33 SUBDIRS(include genisoimage wodim libedc libhfs_iso libparanoia icedax libusal librols libunls readom netscsid 3rd-party/dirsplit)
34
35--
362.43.0
37
diff --git a/meta-oe/recipes-support/avro/avro-c++/0001-Remove-cpp-unittest-compilation.patch b/meta-oe/recipes-support/avro/avro-c++/0001-Remove-cpp-unittest-compilation.patch
index bcfafdda55..f33c653069 100644
--- a/meta-oe/recipes-support/avro/avro-c++/0001-Remove-cpp-unittest-compilation.patch
+++ b/meta-oe/recipes-support/avro/avro-c++/0001-Remove-cpp-unittest-compilation.patch
@@ -1,32 +1,34 @@
1From 6be1c45e1f7ee78499bdca76c25ec23a61317134 Mon Sep 17 00:00:00 2001 1From d75f0c5e7a51c9874edad0ea60957e006fb6def5 Mon Sep 17 00:00:00 2001
2From: Rui Costa <rui.ms.costa@ctw.bmwgroup.com> 2From: Rui Costa <rui.ms.costa@ctw.bmwgroup.com>
3Date: Wed, 20 Mar 2024 14:58:27 +0000 3Date: Mon, 7 Jul 2025 16:58:30 +0300
4Subject: [PATCH] Remove cpp unittest compilation 4Subject: [PATCH] Remove cpp unittest compilation
5 5
6Upstream-Status: Inappropriate [oe-specific] 6Upstream-Status: Inappropriate [oe-specific]
7 7
8Signed-off-by: Rui Costa <rui.ms.costa@ctw.bmwgroup.com>
9Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
8--- 10---
9 lang/c++/CMakeLists.txt | 61 ----------------------------------------- 11 lang/c++/CMakeLists.txt | 65 -----------------------------------------
10 1 file changed, 61 deletions(-) 12 1 file changed, 65 deletions(-)
11 13
12diff --git a/CMakeLists.txt b/CMakeLists.txt 14diff --git a/CMakeLists.txt b/CMakeLists.txt
13index 4a3793152..d94ba42d3 100644 15index 19059a41b..1f5f98c83 100644
14--- a/CMakeLists.txt 16--- a/CMakeLists.txt
15+++ b/CMakeLists.txt 17+++ b/CMakeLists.txt
16@@ -131,70 +131,9 @@ set_target_properties (avrocpp_s PROPERTIES 18@@ -149,39 +149,6 @@ set_target_properties (avrocpp_s PROPERTIES
17 target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) 19 target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} fmt::fmt-header-only)
18 target_include_directories(avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR}) 20 target_include_directories(avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR})
19 21
20-add_executable (precompile test/precompile.cc) 22-add_executable (precompile test/precompile.cc)
21- 23-
22-target_link_libraries (precompile avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) 24-target_link_libraries (precompile avrocpp_s)
23- 25-
24-macro (gen file ns) 26-macro (gen file ns)
25- add_custom_command (OUTPUT ${file}.hh 27- add_custom_command (OUTPUT ${file}.hh
26- COMMAND avrogencpp 28- COMMAND avrogencpp
27- -p - 29- -p -
28- -i ${CMAKE_CURRENT_SOURCE_DIR}/jsonschemas/${file} 30- -i ${CMAKE_CURRENT_SOURCE_DIR}/jsonschemas/${file}
29- -o ${file}.hh -n ${ns} -U 31- -o ${file}.hh -n ${ns}
30- DEPENDS avrogencpp ${CMAKE_CURRENT_SOURCE_DIR}/jsonschemas/${file}) 32- DEPENDS avrogencpp ${CMAKE_CURRENT_SOURCE_DIR}/jsonschemas/${file})
31- add_custom_target (${file}_hh DEPENDS ${file}.hh) 33- add_custom_target (${file}_hh DEPENDS ${file}.hh)
32-endmacro (gen) 34-endmacro (gen)
@@ -39,6 +41,7 @@ index 4a3793152..d94ba42d3 100644
39-gen (union_array_union uau) 41-gen (union_array_union uau)
40-gen (union_map_union umu) 42-gen (union_map_union umu)
41-gen (union_conflict uc) 43-gen (union_conflict uc)
44-gen (union_empty_record uer)
42-gen (recursive rec) 45-gen (recursive rec)
43-gen (reuse ru) 46-gen (reuse ru)
44-gen (circulardep cd) 47-gen (circulardep cd)
@@ -47,9 +50,14 @@ index 4a3793152..d94ba42d3 100644
47-gen (crossref cr) 50-gen (crossref cr)
48-gen (primitivetypes pt) 51-gen (primitivetypes pt)
49-gen (cpp_reserved_words cppres) 52-gen (cpp_reserved_words cppres)
53-gen (cpp_reserved_words_union_typedef cppres_union)
50- 54-
51 add_executable (avrogencpp impl/avrogencpp.cc) 55 add_executable (avrogencpp impl/avrogencpp.cc)
52 target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) 56 target_link_libraries (avrogencpp avrocpp_s)
57
58@@ -194,38 +161,6 @@ target_include_directories(avrocpp PUBLIC
59 $<INSTALL_INTERFACE:include>
60 )
53 61
54-enable_testing() 62-enable_testing()
55- 63-
@@ -72,6 +80,7 @@ index 4a3793152..d94ba42d3 100644
72-unittest (AvrogencppTests) 80-unittest (AvrogencppTests)
73-unittest (CompilerTests) 81-unittest (CompilerTests)
74-unittest (AvrogencppTestReservedWords) 82-unittest (AvrogencppTestReservedWords)
83-unittest (CommonsSchemasTests)
75- 84-
76-add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh) 85-add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh)
77- 86-
@@ -79,8 +88,12 @@ index 4a3793152..d94ba42d3 100644
79- tweet_hh 88- tweet_hh
80- union_array_union_hh union_map_union_hh union_conflict_hh 89- union_array_union_hh union_map_union_hh union_conflict_hh
81- recursive_hh reuse_hh circulardep_hh tree1_hh tree2_hh crossref_hh 90- recursive_hh reuse_hh circulardep_hh tree1_hh tree2_hh crossref_hh
82- primitivetypes_hh empty_record_hh) 91- primitivetypes_hh empty_record_hh cpp_reserved_words_union_typedef_hh
92- union_empty_record_hh)
83- 93-
84 include (InstallRequiredSystemLibraries) 94 include (InstallRequiredSystemLibraries)
85 95
86 set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}") 96 set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}")
97--
982.43.0
99
diff --git a/meta-oe/recipes-support/avro/avro-c++/0002-Add-package-configuration-files.patch b/meta-oe/recipes-support/avro/avro-c++/0002-Add-package-configuration-files.patch
index 437a3fa138..982e37d5b8 100644
--- a/meta-oe/recipes-support/avro/avro-c++/0002-Add-package-configuration-files.patch
+++ b/meta-oe/recipes-support/avro/avro-c++/0002-Add-package-configuration-files.patch
@@ -1,21 +1,23 @@
1From 86aa3f2333a9b8e6f1c631e6d5cb7296b6e8380b Mon Sep 17 00:00:00 2001 1From 01a29c294c898cf6e13fb500b8514e9982982e1f Mon Sep 17 00:00:00 2001
2From: Rui Costa <rui.ms.costa@ctw.bmwgroup.com> 2From: Rui Costa <rui.ms.costa@ctw.bmwgroup.com>
3Date: Fri, 22 Mar 2024 13:27:38 +0000 3Date: Mon, 7 Jul 2025 18:16:35 +0300
4Subject: [PATCH] Add package configuration files 4Subject: [PATCH] Add package configuration files
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
8Signed-off-by: Rui Costa <rui.ms.costa@ctw.bmwgroup.com>
9Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
8--- 10---
9 lang/c++/CMakeLists.txt | 45 ++++++++++++++++++++++++------ 11 lang/c++/CMakeLists.txt | 46 ++++++++++++++++++++++++------
10 lang/c++/cmake/AvroCppConfig.cmake | 5 ++++ 12 lang/c++/cmake/AvroCppConfig.cmake | 5 ++++
11 2 files changed, 42 insertions(+), 8 deletions(-) 13 2 files changed, 43 insertions(+), 8 deletions(-)
12 create mode 100644 lang/c++/cmake/AvroCppConfig.cmake 14 create mode 100644 lang/c++/cmake/AvroCppConfig.cmake
13 15
14diff --git a/CMakeLists.txt b/CMakeLists.txt 16diff --git a/CMakeLists.txt b/CMakeLists.txt
15index d94ba42d3..4748b111d 100644 17index 1f5f98c83..73596a6cf 100644
16--- a/CMakeLists.txt 18--- a/CMakeLists.txt
17+++ b/CMakeLists.txt 19+++ b/CMakeLists.txt
18@@ -140,14 +140,18 @@ set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}") 20@@ -167,18 +167,48 @@ set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}")
19 21
20 include (CPack) 22 include (CPack)
21 23
@@ -26,23 +28,24 @@ index d94ba42d3..4748b111d 100644
26- 28-
27-install (TARGETS avrogencpp RUNTIME DESTINATION bin) 29-install (TARGETS avrogencpp RUNTIME DESTINATION bin)
28- 30-
29-install (DIRECTORY api/ DESTINATION include/avro 31-install (DIRECTORY include/avro DESTINATION include
30+install (TARGETS avrocpp 32+install(TARGETS avrocpp
31+ EXPORT AvroCppTargets 33+ EXPORT AvroCppTargets
32+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} 34+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
33+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} 35+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
34+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} 36+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
35+ INCLUDES DESTINATION include) 37+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
36+ 38+
37+install (TARGETS avrogencpp 39+install(TARGETS avrogencpp
38+ EXPORT AvroCppTargets 40+ EXPORT AvroCppTargets
39+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 41+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
40+ 42+
41+install (DIRECTORY api/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/avro 43+install(DIRECTORY include/avro DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
42 FILES_MATCHING PATTERN *.hh) 44 FILES_MATCHING PATTERN *.hh)
43 45
46+
44 if (NOT CMAKE_BUILD_TYPE) 47 if (NOT CMAKE_BUILD_TYPE)
45@@ -155,3 +159,28 @@ if (NOT CMAKE_BUILD_TYPE) 48 set (CMAKE_BUILD_TYPE Release CACHE STRING
46 "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." 49 "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
47 FORCE) 50 FORCE)
48 endif (NOT CMAKE_BUILD_TYPE) 51 endif (NOT CMAKE_BUILD_TYPE)
@@ -71,7 +74,7 @@ index d94ba42d3..4748b111d 100644
71+ "${CMAKE_CURRENT_BINARY_DIR}/AvroCppConfigVersion.cmake" 74+ "${CMAKE_CURRENT_BINARY_DIR}/AvroCppConfigVersion.cmake"
72+ DESTINATION ${ConfigPackageLocation} 75+ DESTINATION ${ConfigPackageLocation}
73+ COMPONENT Devel) 76+ COMPONENT Devel)
74diff --git a/cmake/AvroCppConfig.cmake b/cmake/AvroCppConfig.cmake 77diff --git a/lang/c++/cmake/AvroCppConfig.cmake b/lang/c++/cmake/AvroCppConfig.cmake
75new file mode 100644 78new file mode 100644
76index 000000000..deb8aaa31 79index 000000000..deb8aaa31
77--- /dev/null 80--- /dev/null
@@ -82,3 +85,6 @@ index 000000000..deb8aaa31
82+ COMPONENTS filesystem iostreams program_options regex system) 85+ COMPONENTS filesystem iostreams program_options regex system)
83+ 86+
84+include("${CMAKE_CURRENT_LIST_DIR}/AvroCppTargets.cmake") 87+include("${CMAKE_CURRENT_LIST_DIR}/AvroCppTargets.cmake")
88--
892.43.0
90
diff --git a/meta-oe/recipes-support/avro/avro-c++/0003-Update-CXX-standard-to-CXX14.patch b/meta-oe/recipes-support/avro/avro-c++/0003-Update-CXX-standard-to-CXX14.patch
deleted file mode 100644
index 3e65cb7a72..0000000000
--- a/meta-oe/recipes-support/avro/avro-c++/0003-Update-CXX-standard-to-CXX14.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From 66c08ade24e4472b5af5dca48097ed9a2ec035ec Mon Sep 17 00:00:00 2001
2From: Rui Costa <rui.ms.costa@ctw.bmwgroup.com>
3Date: Fri, 5 Apr 2024 11:33:51 +0000
4Subject: [PATCH] Update CXX standard to CXX14
5
6Upstream-Status: Inappropriate [oe-specific]
7
8---
9 lang/c++/CMakeLists.txt | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/CMakeLists.txt b/CMakeLists.txt
13index 4748b111d..1e45c13d5 100644
14--- a/CMakeLists.txt
15+++ b/CMakeLists.txt
16@@ -21,7 +21,7 @@ cmake_minimum_required (VERSION 3.1)
17 set (CMAKE_LEGACY_CYGWIN_WIN32 0)
18
19 if (NOT DEFINED CMAKE_CXX_STANDARD)
20- set(CMAKE_CXX_STANDARD 11)
21+ set(CMAKE_CXX_STANDARD 14)
22 endif()
23
24 set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb b/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb
deleted file mode 100644
index c1e8863fb3..0000000000
--- a/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb
+++ /dev/null
@@ -1,27 +0,0 @@
1SUMMARY = "Apache Avro data serialization system."
2HOMEPAGE = "https://avro.apache.org/"
3SECTION = "libs"
4
5LICENSE = "Apache-2.0"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=43abf34d8b9908494f83c55d213a7f89"
7
8DEPENDS = "boost zlib xz"
9
10BRANCH = "branch-1.11"
11SRCREV = "35ff8b997738e4d983871902d47bfb67b3250734"
12SRC_URI = "git://github.com/apache/avro;branch=${BRANCH};protocol=https \
13 file://0001-Remove-cpp-unittest-compilation.patch \
14 file://0002-Add-package-configuration-files.patch \
15 file://0003-Update-CXX-standard-to-CXX14.patch \
16 "
17
18S = "${UNPACKDIR}/${BP}/lang/c++"
19
20inherit cmake pkgconfig
21
22BBCLASSEXTEND = "native nativesdk"
23
24# http://errors.yoctoproject.org/Errors/Details/766913/
25# avro-c++/1.11.3/git/lang/c++/impl/Compiler.cc:304:18: error: possibly dangling reference to a temporary [-Werror=dangling-reference]
26# avro-c++/1.11.3/git/lang/c++/impl/Compiler.cc:370:18: error: possibly dangling reference to a temporary [-Werror=dangling-reference]
27CXXFLAGS += "-Wno-error=dangling-reference"
diff --git a/meta-oe/recipes-support/avro/avro-c++_1.12.bb b/meta-oe/recipes-support/avro/avro-c++_1.12.bb
new file mode 100644
index 0000000000..726a861bc9
--- /dev/null
+++ b/meta-oe/recipes-support/avro/avro-c++_1.12.bb
@@ -0,0 +1,29 @@
1SUMMARY = "Apache Avro data serialization system."
2HOMEPAGE = "https://avro.apache.org/"
3SECTION = "libs"
4
5LICENSE = "Apache-2.0"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=34cb96edab958a981837bf6f44bf654d"
7
8DEPENDS = "boost"
9
10SRC_URI = "git://github.com/apache/avro.git;branch=branch-1.12;protocol=https;name=avro-c++ \
11 git://github.com/fmtlib/fmt.git;branch=10.x;protocol=https;name=fmt;destsuffix=_deps/fmt-src \
12 file://0001-Remove-cpp-unittest-compilation.patch \
13 file://0002-Add-package-configuration-files.patch"
14
15SRCREV_FORMAT = "avro-c++ fmt"
16SRCREV_avro-c++ = "8c27801dc8d42ccc00997f25c0b8f45f8d4a233e"
17# Tag 10.2.1
18SRCREV_fmt = "e69e5f977d458f2650bb346dadf2ad30c5320281"
19
20S = "${UNPACKDIR}/${BP}/lang/c++"
21
22inherit cmake pkgconfig
23
24do_configure:prepend() {
25 install -d ${B}/_deps
26 cp -r ${UNPACKDIR}/_deps/fmt-src ${B}/_deps/
27}
28
29BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch b/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch
deleted file mode 100644
index 7e6611b6a8..0000000000
--- a/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 93557d5c5acf9ebb2c0fa708658e1d36621dd23a Mon Sep 17 00:00:00 2001
2From: Wang Mingyu <wangmy@fujitsu.com>
3Date: Wed, 7 Sep 2022 10:05:15 +0900
4Subject: [PATCH] Do not download the catch framework during configure.
5
6Upstream-Status: Inappropriate [configuration]
7
8Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
9---
10 tests/CMakeLists.txt | 15 ---------------
11 1 file changed, 15 deletions(-)
12
13diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
14index 80c4f6a..ae210db 100644
15--- a/tests/CMakeLists.txt
16+++ b/tests/CMakeLists.txt
17@@ -74,21 +74,6 @@ if(Catch2_FOUND)
18 endif()
19 message(STATUS "Found Catch2")
20 target_link_libraries(catch_main PUBLIC Catch2::Catch2)
21-else()
22- message(STATUS "Downloading Catch2")
23-
24- # FetchContent would be better, but requires newer CMake.
25- file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/catch2")
26- set(url https://github.com/philsquared/Catch/releases/download/v2.13.7/catch.hpp)
27- file(
28- DOWNLOAD ${url} "${CMAKE_CURRENT_BINARY_DIR}/catch2/catch.hpp"
29- STATUS status
30- EXPECTED_HASH SHA256=ea379c4a3cb5799027b1eb451163dff065a3d641aaba23bf4e24ee6b536bd9bc)
31- list(GET status 0 error)
32- if(error)
33- message(FATAL_ERROR "Could not download ${url}, and Catch2 not found on your system.")
34- endif()
35- target_include_directories(catch_main PUBLIC "${CMAKE_CURRENT_BINARY_DIR}")
36 endif()
37
38 # Target must already exist
39--
402.25.1
41
diff --git a/meta-oe/recipes-support/cli11/cli11_2.3.2.bb b/meta-oe/recipes-support/cli11/cli11_2.3.2.bb
deleted file mode 100644
index 346ccd6c69..0000000000
--- a/meta-oe/recipes-support/cli11/cli11_2.3.2.bb
+++ /dev/null
@@ -1,25 +0,0 @@
1SUMMARY = "C++11 command line parser"
2DESCRIPTION = "A command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface."
3HOMEPAGE = "https://github.com/CLIUtils/CLI11"
4LICENSE = "BSD-3-Clause"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=afb20fe5f67e21074b10b864d9563c11"
6SRCREV = "291c58789c031208f08f4f261a858b5b7083e8e2"
7PV .= "+git"
8
9SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=main;protocol=https \
10 https://github.com/philsquared/Catch/releases/download/v2.13.7/catch.hpp \
11 file://0001-Do-not-download-the-catch-framework-during-configure.patch"
12
13SRC_URI[sha256sum] = "ea379c4a3cb5799027b1eb451163dff065a3d641aaba23bf4e24ee6b536bd9bc"
14
15do_configure:prepend() {
16 mkdir -p ${S}/tests/catch2
17 cp ${DL_DIR}/catch.hpp ${S}/tests/catch2/catch.hpp
18}
19
20inherit cmake
21
22# cli11 is a header only C++ library, so the main package will be empty.
23RDEPENDS:${PN}-dev = ""
24
25BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/cli11/cli11_2.5.0.bb b/meta-oe/recipes-support/cli11/cli11_2.5.0.bb
new file mode 100644
index 0000000000..82203b3019
--- /dev/null
+++ b/meta-oe/recipes-support/cli11/cli11_2.5.0.bb
@@ -0,0 +1,18 @@
1SUMMARY = "C++11 command line parser"
2DESCRIPTION = "A command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface."
3HOMEPAGE = "https://github.com/CLIUtils/CLI11"
4LICENSE = "BSD-3-Clause"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=b8bdde6bda8508bef68a39f3e0d7e939"
6
7DEPENDS = "catch2"
8
9SRCREV = "4160d259d961cd393fd8d67590a8c7d210207348"
10SRC_URI = "gitsm://github.com/CLIUtils/CLI11;branch=main;protocol=https"
11SRC_URI[sha256sum] = "ea379c4a3cb5799027b1eb451163dff065a3d641aaba23bf4e24ee6b536bd9bc"
12
13inherit cmake
14
15# cli11 is a header only C++ library, so the main package will be empty.
16RDEPENDS:${PN}-dev = ""
17
18BBCLASSEXTEND = "native nativesdk"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-08 05:03:25 +0000