From patchwork Fri Jul 11 10:00:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Haase X-Patchwork-Id: 66611 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4A45C83F1D for ; Fri, 11 Jul 2025 10:01:36 +0000 (UTC) Received: from esa14.hc324-48.eu.iphmx.com (esa14.hc324-48.eu.iphmx.com [207.54.69.24]) by mx.groups.io with SMTP id smtpd.web11.10145.1752228086364171799 for ; Fri, 11 Jul 2025 03:01:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bmw.de header.s=mailing1 header.b=O6BxGPP8; spf=pass (domain: bmw.de, ip: 207.54.69.24, mailfrom: prvs=28004f72d=moritz.haase@bmw.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmw.de; i=@bmw.de; q=dns/txt; s=mailing1; t=1752228086; x=1783764086; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=m0YXc3tXkqNHIxO2LcBZuSYFm0fBGCngNd1MtvTFg3k=; b=O6BxGPP8ISC0xIm2RdMJmxF3Po40htZ/6DoaOOL71B/r0iueK9B+l1dP /+RwxB8+CXwUKSwWAS90Fq9l48CGsAuo8S0hj+4+GM0jVkngM3yq4Czmg 83CEusBu71YqCELEWjssz1Ox7rPlY2plpiikpreplc68U2BGsMctCzO0E s=; X-CSE-ConnectionGUID: 60qjpYQOSTODvxEjuKEWsg== X-CSE-MsgGUID: JCJKpPCbSnOxmb08bvD8oA== Received: from 160.46.252.34.spf.bmwgroup.com (HELO esagw1.muc) ([160.46.252.34]) by esa14.hc324-48.eu.iphmx.com with ESMTP/TLS; 11 Jul 2025 12:01:23 +0200 Received: from esabb1.muc ([160.50.100.31]) by esagw1.muc with ESMTP/TLS; 11 Jul 2025 12:01:24 +0200 Received: from smucmp12a.bmwgroup.net (HELO smucmp12a.europe.bmw.corp) ([10.30.13.95]) by esabb1.muc with ESMTP/TLS; 11 Jul 2025 12:01:24 +0200 Received: from q1054628.de-cci.bmwgroup.net (10.30.85.215) by smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) with Microsoft SMTP Server (version=TLS; Fri, 11 Jul 2025 12:01:23 +0200 X-CSE-ConnectionGUID: QsUmZNE/SpaXEkizcM1H2g== X-CSE-MsgGUID: HJ1vzTMfSVGQ2BbHDlFQjw== X-CSE-ConnectionGUID: mPZ95d/sTy2YxF+oquQKnA== X-CSE-MsgGUID: rchRxX4zRrCX5tbSmKkCSA== From: Moritz Haase To: CC: Moritz Haase Subject: [meta-oe][PATCH 01/10] zeromq: Backport patches to support builds with CMake 4+ Date: Fri, 11 Jul 2025 12:00:18 +0200 Message-ID: <20250711100052.255467-2-Moritz.Haase@bmw.de> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250711100052.255467-1-Moritz.Haase@bmw.de> References: <20250711100052.255467-1-Moritz.Haase@bmw.de> MIME-Version: 1.0 X-ClientProxiedBy: SMUCMP12E.europe.bmw.corp (2a03:1e80:a15:58f::1:320) To smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 11 Jul 2025 10:01:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/118435 There hasn't been a new upstream release yet that ships the required changes. Signed-off-by: Moritz Haase --- ...make_minimum_required-before-project.patch | 41 ++++++++++++++ ...pper-bound-in-cmake_minimum_required.patch | 56 +++++++++++++++++++ .../zeromq/zeromq_4.3.5.bb | 2 + 3 files changed, 99 insertions(+) create mode 100644 meta-oe/recipes-connectivity/zeromq/files/0002-cmake_minimum_required-before-project.patch create mode 100644 meta-oe/recipes-connectivity/zeromq/files/0003-set-upper-bound-in-cmake_minimum_required.patch diff --git a/meta-oe/recipes-connectivity/zeromq/files/0002-cmake_minimum_required-before-project.patch b/meta-oe/recipes-connectivity/zeromq/files/0002-cmake_minimum_required-before-project.patch new file mode 100644 index 0000000000..9c854c63dd --- /dev/null +++ b/meta-oe/recipes-connectivity/zeromq/files/0002-cmake_minimum_required-before-project.patch @@ -0,0 +1,41 @@ +From 34f7fa22022bed9e0e390ed3580a1c83ac4a2834 Mon Sep 17 00:00:00 2001 +From: rp42 +Date: Mon, 30 Dec 2024 11:01:39 +0000 +Subject: [PATCH] cmake_minimum_required() before project() + + * Without this CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded (MT) Windows builds still produced incompatible MultiThreadedDLL (MD) output. + + * Resolves following warning: + +CMake Warning (dev) at CMakeLists.txt:2 (project): + cmake_minimum_required() should be called prior to this top-level project() + call. + + * Use ${CMAKE_HOST_SYSTEM_NAME} as ${CMAKE_SYSTEM_NAME} not set before project(). + +Signed-off-by: Moritz Haase +Upstream-Status: Backport [34f7fa22022bed9e0e390ed3580a1c83ac4a2834] +--- + CMakeLists.txt | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 861164ad..e4ce8a3d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,12 +1,13 @@ + # CMake build script for ZeroMQ +-project(ZeroMQ) + +-if(${CMAKE_SYSTEM_NAME} STREQUAL Darwin) ++if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL Darwin) + cmake_minimum_required(VERSION 3.0.2) + else() + cmake_minimum_required(VERSION 2.8.12) + endif() + ++project(ZeroMQ) ++ + include(CheckIncludeFiles) + include(CheckCCompilerFlag) + include(CheckCXXCompilerFlag) diff --git a/meta-oe/recipes-connectivity/zeromq/files/0003-set-upper-bound-in-cmake_minimum_required.patch b/meta-oe/recipes-connectivity/zeromq/files/0003-set-upper-bound-in-cmake_minimum_required.patch new file mode 100644 index 0000000000..ecc218d51e --- /dev/null +++ b/meta-oe/recipes-connectivity/zeromq/files/0003-set-upper-bound-in-cmake_minimum_required.patch @@ -0,0 +1,56 @@ +From b91a6201307b72beb522300366aad763d19b1456 Mon Sep 17 00:00:00 2001 +From: Min RK +Date: Thu, 20 Mar 2025 14:51:18 +0100 +Subject: [PATCH] set upper bound in cmake_minimum_required + +setting an upper bound improves forward-compatibility as legacy version support is dropped + +- 3.5 compat is deprecated in 3.27 (2023), removed in 4.0 (2025) +- 3.10 compat is deprecated in 3.31 (2024) + +Signed-off-by: Moritz Haase +Upstream-Status: Backport [b91a6201307b72beb522300366aad763d19b1456] +--- + CMakeLists.txt | 4 ++-- + tests/CMakeLists.txt | 2 +- + unittests/CMakeLists.txt | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e4ce8a3d..3ab2259e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,9 +1,9 @@ + # CMake build script for ZeroMQ + + if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL Darwin) +- cmake_minimum_required(VERSION 3.0.2) ++ cmake_minimum_required(VERSION 3.0.2...3.31) + else() +- cmake_minimum_required(VERSION 2.8.12) ++ cmake_minimum_required(VERSION 2.8.12...3.31) + endif() + + project(ZeroMQ) +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index a8dfa8f2..eb59de29 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -1,5 +1,5 @@ + # CMake build script for ZeroMQ tests +-cmake_minimum_required(VERSION "2.8.1") ++cmake_minimum_required(VERSION 2.8.1...3.31) + + # On Windows: solution file will be called tests.sln + project(tests) +diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt +index 64198eeb..58ea875b 100644 +--- a/unittests/CMakeLists.txt ++++ b/unittests/CMakeLists.txt +@@ -1,5 +1,5 @@ + # CMake build script for ZeroMQ unit tests +-cmake_minimum_required(VERSION "2.8.1") ++cmake_minimum_required(VERSION 2.8.1...3.31) + + set(unittests + unittest_ypipe diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb index eb4ee2f4fc..5aa2013219 100644 --- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb +++ b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb @@ -8,6 +8,8 @@ PACKAGECONFIG[libsodium] = "-DWITH_LIBSODIUM=ON,-DWITH_LIBSODIUM=OFF, libsodium" SRC_URI = "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV}.tar.gz \ file://0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch \ + file://0002-cmake_minimum_required-before-project.patch \ + file://0003-set-upper-bound-in-cmake_minimum_required.patch \ file://run-ptest \ " SRC_URI[sha256sum] = "6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43" From patchwork Fri Jul 11 10:00:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Moritz Haase X-Patchwork-Id: 66616 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1123DC83F24 for ; Fri, 11 Jul 2025 10:01:37 +0000 (UTC) Received: from esa9.hc324-48.eu.iphmx.com (esa9.hc324-48.eu.iphmx.com [207.54.69.27]) by mx.groups.io with SMTP id smtpd.web11.10146.1752228087130454326 for ; Fri, 11 Jul 2025 03:01:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bmw.de header.s=mailing1 header.b=ptV2Jn+Q; spf=pass (domain: bmw.de, ip: 207.54.69.27, mailfrom: prvs=28004f72d=moritz.haase@bmw.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmw.de; i=@bmw.de; q=dns/txt; s=mailing1; t=1752228088; x=1783764088; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5wywAwRfOFskbBNBOI7cg5k+1+20skDhERG19P1Me2E=; b=ptV2Jn+QCbv5Tkd9QPt9t4OZr4YW/mdHck2aDxmhAcsYt/G5nTteRd7U iiSm11/68OqJh5E6N55nYKDJ46xrmhWgYT09E4cPPAV4TItfTEgqfW6HQ sfKOR1CfiEVm9w7v4cyfzAFWHud4ZazKJu3H8DPEFY5N2ynbkJrcNE2cA s=; X-CSE-ConnectionGUID: ey6g4AShR+GxwRzy77ZZKA== X-CSE-MsgGUID: c9FRm79aQpu4eEQKYm0Rfw== Received: from esagw6.bmwgroup.com (HELO esagw6.muc) ([160.46.252.49]) by esa9.hc324-48.eu.iphmx.com with ESMTP/TLS; 11 Jul 2025 12:01:25 +0200 Received: from unknown (HELO esabb3.muc) ([10.31.187.134]) by esagw6.muc with ESMTP/TLS; 11 Jul 2025 12:01:25 +0200 Received: from smucmp12a.bmwgroup.net (HELO smucmp12a.europe.bmw.corp) ([10.30.13.95]) by esabb3.muc with ESMTP/TLS; 11 Jul 2025 12:01:24 +0200 Received: from q1054628.de-cci.bmwgroup.net (10.30.85.215) by smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) with Microsoft SMTP Server (version=TLS; Fri, 11 Jul 2025 12:01:23 +0200 X-CSE-ConnectionGUID: ijGaBYvsSSq33X8xo0RNyA== X-CSE-MsgGUID: 41XOzwPnQPSpvSLEya1qYg== X-CSE-ConnectionGUID: E1yMPyrQRiG9qWzQs7xPFg== X-CSE-MsgGUID: LM5WYV+pTau6VzK0jIiHSA== From: Moritz Haase To: CC: Moritz Haase Subject: [meta-oe][PATCH 02/10] avro-c: upgrade 1.11.3 -> 1.12.0 Date: Fri, 11 Jul 2025 12:00:19 +0200 Message-ID: <20250711100052.255467-3-Moritz.Haase@bmw.de> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250711100052.255467-1-Moritz.Haase@bmw.de> References: <20250711100052.255467-1-Moritz.Haase@bmw.de> MIME-Version: 1.0 X-ClientProxiedBy: SMUCMP12E.europe.bmw.corp (2a03:1e80:a15:58f::1:320) To smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 11 Jul 2025 10:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/118437 New version includes support to build against CMake 4+, see [0]. Release notes are available at [1]. [0]: https://github.com/apache/avro/pull/2796 [1]: https://github.com/apache/avro/releases/tag/release-1.12.0 Signed-off-by: Moritz Haase --- ...-Fix-typos-in-docs-and-examples-2795.patch | 59 --- ...O-3960-C-Fix-st-ANYARGS-warning-2798.patch | 386 ------------------ .../{avro-c_1.11.3.bb => avro-c_1.12.0.bb} | 8 +- 3 files changed, 3 insertions(+), 450 deletions(-) delete mode 100644 meta-oe/recipes-support/avro/avro-c/0001-AVRO-3957-C-Fix-typos-in-docs-and-examples-2795.patch delete mode 100644 meta-oe/recipes-support/avro/avro-c/0001-AVRO-3960-C-Fix-st-ANYARGS-warning-2798.patch rename meta-oe/recipes-support/avro/{avro-c_1.11.3.bb => avro-c_1.12.0.bb} (60%) diff --git a/meta-oe/recipes-support/avro/avro-c/0001-AVRO-3957-C-Fix-typos-in-docs-and-examples-2795.patch b/meta-oe/recipes-support/avro/avro-c/0001-AVRO-3957-C-Fix-typos-in-docs-and-examples-2795.patch deleted file mode 100644 index bfe2ea6367..0000000000 --- a/meta-oe/recipes-support/avro/avro-c/0001-AVRO-3957-C-Fix-typos-in-docs-and-examples-2795.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 52f051dbeefad0b7e73187becad6c33747b047d3 Mon Sep 17 00:00:00 2001 -From: Sahil Kang -Date: Mon, 11 Mar 2024 03:01:21 -0700 -Subject: [PATCH] AVRO-3957: [C] Fix typos in docs and examples (#2795) - -* AVRO-3957: [C] Fix misformatted type in docs - -Signed-off-by: Sahil Kang -Signed-off-by: Sahil Kang - -* AVRO-3957: [C] Fix type in quickstop example - -This removes the following warning: - - avro/lang/c/examples/quickstop.c:123:40: warning: incompatible pointer types passing 'int32_t **' (aka 'int **') to parameter of type - 'const char **' [-Wincompatible-pointer-types] - avro_value_get_string(&first_value, &p, &size); - -Signed-off-by: Sahil Kang -Signed-off-by: Sahil Kang - ---------- - -Signed-off-by: Sahil Kang -Signed-off-by: Sahil Kang - -Upstream-Status: Backport [52f051dbee AVRO-3957: [C] Fix typos in docs and examples (#2795)] -Signed-off-by: mark.yang ---- - lang/c/docs/index.txt | 2 +- - lang/c/examples/quickstop.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lang/c/docs/index.txt b/lang/c/docs/index.txt -index a439a0526..df16f9d96 100644 ---- a/lang/c/docs/index.txt -+++ b/lang/c/docs/index.txt -@@ -178,7 +178,7 @@ different versions of the Avro library. That means that it's really - only safe to use these hash values internally within the context of a - single execution of a single application. - --The +reset+ method “clears out” an +avro_value_t instance, making sure -+The +reset+ method “clears out” an +avro_value_t+ instance, making sure - that it's ready to accept the contents of a new value. For scalars, - this is usually a no-op, since the new value will just overwrite the old - one. For arrays and maps, this removes any existing elements from the -diff --git a/lang/c/examples/quickstop.c b/lang/c/examples/quickstop.c -index ff9e97005..b26dad10c 100644 ---- a/lang/c/examples/quickstop.c -+++ b/lang/c/examples/quickstop.c -@@ -107,7 +107,7 @@ int print_person(avro_file_reader_t db, avro_schema_t reader_schema) - if (rval == 0) { - int64_t id; - int32_t age; -- int32_t *p; -+ const char *p; - size_t size; - avro_value_t id_value; - avro_value_t first_value; diff --git a/meta-oe/recipes-support/avro/avro-c/0001-AVRO-3960-C-Fix-st-ANYARGS-warning-2798.patch b/meta-oe/recipes-support/avro/avro-c/0001-AVRO-3960-C-Fix-st-ANYARGS-warning-2798.patch deleted file mode 100644 index 8f7bbc868a..0000000000 --- a/meta-oe/recipes-support/avro/avro-c/0001-AVRO-3960-C-Fix-st-ANYARGS-warning-2798.patch +++ /dev/null @@ -1,386 +0,0 @@ -From 03ea96b48f7e668abd9f3b33799635e4e50a526c Mon Sep 17 00:00:00 2001 -From: Sahil Kang -Date: Mon, 25 Mar 2024 04:41:41 -0700 -Subject: [PATCH] AVRO-3960: [C] Fix st ANYARGS warning (#2798) - -This removes the following warning: - - avro/lang/c/src/st.c:240:13: warning: passing arguments to a function without a prototype is deprecated in all versions of C and is not - supported in C2x [-Wdeprecated-non-prototype] - hash_val = do_hash(key, table); - -Signed-off-by: Sahil Kang -Signed-off-by: Sahil Kang - -Upstream-Status: Backport [03ea96b48f AVRO-3960: [C] Fix st ANYARGS warning (#2798)] -Signed-off-by: mark.yang ---- - lang/c/src/datum.c | 12 ++++++------ - lang/c/src/datum_equal.c | 4 ++-- - lang/c/src/datum_size.c | 2 +- - lang/c/src/datum_validate.c | 2 +- - lang/c/src/memoize.c | 6 +++--- - lang/c/src/schema.c | 10 +++++----- - lang/c/src/st.c | 34 ++++++++++++++++++---------------- - lang/c/src/st.h | 22 +++++++++------------- - 8 files changed, 45 insertions(+), 47 deletions(-) - -diff --git a/lang/c/src/datum.c b/lang/c/src/datum.c -index 53dfa5ca0..5307c7a83 100644 ---- a/lang/c/src/datum.c -+++ b/lang/c/src/datum.c -@@ -1095,7 +1095,7 @@ static void avro_datum_free(avro_datum_t datum) - record = avro_datum_to_record(datum); - avro_schema_decref(record->schema); - st_foreach(record->fields_byname, -- HASH_FUNCTION_CAST char_datum_free_foreach, 0); -+ (hash_function_foreach) char_datum_free_foreach, 0); - st_free_table(record->field_order); - st_free_table(record->fields_byname); - avro_freet(struct avro_record_datum_t, record); -@@ -1123,7 +1123,7 @@ static void avro_datum_free(avro_datum_t datum) - struct avro_map_datum_t *map; - map = avro_datum_to_map(datum); - avro_schema_decref(map->schema); -- st_foreach(map->map, HASH_FUNCTION_CAST char_datum_free_foreach, -+ st_foreach(map->map, (hash_function_foreach) char_datum_free_foreach, - 0); - st_free_table(map->map); - st_free_table(map->indices_by_key); -@@ -1135,7 +1135,7 @@ static void avro_datum_free(avro_datum_t datum) - struct avro_array_datum_t *array; - array = avro_datum_to_array(datum); - avro_schema_decref(array->schema); -- st_foreach(array->els, HASH_FUNCTION_CAST array_free_foreach, 0); -+ st_foreach(array->els, (hash_function_foreach) array_free_foreach, 0); - st_free_table(array->els); - avro_freet(struct avro_array_datum_t, array); - } -@@ -1183,7 +1183,7 @@ avro_datum_reset(avro_datum_t datum) - { - struct avro_array_datum_t *array; - array = avro_datum_to_array(datum); -- st_foreach(array->els, HASH_FUNCTION_CAST array_free_foreach, 0); -+ st_foreach(array->els, (hash_function_foreach) array_free_foreach, 0); - st_free_table(array->els); - - rval = avro_init_array(array); -@@ -1198,7 +1198,7 @@ avro_datum_reset(avro_datum_t datum) - { - struct avro_map_datum_t *map; - map = avro_datum_to_map(datum); -- st_foreach(map->map, HASH_FUNCTION_CAST char_datum_free_foreach, 0); -+ st_foreach(map->map, (hash_function_foreach) char_datum_free_foreach, 0); - st_free_table(map->map); - st_free_table(map->indices_by_key); - st_free_table(map->keys_by_index); -@@ -1217,7 +1217,7 @@ avro_datum_reset(avro_datum_t datum) - record = avro_datum_to_record(datum); - rval = 0; - st_foreach(record->fields_byname, -- HASH_FUNCTION_CAST datum_reset_foreach, (st_data_t) &rval); -+ (hash_function_foreach) datum_reset_foreach, (st_data_t) &rval); - return rval; - } - -diff --git a/lang/c/src/datum_equal.c b/lang/c/src/datum_equal.c -index 3875bea04..7e7c9b940 100644 ---- a/lang/c/src/datum_equal.c -+++ b/lang/c/src/datum_equal.c -@@ -78,7 +78,7 @@ static int map_equal(struct avro_map_datum_t *a, struct avro_map_datum_t *b) - if (a->map->num_entries != b->map->num_entries) { - return 0; - } -- st_foreach(a->map, HASH_FUNCTION_CAST st_equal_foreach, (st_data_t) & args); -+ st_foreach(a->map, (hash_function_foreach) st_equal_foreach, (st_data_t) & args); - return args.rval; - } - -@@ -93,7 +93,7 @@ static int record_equal(struct avro_record_datum_t *a, - if (a->fields_byname->num_entries != b->fields_byname->num_entries) { - return 0; - } -- st_foreach(a->fields_byname, HASH_FUNCTION_CAST st_equal_foreach, (st_data_t) & args); -+ st_foreach(a->fields_byname, (hash_function_foreach) st_equal_foreach, (st_data_t) & args); - return args.rval; - } - -diff --git a/lang/c/src/datum_size.c b/lang/c/src/datum_size.c -index be9b98004..3877f3138 100644 ---- a/lang/c/src/datum_size.c -+++ b/lang/c/src/datum_size.c -@@ -126,7 +126,7 @@ size_map(avro_writer_t writer, const avro_encoding_t * enc, - if (datum->map->num_entries) { - size_accum(rval, size, - enc->size_long(writer, datum->map->num_entries)); -- st_foreach(datum->map, HASH_FUNCTION_CAST size_map_foreach, (st_data_t) & args); -+ st_foreach(datum->map, (hash_function_foreach) size_map_foreach, (st_data_t) & args); - size += args.size; - } - if (!args.rval) { -diff --git a/lang/c/src/datum_validate.c b/lang/c/src/datum_validate.c -index 6167bd63f..e997d3067 100644 ---- a/lang/c/src/datum_validate.c -+++ b/lang/c/src/datum_validate.c -@@ -123,7 +123,7 @@ avro_schema_datum_validate(avro_schema_t expected_schema, avro_datum_t datum) - { avro_schema_to_map(expected_schema)->values, 1 - }; - st_foreach(avro_datum_to_map(datum)->map, -- HASH_FUNCTION_CAST schema_map_validate_foreach, -+ (hash_function_foreach) schema_map_validate_foreach, - (st_data_t) & vst); - return vst.rval; - } -diff --git a/lang/c/src/memoize.c b/lang/c/src/memoize.c -index 933fecbd0..e3602884d 100644 ---- a/lang/c/src/memoize.c -+++ b/lang/c/src/memoize.c -@@ -52,8 +52,8 @@ avro_memoize_key_hash(avro_memoize_key_t *a) - - - static struct st_hash_type avro_memoize_hash_type = { -- HASH_FUNCTION_CAST avro_memoize_key_cmp, -- HASH_FUNCTION_CAST avro_memoize_key_hash -+ (hash_function_compare) avro_memoize_key_cmp, -+ (hash_function_hash) avro_memoize_key_hash - }; - - -@@ -78,7 +78,7 @@ avro_memoize_free_key(avro_memoize_key_t *key, void *result, void *dummy) - void - avro_memoize_done(avro_memoize_t *mem) - { -- st_foreach((st_table *) mem->cache, HASH_FUNCTION_CAST avro_memoize_free_key, 0); -+ st_foreach((st_table *) mem->cache, (hash_function_foreach) avro_memoize_free_key, 0); - st_free_table((st_table *) mem->cache); - memset(mem, 0, sizeof(avro_memoize_t)); - } -diff --git a/lang/c/src/schema.c b/lang/c/src/schema.c -index 2acad51a1..a4d8e9f89 100644 ---- a/lang/c/src/schema.c -+++ b/lang/c/src/schema.c -@@ -137,7 +137,7 @@ static void avro_schema_free(avro_schema_t schema) - if (record->space) { - avro_str_free(record->space); - } -- st_foreach(record->fields, HASH_FUNCTION_CAST record_free_foreach, -+ st_foreach(record->fields, (hash_function_foreach) record_free_foreach, - 0); - st_free_table(record->fields_byname); - st_free_table(record->fields); -@@ -152,7 +152,7 @@ static void avro_schema_free(avro_schema_t schema) - if (enump->space) { - avro_str_free(enump->space); - } -- st_foreach(enump->symbols, HASH_FUNCTION_CAST enum_free_foreach, -+ st_foreach(enump->symbols, (hash_function_foreach) enum_free_foreach, - 0); - st_free_table(enump->symbols); - st_free_table(enump->symbols_byname); -@@ -189,7 +189,7 @@ static void avro_schema_free(avro_schema_t schema) - case AVRO_UNION:{ - struct avro_union_schema_t *unionp; - unionp = avro_schema_to_union(schema); -- st_foreach(unionp->branches, HASH_FUNCTION_CAST union_free_foreach, -+ st_foreach(unionp->branches, (hash_function_foreach) union_free_foreach, - 0); - st_free_table(unionp->branches); - st_free_table(unionp->branches_byname); -@@ -1239,7 +1239,7 @@ avro_schema_from_json_root(json_t *root, avro_schema_t *schema) - /* json_dumpf(root, stderr, 0); */ - rval = avro_schema_from_json_t(root, schema, named_schemas, NULL); - json_decref(root); -- st_foreach(named_schemas, HASH_FUNCTION_CAST named_schema_free_foreach, 0); -+ st_foreach(named_schemas, (hash_function_foreach) named_schema_free_foreach, 0); - st_free_table(named_schemas); - return rval; - } -@@ -1455,7 +1455,7 @@ avro_schema_t avro_schema_copy(avro_schema_t schema) - } - - new_schema = avro_schema_copy_root(schema, named_schemas); -- st_foreach(named_schemas, HASH_FUNCTION_CAST named_schema_free_foreach, 0); -+ st_foreach(named_schemas, (hash_function_foreach) named_schema_free_foreach, 0); - st_free_table(named_schemas); - return new_schema; - } -diff --git a/lang/c/src/st.c b/lang/c/src/st.c -index 27578289e..8437777cb 100644 ---- a/lang/c/src/st.c -+++ b/lang/c/src/st.c -@@ -39,8 +39,8 @@ struct st_table_entry { - static int numcmp(long, long); - static int numhash(long); - static struct st_hash_type type_numhash = { -- HASH_FUNCTION_CAST numcmp, -- HASH_FUNCTION_CAST numhash -+ (hash_function_compare) numcmp, -+ (hash_function_hash) numhash - }; - - /* -@@ -48,8 +48,8 @@ static struct st_hash_type type_numhash = { - */ - static int strhash(const char *); - static struct st_hash_type type_strhash = { -- HASH_FUNCTION_CAST strcmp, -- HASH_FUNCTION_CAST strhash -+ (hash_function_compare) strcmp, -+ (hash_function_hash) strhash - }; - - static void rehash(st_table *); -@@ -212,7 +212,7 @@ void st_free_table(st_table *table) - } - - #define PTR_NOT_EQUAL(table, ptr, hash_val, key) \ --((ptr) != 0 && (ptr->hash != (hash_val) || !EQUAL((table), (key), (ptr)->key))) -+((ptr) != 0 && (ptr->hash != (hash_val) || !EQUAL((table), (void*) (key), (void*) (ptr)->key))) - - #ifdef HASH_LOG - #define COLLISION collision++ -@@ -237,7 +237,7 @@ int st_lookup(st_table *table, register st_data_t key, st_data_t *value) - unsigned int hash_val, bin_pos; - register st_table_entry *ptr; - -- hash_val = do_hash(key, table); -+ hash_val = do_hash((void*) key, table); - FIND_ENTRY(table, ptr, hash_val, bin_pos); - - if (ptr == 0) { -@@ -272,7 +272,7 @@ int st_insert(register st_table *table, register st_data_t key, st_data_t value) - unsigned int hash_val, bin_pos; - register st_table_entry *ptr; - -- hash_val = do_hash(key, table); -+ hash_val = do_hash((void*) key, table); - FIND_ENTRY(table, ptr, hash_val, bin_pos); - - if (ptr == 0) { -@@ -288,7 +288,7 @@ void st_add_direct(st_table *table,st_data_t key,st_data_t value) - { - unsigned int hash_val, bin_pos; - -- hash_val = do_hash(key, table); -+ hash_val = do_hash((void*) key, table); - bin_pos = hash_val % table->num_bins; - ADD_DIRECT(table, key, value, hash_val, bin_pos); - } -@@ -363,7 +363,7 @@ int st_delete(register st_table *table,register st_data_t *key,st_data_t *value) - st_table_entry *tmp; - register st_table_entry *ptr; - -- hash_val = do_hash_bin(*key, table); -+ hash_val = do_hash_bin((void*) *key, table); - ptr = table->bins[hash_val]; - - if (ptr == 0) { -@@ -372,7 +372,7 @@ int st_delete(register st_table *table,register st_data_t *key,st_data_t *value) - return 0; - } - -- if (EQUAL(table, *key, ptr->key)) { -+ if (EQUAL(table, (void*) *key, (void*) ptr->key)) { - table->bins[hash_val] = ptr->next; - table->num_entries--; - if (value != 0) -@@ -383,7 +383,7 @@ int st_delete(register st_table *table,register st_data_t *key,st_data_t *value) - } - - for (; ptr->next != 0; ptr = ptr->next) { -- if (EQUAL(table, ptr->next->key, *key)) { -+ if (EQUAL(table, (void*) ptr->next->key, (void*) *key)) { - tmp = ptr->next; - ptr->next = ptr->next->next; - table->num_entries--; -@@ -403,7 +403,7 @@ int st_delete_safe(register st_table *table,register st_data_t *key,st_data_t *v - unsigned int hash_val; - register st_table_entry *ptr; - -- hash_val = do_hash_bin(*key, table); -+ hash_val = do_hash_bin((void*) *key, table); - ptr = table->bins[hash_val]; - - if (ptr == 0) { -@@ -413,7 +413,7 @@ int st_delete_safe(register st_table *table,register st_data_t *key,st_data_t *v - } - - for (; ptr != 0; ptr = ptr->next) { -- if ((ptr->key != never) && EQUAL(table, ptr->key, *key)) { -+ if ((ptr->key != never) && EQUAL(table, (void*) ptr->key, (void*) *key)) { - table->num_entries--; - *key = ptr->key; - if (value != 0) -@@ -439,11 +439,11 @@ void st_cleanup_safe(st_table *table,st_data_t never) - { - int num_entries = table->num_entries; - -- st_foreach(table, HASH_FUNCTION_CAST delete_never, never); -+ st_foreach(table, (hash_function_foreach) delete_never, never); - table->num_entries = num_entries; - } - --int st_foreach(st_table *table,int (*func) (ANYARGS),st_data_t arg) -+int st_foreach(st_table *table,int (*func) (void*, void*, void*),st_data_t arg) - { - st_table_entry *ptr, *last, *tmp; - enum st_retval retval; -@@ -452,7 +452,9 @@ int st_foreach(st_table *table,int (*func) (ANYARGS),st_data_t arg) - for (i = 0; i < table->num_bins; i++) { - last = 0; - for (ptr = table->bins[i]; ptr != 0;) { -- retval = (enum st_retval) (*func) (ptr->key, ptr->record, arg); -+ retval = (enum st_retval) (*func) ((void*) ptr->key, -+ (void*) ptr->record, -+ (void*) arg); - switch (retval) { - case ST_CHECK: /* check if hash is modified during - * iteration */ -diff --git a/lang/c/src/st.h b/lang/c/src/st.h -index cf8a22491..93da018bd 100644 ---- a/lang/c/src/st.h -+++ b/lang/c/src/st.h -@@ -20,26 +20,22 @@ extern "C" { - - #pragma GCC visibility push(hidden) - --#ifndef ANYARGS -- #ifdef __cplusplus -- #define ANYARGS ... -- #else -- #define ANYARGS -- #endif --#endif -- - #ifdef _WIN32 -- #define HASH_FUNCTION_CAST (int (__cdecl *)(ANYARGS)) -+ typedef int (__cdecl *hash_function_compare)(void*, void*); -+ typedef int (__cdecl *hash_function_hash)(void*); -+ typedef int (__cdecl *hash_function_foreach)(void*, void*, void*); - #else -- #define HASH_FUNCTION_CAST -+ typedef int (*hash_function_compare)(void*, void*); -+ typedef int (*hash_function_hash)(void*); -+ typedef int (*hash_function_foreach)(void*, void*, void*); - #endif - - typedef uintptr_t st_data_t; - typedef struct st_table st_table; - - struct st_hash_type { -- int (*compare) (ANYARGS); -- int (*hash) (ANYARGS); -+ hash_function_compare compare; -+ hash_function_hash hash; - }; - - struct st_table { -@@ -67,7 +63,7 @@ int st_delete _((st_table *, st_data_t *, st_data_t *)); - int st_delete_safe _((st_table *, st_data_t *, st_data_t *, st_data_t)); - int st_insert _((st_table *, st_data_t, st_data_t)); - int st_lookup _((st_table *, st_data_t, st_data_t *)); --int st_foreach _((st_table *, int (*)(ANYARGS), st_data_t)); -+int st_foreach _((st_table *, hash_function_foreach, st_data_t)); - void st_add_direct _((st_table *, st_data_t, st_data_t)); - void st_free_table _((st_table *)); - void st_cleanup_safe _((st_table *, st_data_t)); diff --git a/meta-oe/recipes-support/avro/avro-c_1.11.3.bb b/meta-oe/recipes-support/avro/avro-c_1.12.0.bb similarity index 60% rename from meta-oe/recipes-support/avro/avro-c_1.11.3.bb rename to meta-oe/recipes-support/avro/avro-c_1.12.0.bb index f7da323710..3876f5e308 100644 --- a/meta-oe/recipes-support/avro/avro-c_1.11.3.bb +++ b/meta-oe/recipes-support/avro/avro-c_1.12.0.bb @@ -7,12 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6d502b41f76179fc84e536236f359cae" DEPENDS = "jansson zlib xz" -BRANCH = "branch-1.11" -SRCREV = "579a36762293fa4c9f2831e27e7af7713a0838a0" +BRANCH = "branch-1.12" +SRCREV = "8c27801dc8d42ccc00997f25c0b8f45f8d4a233e" SRC_URI = " \ - git://github.com/apache/avro;branch=${BRANCH};protocol=https \ - file://0001-AVRO-3960-C-Fix-st-ANYARGS-warning-2798.patch;patchdir=../.. \ - file://0001-AVRO-3957-C-Fix-typos-in-docs-and-examples-2795.patch;patchdir=../.. \ + git://github.com/apache/avro;branch=${BRANCH};protocol=https;tag=release-${PV} \ " S = "${UNPACKDIR}/${BP}/lang/c" From patchwork Fri Jul 11 10:00:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Haase X-Patchwork-Id: 66617 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2158EC83F27 for ; Fri, 11 Jul 2025 10:01:37 +0000 (UTC) Received: from esa14.hc324-48.eu.iphmx.com (esa14.hc324-48.eu.iphmx.com [207.54.69.24]) by mx.groups.io with SMTP id smtpd.web11.10145.1752228086364171799 for ; Fri, 11 Jul 2025 03:01:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bmw.de header.s=mailing1 header.b=PUqw+N1q; spf=pass (domain: bmw.de, ip: 207.54.69.24, mailfrom: prvs=28004f72d=moritz.haase@bmw.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmw.de; i=@bmw.de; q=dns/txt; s=mailing1; t=1752228090; x=1783764090; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jlxn0B/QtiUI194xhTbOjSiLvN3fFiXFlEv6D24kvIs=; b=PUqw+N1qxBnEeYKraCsPLDJTsXSMbFmKJHH/VOfKnMr7SIeYMswf0sa6 eMzM9pUbKqBU33UGvAN5Q9sVtFOVJ18PKjHY7BDfxP3Zw2m/NfEr43GHt /xlX6WRAYO5VPsbabMNgXEgNZ9+hCCRaWPzWUOpD63woNmUhycmrq/XJ+ A=; X-CSE-ConnectionGUID: 60qjpYQOSTODvxEjuKEWsg== X-CSE-MsgGUID: XqT592N9TOuXJraHqki24w== Received: from 160.46.252.34.spf.bmwgroup.com (HELO esagw1.muc) ([160.46.252.34]) by esa14.hc324-48.eu.iphmx.com with ESMTP/TLS; 11 Jul 2025 12:01:24 +0200 Received: from esabb1.muc ([160.50.100.31]) by esagw1.muc with ESMTP/TLS; 11 Jul 2025 12:01:24 +0200 Received: from smucmp12a.bmwgroup.net (HELO smucmp12a.europe.bmw.corp) ([10.30.13.95]) by esabb1.muc with ESMTP/TLS; 11 Jul 2025 12:01:24 +0200 Received: from q1054628.de-cci.bmwgroup.net (10.30.85.215) by smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) with Microsoft SMTP Server (version=TLS; Fri, 11 Jul 2025 12:01:23 +0200 X-CSE-ConnectionGUID: nhKLzqvESu2HzAeK1YJnaQ== X-CSE-MsgGUID: TyJ4N4XHQmOYa/PiUjufHw== X-CSE-ConnectionGUID: vP8ePueLQ4Gj2MYp0WYa0w== X-CSE-MsgGUID: SpeyS8WJR3uNnFIlsZLFVA== From: Moritz Haase To: CC: Moritz Haase Subject: [meta-oe][PATCH 03/10] cpputest: Backport patches to support builds with CMake 4+ Date: Fri, 11 Jul 2025 12:00:20 +0200 Message-ID: <20250711100052.255467-4-Moritz.Haase@bmw.de> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250711100052.255467-1-Moritz.Haase@bmw.de> References: <20250711100052.255467-1-Moritz.Haase@bmw.de> MIME-Version: 1.0 X-ClientProxiedBy: SMUCMP12E.europe.bmw.corp (2a03:1e80:a15:58f::1:320) To smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 11 Jul 2025 10:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/118439 There hasn't been a new upstream release yet that ships the required changes. Signed-off-by: Moritz Haase --- ...um_required-before-project-in-CMakeL.patch | 36 ++++++++++++++++ .../0002-Squelch-deprecation-warning.patch | 43 +++++++++++++++++++ meta-oe/recipes-test/cpputest/cpputest_4.0.bb | 5 ++- 3 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-test/cpputest/cpputest/0001-Call-cmake_minimum_required-before-project-in-CMakeL.patch create mode 100644 meta-oe/recipes-test/cpputest/cpputest/0002-Squelch-deprecation-warning.patch diff --git a/meta-oe/recipes-test/cpputest/cpputest/0001-Call-cmake_minimum_required-before-project-in-CMakeL.patch b/meta-oe/recipes-test/cpputest/cpputest/0001-Call-cmake_minimum_required-before-project-in-CMakeL.patch new file mode 100644 index 0000000000..a987939ea6 --- /dev/null +++ b/meta-oe/recipes-test/cpputest/cpputest/0001-Call-cmake_minimum_required-before-project-in-CMakeL.patch @@ -0,0 +1,36 @@ +From 5351875cde23340c0a98fe46566cde5535c40e21 Mon Sep 17 00:00:00 2001 +From: georgev93 +Date: Fri, 26 Jun 2020 19:07:14 -0400 +Subject: [PATCH 1/2] Call cmake_minimum_required() before project() in + CMakeLists.txt. + +From https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html: +Note: Call the cmake_minimum_required() command at the beginning of the top-level CMakeLists.txt file even before calling the project() command. It is important to establish version and policy settings before invoking other commands whose behavior they may affect. See also policy CMP0000. + +Signed-off-by: Moritz Haase +Upstream-Status: Backport [e0c050d8b614294b2215a62e64628470fab67f20] +--- + CMakeLists.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 88e0cfb5..d36c6491 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,12 +1,12 @@ ++# 2.6.3 is needed for ctest support ++# 3.1 is needed for target_sources ++cmake_minimum_required(VERSION 3.1) ++ + project(CppUTest) + + set(CppUTest_version_major 4) + set(CppUTest_version_minor 0) + +-# 2.6.3 is needed for ctest support +-# 3.1 is needed for target_sources +-cmake_minimum_required(VERSION 3.1) +- + ############### + # Conan support + ############### diff --git a/meta-oe/recipes-test/cpputest/cpputest/0002-Squelch-deprecation-warning.patch b/meta-oe/recipes-test/cpputest/cpputest/0002-Squelch-deprecation-warning.patch new file mode 100644 index 0000000000..6f791e4c0e --- /dev/null +++ b/meta-oe/recipes-test/cpputest/cpputest/0002-Squelch-deprecation-warning.patch @@ -0,0 +1,43 @@ +From 46bdc8ceca42fd19cd2b97d9fa845860e537dee9 Mon Sep 17 00:00:00 2001 +From: Chad Condon +Date: Fri, 27 Dec 2024 18:21:21 -0800 +Subject: [PATCH 2/2] Squelch deprecation warning + +Most recent CMake started complaining about the pending end of 3.8 +support. + +> ``` +> CMake Deprecation Warning at CMakeLists.txt:4 (cmake_minimum_required): +> Compatibility with CMake < 3.10 will be removed from a future version of +> CMake. +> +> Update the VERSION argument value. Or, use the ... syntax +> to tell CMake that the project requires at least but has been updated +> to work with policies introduced by or earlier. +> ``` + +We can retain support by adding a max version. This will no +prevent use with newer versions, but indicates forward +compatibility.[^1] + +[^1]: https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html + +Signed-off-by: Moritz Haase +Upstream-Status: Backport [9dda473ded5913d47221e7ae50817dbcd45175ff] +--- + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d36c6491..0cc12cb1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,7 @@ + # 2.6.3 is needed for ctest support + # 3.1 is needed for target_sources +-cmake_minimum_required(VERSION 3.1) ++# 3.8 is needed for try_compile improvements (CMP0067) ++cmake_minimum_required(VERSION 3.8...3.31) + + project(CppUTest) + diff --git a/meta-oe/recipes-test/cpputest/cpputest_4.0.bb b/meta-oe/recipes-test/cpputest/cpputest_4.0.bb index 5710585b6c..2b643d0cd5 100644 --- a/meta-oe/recipes-test/cpputest/cpputest_4.0.bb +++ b/meta-oe/recipes-test/cpputest/cpputest_4.0.bb @@ -5,7 +5,10 @@ SECTION = "devel" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=ce5d5f1fe02bcd1343ced64a06fd4177" -SRC_URI = "git://github.com/cpputest/cpputest.git;protocol=https;branch=master" +SRC_URI = "git://github.com/cpputest/cpputest.git;protocol=https;branch=master \ + file://0001-Call-cmake_minimum_required-before-project-in-CMakeL.patch \ + file://0002-Squelch-deprecation-warning.patch \ +" SRCREV = "67d2dfd41e13f09ff218aa08e2d35f1c32f032a1" From patchwork Fri Jul 11 10:00:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Haase X-Patchwork-Id: 66614 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1CEDDC83F25 for ; Fri, 11 Jul 2025 10:01:37 +0000 (UTC) Received: from esa14.hc324-48.eu.iphmx.com (esa14.hc324-48.eu.iphmx.com [207.54.69.24]) by mx.groups.io with SMTP id smtpd.web11.10145.1752228086364171799 for ; Fri, 11 Jul 2025 03:01:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bmw.de header.s=mailing1 header.b=qpNyhxpx; spf=pass (domain: bmw.de, ip: 207.54.69.24, mailfrom: prvs=28004f72d=moritz.haase@bmw.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmw.de; i=@bmw.de; q=dns/txt; s=mailing1; t=1752228089; x=1783764089; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/j93TC3dn4ySq17ydUA7LHJlBmJmr+5o/nbDmeSw9tY=; b=qpNyhxpxcpgPqWCFg2Rkh27vnNWJzpNFPTNb57yD4WKdya0Sbmiik/IZ mcfa6Urg+z93UKM5ztIHkggtbIjhH7ZX0alxFU6hqKIOwgLzFJS2qCL/9 Hh7Z4m1M3dqS49p617y327GIK61Sdsx9s4fV8j1fBjN/MMOieLiISDQnX 0=; X-CSE-ConnectionGUID: 60qjpYQOSTODvxEjuKEWsg== X-CSE-MsgGUID: 8J6jOm44R02M2sQi2Bk6nQ== Received: from 160.46.252.34.spf.bmwgroup.com (HELO esagw1.muc) ([160.46.252.34]) by esa14.hc324-48.eu.iphmx.com with ESMTP/TLS; 11 Jul 2025 12:01:24 +0200 Received: from esabb1.muc ([160.50.100.31]) by esagw1.muc with ESMTP/TLS; 11 Jul 2025 12:01:24 +0200 Received: from smucmp12a.bmwgroup.net (HELO smucmp12a.europe.bmw.corp) ([10.30.13.95]) by esabb1.muc with ESMTP/TLS; 11 Jul 2025 12:01:24 +0200 Received: from q1054628.de-cci.bmwgroup.net (10.30.85.215) by smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) with Microsoft SMTP Server (version=TLS; Fri, 11 Jul 2025 12:01:24 +0200 X-CSE-ConnectionGUID: ZqInWkBCSSeNftx8wbb9OA== X-CSE-MsgGUID: 8kyaQ16xQFyJqpSG7UhzAw== X-CSE-ConnectionGUID: U3iicCzlTdy0bvvh5KK+3g== X-CSE-MsgGUID: Hjc+/FGRQs+a7P/83pUE3A== From: Moritz Haase To: CC: Moritz Haase Subject: [meta-oe][PATCH 04/10] redis-plus-plus: upgrade 1.3.11 -> 1.3.14 Date: Fri, 11 Jul 2025 12:00:21 +0200 Message-ID: <20250711100052.255467-5-Moritz.Haase@bmw.de> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250711100052.255467-1-Moritz.Haase@bmw.de> References: <20250711100052.255467-1-Moritz.Haase@bmw.de> MIME-Version: 1.0 X-ClientProxiedBy: SMUCMP12E.europe.bmw.corp (2a03:1e80:a15:58f::1:320) To smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 11 Jul 2025 10:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/118438 Additionally backport a patch to support to build against CMake 4+ that hasn't made it into a release yet. Release notes are available at [0]. [0]: https://github.com/sewenew/redis-plus-plus/releases Signed-off-by: Moritz Haase --- ...update-cmake_minimum_required-to-3.5.patch | 34 +++++++++++++++++++ ...us_1.3.11.bb => redis-plus-plus_1.3.14.bb} | 6 ++-- 2 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-extended/redis-plus-plus/files/0001-update-cmake_minimum_required-to-3.5.patch rename meta-oe/recipes-extended/redis-plus-plus/{redis-plus-plus_1.3.11.bb => redis-plus-plus_1.3.14.bb} (86%) diff --git a/meta-oe/recipes-extended/redis-plus-plus/files/0001-update-cmake_minimum_required-to-3.5.patch b/meta-oe/recipes-extended/redis-plus-plus/files/0001-update-cmake_minimum_required-to-3.5.patch new file mode 100644 index 0000000000..02093573ce --- /dev/null +++ b/meta-oe/recipes-extended/redis-plus-plus/files/0001-update-cmake_minimum_required-to-3.5.patch @@ -0,0 +1,34 @@ +From e30d4c4c557568b01d5adce9df2714de8d3921c2 Mon Sep 17 00:00:00 2001 +From: sewenew +Date: Tue, 15 Apr 2025 22:57:08 +0800 +Subject: [PATCH] update cmake_minimum_required to 3.5 + +Signed-off-by: Moritz Haase +Upstream-Status: Backport [e30d4c4c557568b01d5adce9df2714de8d3921c2] +--- + CMakeLists.txt | 2 +- + test/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e0a8cf4..9c742f9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.1) ++cmake_minimum_required(VERSION 3.5) + + function(GET_VERSION VERSION_PART VERSION_NUM) + set(VERSION_REGEX "^const int VERSION_${VERSION_PART} = (.+);$") +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 3423956..88aa079 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -1,6 +1,6 @@ + project(test_redis++) + +-cmake_minimum_required(VERSION 3.1) ++cmake_minimum_required(VERSION 3.5) + + set(REDIS_PLUS_PLUS_TEST_SOURCES src/sw/redis++/test_main.cpp) + diff --git a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.14.bb similarity index 86% rename from meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb rename to meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.14.bb index d643c6f0b9..19e68edea8 100644 --- a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb +++ b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.14.bb @@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" DEPENDS += "hiredis" -SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https \ - file://0001-CMakeLists.txt-fix-substitution-for-static-libs.patch" -SRCREV = "ad6baa121f4c6fbc7622d83d606210ac22549c78" +SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https;tag=${PV} \ + file://0001-update-cmake_minimum_required-to-3.5.patch" +SRCREV = "b13fcead60bdc03f9771da25715bb134be89aa2f" inherit cmake From patchwork Fri Jul 11 10:00:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Haase X-Patchwork-Id: 66612 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A277C83F22 for ; Fri, 11 Jul 2025 10:01:37 +0000 (UTC) Received: from esa9.hc324-48.eu.iphmx.com (esa9.hc324-48.eu.iphmx.com [207.54.69.27]) by mx.groups.io with SMTP id smtpd.web11.10146.1752228087130454326 for ; Fri, 11 Jul 2025 03:01:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bmw.de header.s=mailing1 header.b=JwUT5o0N; spf=pass (domain: bmw.de, ip: 207.54.69.27, mailfrom: prvs=28004f72d=moritz.haase@bmw.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmw.de; i=@bmw.de; q=dns/txt; s=mailing1; t=1752228089; x=1783764089; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fnrviWt1QVNe/9Cocl0BozSuQCnt5W/4LbE+8WgyBCY=; b=JwUT5o0NmP4y/jzZEaYADF/NlSEptvlnzFWoJ/jWMlyvG2YQ8bnwgFBj wdtF0MZVXincTPqstjnhN74LklnByw/V2qgwWeQ1eQZD/WPAhfNWXZcYk UPVNElocZuaLLm0BVvFsPH6jlnDD5ZOU0YReD66OjjZ4PmvmCMr/4k1wJ I=; X-CSE-ConnectionGUID: ey6g4AShR+GxwRzy77ZZKA== X-CSE-MsgGUID: ceJap1CrRty4Gb9xe2HBuw== Received: from esagw6.bmwgroup.com (HELO esagw6.muc) ([160.46.252.49]) by esa9.hc324-48.eu.iphmx.com with ESMTP/TLS; 11 Jul 2025 12:01:26 +0200 Received: from unknown (HELO esabb3.muc) ([10.31.187.134]) by esagw6.muc with ESMTP/TLS; 11 Jul 2025 12:01:25 +0200 Received: from smucmp12a.bmwgroup.net (HELO smucmp12a.europe.bmw.corp) ([10.30.13.95]) by esabb3.muc with ESMTP/TLS; 11 Jul 2025 12:01:25 +0200 Received: from q1054628.de-cci.bmwgroup.net (10.30.85.215) by smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) with Microsoft SMTP Server (version=TLS; Fri, 11 Jul 2025 12:01:24 +0200 X-CSE-ConnectionGUID: 75HvsMWdT8CqFfsjANZibQ== X-CSE-MsgGUID: qO7bbzJmRiGFDEO7LS8+CA== X-CSE-ConnectionGUID: 9a1BZdycRd6SoMrTDwaJEA== X-CSE-MsgGUID: wnhT5S+jS1OCIv5yG2cxww== From: Moritz Haase To: CC: Moritz Haase Subject: [meta-oe][PATCH 05/10] heaptrack: Allow to build with CMake 4+ Date: Fri, 11 Jul 2025 12:00:22 +0200 Message-ID: <20250711100052.255467-6-Moritz.Haase@bmw.de> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250711100052.255467-1-Moritz.Haase@bmw.de> References: <20250711100052.255467-1-Moritz.Haase@bmw.de> MIME-Version: 1.0 X-ClientProxiedBy: SMUCMP12E.europe.bmw.corp (2a03:1e80:a15:58f::1:320) To smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 11 Jul 2025 10:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/118440 Upstream is inactive, so use the 'minimum policy version' override. Signed-off-by: Moritz Haase --- meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb b/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb index 3aca51ee3e..6896daf836 100644 --- a/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb +++ b/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb @@ -22,7 +22,9 @@ SRCREV = "bc9e3744bcc47de978673d1e382f4125a1ab5fa8" inherit cmake -EXTRA_OECMAKE += "-DHEAPTRACK_BUILD_GUI=OFF" +EXTRA_OECMAKE += "-DHEAPTRACK_BUILD_GUI=OFF \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ +" # libunwind is not yet ported to RISCV COMPATIBLE_HOST:riscv32 = "null" From patchwork Fri Jul 11 10:00:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Haase X-Patchwork-Id: 66618 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FA66C83F28 for ; Fri, 11 Jul 2025 10:01:37 +0000 (UTC) Received: from esa14.hc324-48.eu.iphmx.com (esa14.hc324-48.eu.iphmx.com [207.54.69.24]) by mx.groups.io with SMTP id smtpd.web11.10148.1752228090272721448 for ; Fri, 11 Jul 2025 03:01:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bmw.de header.s=mailing1 header.b=lsrX0xTu; spf=pass (domain: bmw.de, ip: 207.54.69.24, mailfrom: prvs=28004f72d=moritz.haase@bmw.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmw.de; i=@bmw.de; q=dns/txt; s=mailing1; t=1752228090; x=1783764090; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pinK9yWqAZEvMA/CyIZU+0CoFudcO8QDik1/ozmyaEU=; b=lsrX0xTuBxjBmjtO6d9mhyVr2qpl3aOPNzjSY4KIHDz3f+w+JT0oo7Ko XBJET80Q0riPvSoNCKl3MP9NxXOsavCf6vT/dKFC29Sb5VetA0huDUvDW KN3XtTJXcnq/1N221oUA4KuhoQbhsq840RbgU4Do5g0w8EN0ysSwJ3MFI 8=; X-CSE-ConnectionGUID: 60qjpYQOSTODvxEjuKEWsg== X-CSE-MsgGUID: wgUL+j2PRWicPo6174yTWQ== Received: from 160.46.252.34.spf.bmwgroup.com (HELO esagw1.muc) ([160.46.252.34]) by esa14.hc324-48.eu.iphmx.com with ESMTP/TLS; 11 Jul 2025 12:01:24 +0200 Received: from esabb1.muc ([160.50.100.31]) by esagw1.muc with ESMTP/TLS; 11 Jul 2025 12:01:25 +0200 Received: from smucmp12a.bmwgroup.net (HELO smucmp12a.europe.bmw.corp) ([10.30.13.95]) by esabb1.muc with ESMTP/TLS; 11 Jul 2025 12:01:25 +0200 Received: from q1054628.de-cci.bmwgroup.net (10.30.85.215) by smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) with Microsoft SMTP Server (version=TLS; Fri, 11 Jul 2025 12:01:24 +0200 X-CSE-ConnectionGUID: 6nf71w08QnGnsEVV4ACelQ== X-CSE-MsgGUID: judHHQ0hQcGzYkCxMDb14A== X-CSE-ConnectionGUID: AOQBFYTjTyihKqIZpk3mSg== X-CSE-MsgGUID: RDIi6aNHTYCXMJ3FRV4PCA== From: Moritz Haase To: CC: Moritz Haase Subject: [meta-oe][PATCH 06/10] wbxml2: upgrade 0.10.8 -> 0.11.10 Date: Fri, 11 Jul 2025 12:00:23 +0200 Message-ID: <20250711100052.255467-7-Moritz.Haase@bmw.de> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250711100052.255467-1-Moritz.Haase@bmw.de> References: <20250711100052.255467-1-Moritz.Haase@bmw.de> MIME-Version: 1.0 X-ClientProxiedBy: SMUCMP12E.europe.bmw.corp (2a03:1e80:a15:58f::1:320) To smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 11 Jul 2025 10:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/118441 The project has moved away from SourceForge to GitHub at [0] and has resumed publishing releases. The new version includes support to build against CMake 4+. [0]: https://github.com/libwbxml/libwbxml License-Update: Links to project homepage have been updated Signed-off-by: Moritz Haase --- .../opensync/{wbxml2_0.10.8.bb => wbxml2_0.11.10.bb} | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) rename meta-oe/recipes-support/opensync/{wbxml2_0.10.8.bb => wbxml2_0.11.10.bb} (50%) diff --git a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb b/meta-oe/recipes-support/opensync/wbxml2_0.11.10.bb similarity index 50% rename from meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb rename to meta-oe/recipes-support/opensync/wbxml2_0.11.10.bb index 02815ec7ba..50a00b526d 100644 --- a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb +++ b/meta-oe/recipes-support/opensync/wbxml2_0.11.10.bb @@ -1,16 +1,13 @@ SUMMARY = "WBXML parsing and encoding library" -HOMEPAGE = "http://libwbxml.opensync.org/" +HOMEPAGE = "https://github.com/libwbxml/libwbxml" SECTION = "libs" LICENSE = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=c1128ee5341ccd5927d8bafe4b6266e1" +LIC_FILES_CHKSUM = "file://COPYING;md5=b17146e5186e05865f75664e910ace79" DEPENDS = "expat" -SRC_URI = "${SOURCEFORGE_MIRROR}/libwbxml/libwbxml-${PV}.tar.gz" - -SRC_URI[sha256sum] = "a057daa098f12838eb4e635bb28413027f1b73819872c3fbf64e3207790a3f7d" - -S = "${UNPACKDIR}/libwbxml-${PV}" +SRC_URI = "git://github.com/libwbxml/libwbxml;branch=master;protocol=https;tag=libwbxml-${PV}" +SRCREV = "e58b1f19f11dbadff53e5b486b8c4b16639a656a" inherit cmake pkgconfig From patchwork Fri Jul 11 10:00:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Haase X-Patchwork-Id: 66619 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FA6AC83F1A for ; Fri, 11 Jul 2025 10:02:07 +0000 (UTC) Received: from esa7.hc324-48.eu.iphmx.com (esa7.hc324-48.eu.iphmx.com [207.54.71.126]) by mx.groups.io with SMTP id smtpd.web11.10154.1752228116595437643 for ; Fri, 11 Jul 2025 03:01:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bmw.de header.s=mailing1 header.b=g3TFpSw6; spf=pass (domain: bmw.de, ip: 207.54.71.126, mailfrom: prvs=28004f72d=moritz.haase@bmw.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmw.de; i=@bmw.de; q=dns/txt; s=mailing1; t=1752228118; x=1783764118; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ANhCN1OmCIt2w7QE0/rO2lnqbgvHrzqeNtpdvYhMr6s=; b=g3TFpSw6qp5WQy4czgHAzmPRZqh3d1l3BdwvExTi/ha3Wig7NUmK8Uxr Nu0Lrnn6z+iY5r79yd1lD6LiUdNiK7WIbQ05broGKVEl7dFre9w8Yeq/o hCchwJGzoufhaRSszktk3JCTEQke2C52olMGBvekSWDM3sFRJ2gtYFmzM o=; X-CSE-ConnectionGUID: 1EdOVw/UT5mdj+HcDimMBw== X-CSE-MsgGUID: 7o95oDVMQjCoRVRJ7a7iew== Received: from esagw4.bmwgroup.com (HELO esagw4.muc) ([160.46.252.39]) by esa7.hc324-48.eu.iphmx.com with ESMTP/TLS; 11 Jul 2025 12:01:39 +0200 Received: from unknown (HELO esabb5.muc) ([10.31.187.136]) by esagw4.muc with ESMTP/TLS; 11 Jul 2025 12:01:24 +0200 Received: from smucmp12a.bmwgroup.net (HELO smucmp12a.europe.bmw.corp) ([10.30.13.95]) by esabb5.muc with ESMTP/TLS; 11 Jul 2025 12:01:24 +0200 Received: from q1054628.de-cci.bmwgroup.net (10.30.85.215) by smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) with Microsoft SMTP Server (version=TLS; Fri, 11 Jul 2025 12:01:24 +0200 X-CSE-ConnectionGUID: LNxk1XAaSCebA6hdJnm+OQ== X-CSE-MsgGUID: SQb7QIimQFSgMzamvLjEJg== X-CSE-ConnectionGUID: yLzug7UbR8adKsUQfe6+dw== X-CSE-MsgGUID: 9Jqjp/VeQaCUuPtpGlYi8g== From: Moritz Haase To: CC: Moritz Haase Subject: [meta-oe][PATCH 07/10] upm: Allow to build with CMake 4+ Date: Fri, 11 Jul 2025 12:00:24 +0200 Message-ID: <20250711100052.255467-8-Moritz.Haase@bmw.de> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250711100052.255467-1-Moritz.Haase@bmw.de> References: <20250711100052.255467-1-Moritz.Haase@bmw.de> MIME-Version: 1.0 X-ClientProxiedBy: SMUCMP12E.europe.bmw.corp (2a03:1e80:a15:58f::1:320) To smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 11 Jul 2025 10:02:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/118444 Upstream is inactive, so use the 'minimum policy version' override. Signed-off-by: Moritz Haase --- meta-oe/recipes-extended/upm/upm_git.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb index 616f4ca09a..9b809ce727 100644 --- a/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-oe/recipes-extended/upm/upm_git.bb @@ -27,7 +27,9 @@ COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" inherit setuptools3-base cmake pkgconfig -EXTRA_OECMAKE += "-UPYTHON_EXECUTABLE -DWERROR=off" +EXTRA_OECMAKE += "-UPYTHON_EXECUTABLE -DWERROR=off \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ +" # override this in local.conf to get needed bindings. # BINDINGS:pn-upm="python" From patchwork Fri Jul 11 10:00:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Haase X-Patchwork-Id: 66613 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4A0AC8303C for ; Fri, 11 Jul 2025 10:01:36 +0000 (UTC) Received: from esa14.hc324-48.eu.iphmx.com (esa14.hc324-48.eu.iphmx.com [207.54.69.24]) by mx.groups.io with SMTP id smtpd.web11.10145.1752228086364171799 for ; Fri, 11 Jul 2025 03:01:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bmw.de header.s=mailing1 header.b=JTecIsLP; spf=pass (domain: bmw.de, ip: 207.54.69.24, mailfrom: prvs=28004f72d=moritz.haase@bmw.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmw.de; i=@bmw.de; q=dns/txt; s=mailing1; t=1752228091; x=1783764091; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=24vkhwCXLC/ILdcPJFhunkGWUujW4L8IdThzK3E3PPo=; b=JTecIsLPoJJ3a/Wb920RxKnukkuTe75mKYvnoy5tQnQ46gRbdN6OaLKT iK9ey26M3vK9x80VVhSCl/HnI5dcr3vmrvS+FO+Rxivw6inMRDT0yyZMw rrGh2//3e+vaHqVvI1Ki0fyjjdX8nJ5kKy8KtI1PpLO5TlWp3sYUJ9JBC s=; X-CSE-ConnectionGUID: 60qjpYQOSTODvxEjuKEWsg== X-CSE-MsgGUID: CkgFkfNoTwiu/e/IUlzBzw== Received: from 160.46.252.34.spf.bmwgroup.com (HELO esagw1.muc) ([160.46.252.34]) by esa14.hc324-48.eu.iphmx.com with ESMTP/TLS; 11 Jul 2025 12:01:24 +0200 Received: from esabb1.muc ([160.50.100.31]) by esagw1.muc with ESMTP/TLS; 11 Jul 2025 12:01:25 +0200 Received: from smucmp12a.bmwgroup.net (HELO smucmp12a.europe.bmw.corp) ([10.30.13.95]) by esabb1.muc with ESMTP/TLS; 11 Jul 2025 12:01:25 +0200 Received: from q1054628.de-cci.bmwgroup.net (10.30.85.215) by smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) with Microsoft SMTP Server (version=TLS; Fri, 11 Jul 2025 12:01:24 +0200 X-CSE-ConnectionGUID: iN70GqMmSri8NQoNxztJJw== X-CSE-MsgGUID: s3mipo/ETye0GnIIgY7vHw== X-CSE-ConnectionGUID: 6lZpek6ARaGjuCqYyae//Q== X-CSE-MsgGUID: lhYIFKyjTbCvnbpJAx8osA== From: Moritz Haase To: CC: Moritz Haase Subject: [meta-oe][PATCH 08/10] pcapplusplus: upgrade 24.09 -> 25.05 Date: Fri, 11 Jul 2025 12:00:25 +0200 Message-ID: <20250711100052.255467-9-Moritz.Haase@bmw.de> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250711100052.255467-1-Moritz.Haase@bmw.de> References: <20250711100052.255467-1-Moritz.Haase@bmw.de> MIME-Version: 1.0 X-ClientProxiedBy: SMUCMP12E.europe.bmw.corp (2a03:1e80:a15:58f::1:320) To smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 11 Jul 2025 10:01:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/118442 New version includes support to build against CMake 4+. Release notes are available at [0]. [0]: https://github.com/seladb/PcapPlusPlus/releases/tag/v25.05 Signed-off-by: Moritz Haase --- ...-Remove-whitespace-in-operator-_json.patch | 52 ------------------- ...lusplus_24.09.bb => pcapplusplus_25.05.bb} | 6 +-- 2 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-Remove-whitespace-in-operator-_json.patch rename meta-oe/recipes-connectivity/pcapplusplus/{pcapplusplus_24.09.bb => pcapplusplus_25.05.bb} (83%) diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-Remove-whitespace-in-operator-_json.patch b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-Remove-whitespace-in-operator-_json.patch deleted file mode 100644 index fb793548a2..0000000000 --- a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-Remove-whitespace-in-operator-_json.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 16974cb6a9f10fbd08db964ee0d9f074ef430db6 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Mar 2025 11:55:12 -0800 -Subject: [PATCH] Remove whitespace in operator"" _json - -Clang 20+ errors about this whitespace. - -Fixes -git/3rdParty/json/include/json.hpp:24428:58: error: identifier '_json' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator] - 24428 | using nlohmann::literals::json_literals::operator "" _json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers) - | ~~~~~~~~~~~~^~~~~ - | operator""_json - -Upstream-Status: Backport [ Its fixed in json import post 2024.9 release ] -Signed-off-by: Khem Raj ---- - 3rdParty/json/include/json.hpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/3rdParty/json/include/json.hpp b/3rdParty/json/include/json.hpp -index 60ba1df..6eceb7c 100644 ---- a/3rdParty/json/include/json.hpp -+++ b/3rdParty/json/include/json.hpp -@@ -24353,7 +24353,7 @@ inline namespace json_literals - /// @brief user-defined string literal for JSON values - /// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json/ - JSON_HEDLEY_NON_NULL(1) --inline nlohmann::json operator "" _json(const char* s, std::size_t n) -+inline nlohmann::json operator ""_json(const char* s, std::size_t n) - { - return nlohmann::json::parse(s, s + n); - } -@@ -24361,7 +24361,7 @@ inline nlohmann::json operator "" _json(const char* s, std::size_t n) - /// @brief user-defined string literal for JSON pointer - /// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json_pointer/ - JSON_HEDLEY_NON_NULL(1) --inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n) -+inline nlohmann::json::json_pointer operator ""_json_pointer(const char* s, std::size_t n) - { - return nlohmann::json::json_pointer(std::string(s, n)); - } -@@ -24425,8 +24425,8 @@ inline void swap(nlohmann::NLOHMANN_BASIC_JSON_TPL& j1, nlohmann::NLOHMANN_BASIC - } // namespace std - - #if JSON_USE_GLOBAL_UDLS -- using nlohmann::literals::json_literals::operator "" _json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers) -- using nlohmann::literals::json_literals::operator "" _json_pointer; //NOLINT(misc-unused-using-decls,google-global-names-in-headers) -+ using nlohmann::literals::json_literals::operator ""_json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers) -+ using nlohmann::literals::json_literals::operator ""_json_pointer; //NOLINT(misc-unused-using-decls,google-global-names-in-headers) - #endif - - // #include diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_24.09.bb b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_25.05.bb similarity index 83% rename from meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_24.09.bb rename to meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_25.05.bb index a04102aa42..aa5fb8d417 100644 --- a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_24.09.bb +++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_25.05.bb @@ -7,10 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=911690f51af322440237a253d695d19f" DEPENDS = "libpcap" -SRC_URI = "git://github.com/seladb/PcapPlusPlus.git;protocol=https;branch=master \ - file://0001-Remove-whitespace-in-operator-_json.patch \ - " -SRCREV = "4af4b8b04e6d5dd40b8e69cc30c5c1f62e7fe368" +SRC_URI = "git://github.com/seladb/PcapPlusPlus.git;protocol=https;branch=master;tag=v${PV}" +SRCREV = "a49a79e0b67b402ad75ffa96c1795def36df75c8" inherit cmake From patchwork Fri Jul 11 10:00:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Haase X-Patchwork-Id: 66610 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA9E2C83F1A for ; Fri, 11 Jul 2025 10:01:36 +0000 (UTC) Received: from esa9.hc324-48.eu.iphmx.com (esa9.hc324-48.eu.iphmx.com [207.54.69.27]) by mx.groups.io with SMTP id smtpd.web11.10146.1752228087130454326 for ; Fri, 11 Jul 2025 03:01:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bmw.de header.s=mailing1 header.b=qGyTHByi; spf=pass (domain: bmw.de, ip: 207.54.69.27, mailfrom: prvs=28004f72d=moritz.haase@bmw.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmw.de; i=@bmw.de; q=dns/txt; s=mailing1; t=1752228087; x=1783764087; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/FyM+zh7JrvC57+4Er1IaC9mlZ97DZSKEZoPRcVBc4g=; b=qGyTHByikUczOAMKkWG4RSkTBjDGEqjA5ziXH/NK6q90hh24/vAj/bWq SCfJENQ45v3xCF7iAVwu19X51CsTgEFwjWYfaH4SoCU4sVF2wPdc91gHG 48jTmhNGFf4pRcgabHkjUOTAsWqeaDs5SYLJaAdfYEcsYRvgCGUdVtIsv 0=; X-CSE-ConnectionGUID: WnTDub2xR5uXymd+zn4HNg== X-CSE-MsgGUID: kkOn351pTTuHQN9JnzaTaA== Received: from 160.46.252.35.spf.bmwgroup.com (HELO esagw3.muc) ([160.46.252.35]) by esa9.hc324-48.eu.iphmx.com with ESMTP/TLS; 11 Jul 2025 12:01:25 +0200 Received: from unknown (HELO esabb6.muc) ([10.31.187.137]) by esagw3.muc with ESMTP/TLS; 11 Jul 2025 12:01:25 +0200 Received: from smucmp12a.bmwgroup.net (HELO smucmp12a.europe.bmw.corp) ([10.30.13.95]) by esabb6.muc with ESMTP/TLS; 11 Jul 2025 12:01:25 +0200 Received: from q1054628.de-cci.bmwgroup.net (10.30.85.215) by smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) with Microsoft SMTP Server (version=TLS; Fri, 11 Jul 2025 12:01:24 +0200 X-CSE-ConnectionGUID: 0Pdpbf5DTG2jXuSppc1AEg== X-CSE-MsgGUID: OLIafLHxSCuVlswrFaq2Jg== X-CSE-ConnectionGUID: EZQyzauVSrGfCdEmpdKwHg== X-CSE-MsgGUID: hmiXEh36SXWeNcVwqgCyqw== From: Moritz Haase To: CC: Moritz Haase Subject: [meta-oe][PATCH 09/10] synergy: Allow to build with CMake 4+ Date: Fri, 11 Jul 2025 12:00:26 +0200 Message-ID: <20250711100052.255467-10-Moritz.Haase@bmw.de> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250711100052.255467-1-Moritz.Haase@bmw.de> References: <20250711100052.255467-1-Moritz.Haase@bmw.de> MIME-Version: 1.0 X-ClientProxiedBy: SMUCMP12E.europe.bmw.corp (2a03:1e80:a15:58f::1:320) To smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 11 Jul 2025 10:01:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/118434 The version hasn't been updated in years, so even though there are newer upstream releases, bumping the version is not straightforward. Thus, use the 'minimum policy version' override for now. Signed-off-by: Moritz Haase --- meta-oe/recipes-support/synergy/synergy_git.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/synergy/synergy_git.bb b/meta-oe/recipes-support/synergy/synergy_git.bb index e215c62620..e66c04b9fc 100644 --- a/meta-oe/recipes-support/synergy/synergy_git.bb +++ b/meta-oe/recipes-support/synergy/synergy_git.bb @@ -19,6 +19,8 @@ PV = "1.10.1+git" inherit cmake features_check -EXTRA_OECMAKE += "-DSYNERGY_BUILD_LEGACY_GUI=OFF" +EXTRA_OECMAKE += "-DSYNERGY_BUILD_LEGACY_GUI=OFF \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ +" FILES:${PN} += "${datadir}/icons/hicolor" From patchwork Fri Jul 11 10:00:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Haase X-Patchwork-Id: 66615 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12078C83F23 for ; Fri, 11 Jul 2025 10:01:37 +0000 (UTC) Received: from esa7.hc324-48.eu.iphmx.com (esa7.hc324-48.eu.iphmx.com [207.54.71.126]) by mx.groups.io with SMTP id smtpd.web10.10258.1752228088092278613 for ; Fri, 11 Jul 2025 03:01:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bmw.de header.s=mailing1 header.b=YDqYj/QF; spf=pass (domain: bmw.de, ip: 207.54.71.126, mailfrom: prvs=28004f72d=moritz.haase@bmw.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmw.de; i=@bmw.de; q=dns/txt; s=mailing1; t=1752228088; x=1783764088; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9gfR/t2di2A8a2vhi+DcdAm2PN5XhZjoU0Prrld+1qs=; b=YDqYj/QFHyW2SfoMhFOjlkwf7XnqgomfLYfCvGkEO2VT9D2KBrQduxpx JeRdPaFF6jAnes27LxzfMTJ5vzwYWjVhkjJYQaK1Y98mFWfoi+X3DNqiL Smalu7+VzhooR5gThpvAdKqy5ys9pKaKOapRYG9GpE3lESQaTvrcU5w2h E=; X-CSE-ConnectionGUID: QlO3OPlaTPmNn8rkP44hJA== X-CSE-MsgGUID: JlKo3aT0QQWipOAVln5gyQ== Received: from 160.46.252.34.spf.bmwgroup.com (HELO esagw1.muc) ([160.46.252.34]) by esa7.hc324-48.eu.iphmx.com with ESMTP/TLS; 11 Jul 2025 12:01:25 +0200 Received: from esabb1.muc ([160.50.100.31]) by esagw1.muc with ESMTP/TLS; 11 Jul 2025 12:01:25 +0200 Received: from smucmp12a.bmwgroup.net (HELO smucmp12a.europe.bmw.corp) ([10.30.13.95]) by esabb1.muc with ESMTP/TLS; 11 Jul 2025 12:01:25 +0200 Received: from q1054628.de-cci.bmwgroup.net (10.30.85.215) by smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) with Microsoft SMTP Server (version=TLS; Fri, 11 Jul 2025 12:01:25 +0200 X-CSE-ConnectionGUID: UaIMhk3KSeWph8GFf0Weaw== X-CSE-MsgGUID: COnFJVuITLWLyCLcoPuXeQ== X-CSE-ConnectionGUID: 4zWASYB/TVGQc6em+gWuhQ== X-CSE-MsgGUID: hLPQQhTjScaGNFvqX4+7DQ== From: Moritz Haase To: CC: Moritz Haase Subject: [meta-oe][PATCH 10/10] [RFC] vulkan-cts: upgrade 1.4.2.1 -> 1.4.3.1 Date: Fri, 11 Jul 2025 12:00:27 +0200 Message-ID: <20250711100052.255467-11-Moritz.Haase@bmw.de> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250711100052.255467-1-Moritz.Haase@bmw.de> References: <20250711100052.255467-1-Moritz.Haase@bmw.de> MIME-Version: 1.0 X-ClientProxiedBy: SMUCMP12E.europe.bmw.corp (2a03:1e80:a15:58f::1:320) To smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 11 Jul 2025 10:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/118436 New version includes support to build against CMake 4+. Release notes are available at [0]. [0]: https://github.com/KhronosGroup/VK-GL-CTS/releases --- This is an RFC, as the build doesn't pass for me locally, it fails with: | CMake Error at external/spirv-tools/CMakeLists.txt:39 (message): | spirv-tools not found From what I can tell, the in-place fetching of the submodule doesn't seem to be working correctly. Signed-off-by: Moritz Haase --- ...LAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch | 29 ------------------- .../vk-gl-cts/khronos-cts.inc | 1 - .../vk-gl-cts/vulkan-cts-sources.inc | 25 ++++++++-------- ...n-cts_1.4.2.1.bb => vulkan-cts_1.4.3.1.bb} | 2 +- 4 files changed, 13 insertions(+), 44 deletions(-) delete mode 100644 meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch rename meta-oe/recipes-graphics/vk-gl-cts/{vulkan-cts_1.4.2.1.bb => vulkan-cts_1.4.3.1.bb} (92%) diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch deleted file mode 100644 index 9eef9a702e..0000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ec12bb7bda60cdf2c848e13df67452a7d30a42be Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 3 Sep 2022 18:52:42 -0700 -Subject: [PATCH] cmake: Define WAYLAND_SCANNER and WAYLAND_PROTOCOLS_DIR if - not already defined - -This helps with cross compiling and providing these knobs from cmake -cmdline - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - framework/platform/CMakeLists.txt | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - ---- a/framework/platform/CMakeLists.txt -+++ b/framework/platform/CMakeLists.txt -@@ -83,8 +83,9 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS) - configure_file(${WAYLAND_XDG_SHELL_SRC_DIR}/xdg-shell.c ${DEQP_XDG_SHELL_GEN_OUTPUTS_DIR}/xdg-shell.c COPYONLY) - configure_file(${WAYLAND_XDG_SHELL_SRC_DIR}/xdg-shell.h ${DEQP_XDG_SHELL_GEN_OUTPUTS_DIR}/xdg-shell.h COPYONLY) - else () -- pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) -- -+ if (NOT WAYLAND_PROTOCOL_DIR) -+ pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) -+ endif() - if (NOT WAYLAND_SCANNER) - pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) - endif() diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index 1cc2da7a49..67a0dc564c 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -2,7 +2,6 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://github.com/KhronosGroup/VK-GL-CTS.git;protocol=https;name=vk-gl-cts;nobranch=1 \ - file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch \ file://0001-use-library-sonames-for-linking.patch \ file://generate-srcuri.py \ " diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts-sources.inc b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts-sources.inc index 563da1007a..df530e85e1 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts-sources.inc +++ b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts-sources.inc @@ -6,21 +6,20 @@ RECIPE_UPGRADE_EXTRA_TASKS += "do_refresh_srcuri" python __anonymous() { - if d.getVar("PV") != "1.4.2.1": + if d.getVar("PV") != "1.4.3.1": bb.warn("-sources.inc out of date, run refresh_srcuri task") } SRC_URI += " \ - https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/external/renderdoc/src;sha256sum=e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e \ - git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/spirv-tools/src;rev=3364b982713a0440d1d342dd5eec65b122a61b71 \ - git://github.com/KhronosGroup/glslang.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/glslang/src;rev=1b65bd602b23d401d1c4c86dfa90a36a52c66294 \ - git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/spirv-headers/src;rev=767e901c986e9755a17e7939b3046fc2911a4bbd \ - git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-docs/src;rev=645c59c70e826d9738b6bb103316c03d887dfed3 \ - git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-validationlayers/src;rev=6cf616f131e9870c499a50441bca2d07ccda9733 \ - git://github.com/google/amber.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/amber/src;rev=6fa5ac1fb3b01c93eef3caa2aeb8841565e38d90 \ - git://github.com/open-source-parsers/jsoncpp.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/jsoncpp/src;rev=9059f5cad030ba11d37818847443a53918c327b1 \ - git://github.com/Igalia/vk_video_samples.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/nvidia-video-samples/src;rev=45fe88b456c683120138f052ea81f0a958ff3ec4 \ - git://github.com/KhronosGroup/Vulkan-Video-Samples.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/vulkan-video-samples/src;rev=0e87744edbb84c9c56c3fc8de9ea5150af5ee4ea \ - git://github.com/Igalia/video_generator.git;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/video_generator/src;rev=426300e12a5cc5d4676807039a1be237a2b68187 \ - file://0001-Fix-missing-include-cstdint-causing-build-failures.patch;patchdir=external/amber/src \ + https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;sha256sum=e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e \ + git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;nobranch=1;destsuffix=git/external/spirv-tools/src;rev=f06e0f3d2e5acfe4b14e714e4103dd1ccdb237e5 \ + git://github.com/KhronosGroup/glslang.git;protocol=https;nobranch=1;destsuffix=git/external/glslang/src;rev=963588074b26326ff0426c8953c1235213309bdb \ + git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;nobranch=1;destsuffix=git/external/spirv-headers/src;rev=6d0784e9f1ab92c17eeea94821b2465c14a52be9 \ + git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;nobranch=1;destsuffix=git/external/vulkan-docs/src;rev=112aee75d162412a4623e7d22a3de52e0233cbf5 \ + git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;protocol=https;nobranch=1;destsuffix=git/external/vulkan-validationlayers/src;rev=6ae58a2b17b2bcebdc5377995007391b85ffa10f \ + git://github.com/google/amber.git;protocol=https;nobranch=1;destsuffix=git/external/amber/src;rev=57ba1ca211b6f4890c013dcf42cb16069ae916dd \ + git://github.com/open-source-parsers/jsoncpp.git;protocol=https;nobranch=1;destsuffix=git/external/jsoncpp/src;rev=9059f5cad030ba11d37818847443a53918c327b1 \ + git://github.com/Igalia/vk_video_samples.git;protocol=https;nobranch=1;destsuffix=git/external/nvidia-video-samples/src;rev=45fe88b456c683120138f052ea81f0a958ff3ec4 \ + git://github.com/KhronosGroup/Vulkan-Video-Samples.git;protocol=https;nobranch=1;destsuffix=git/external/vulkan-video-samples/src;rev=a22e0084e6f38a16dc0dcebb4c19a14651a6665b \ + git://github.com/Igalia/video_generator.git;protocol=https;nobranch=1;destsuffix=git/external/video_generator/src;rev=426300e12a5cc5d4676807039a1be237a2b68187 \ " diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.4.2.1.bb b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.4.3.1.bb similarity index 92% rename from meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.4.2.1.bb rename to meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.4.3.1.bb index abbd026047..3f7a2480ef 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.4.2.1.bb +++ b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.4.3.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Vulkan CTS" require khronos-cts.inc -SRCREV_vk-gl-cts = "644f10ca39dea3b7d9dbadaa75c56206b499a520" +SRCREV_vk-gl-cts = "1ef11bc7acde6b53a499de73db4cf78db9572710" require vulkan-cts-sources.inc