From: Alexander Kanavin <[email protected]> Drop two configurations options removed upstream.
Signed-off-by: Alexander Kanavin <[email protected]> --- ...once_flag-ONCE_FLAG_INIT-when-presen.patch | 57 ------------------- ...uild-use-python3-directly-for-python.patch | 8 +-- ...5fc57b07c06b5e0b3a3694d06898ebc80163.patch | 7 +-- ...nderer_1.2.0.bb => virglrenderer_1.3.0.bb} | 5 +- 4 files changed, 7 insertions(+), 70 deletions(-) delete mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/0001-c11-use-glibc-s-once_flag-ONCE_FLAG_INIT-when-presen.patch rename meta/recipes-graphics/virglrenderer/{virglrenderer_1.2.0.bb => virglrenderer_1.3.0.bb} (81%) diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-c11-use-glibc-s-once_flag-ONCE_FLAG_INIT-when-presen.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-c11-use-glibc-s-once_flag-ONCE_FLAG_INIT-when-presen.patch deleted file mode 100644 index 5f90d59ba7..0000000000 --- a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-c11-use-glibc-s-once_flag-ONCE_FLAG_INIT-when-presen.patch +++ /dev/null @@ -1,57 +0,0 @@ -From c076c52a323584d6d00ca7079072cbc0dd88cb43 Mon Sep 17 00:00:00 2001 -From: Dave Airlie <[email protected]> -Date: Fri, 7 Nov 2025 13:14:56 +1000 -Subject: [PATCH] c11/threads: fix build on c23 - -C23/glibc is now including once_init in stdlib.h - -https://patchwork.sourceware.org/project/glibc/patch/[email protected]/#213088 - -Just fix up our use of it. - -Upstream-Status: Backport [https://gitlab.freedesktop.org/virgl/virglrenderer/-/commit/3f0f775edb2df5ea54c37863286ad565ccddb276] -Signed-off-by: Khem Raj <[email protected]> ---- - src/mesa/compat/c11/threads_posix.h | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/mesa/compat/c11/threads_posix.h b/src/mesa/compat/c11/threads_posix.h -index 45cb6075..071faf79 100644 ---- a/src/mesa/compat/c11/threads_posix.h -+++ b/src/mesa/compat/c11/threads_posix.h -@@ -51,7 +51,9 @@ Configuration macro: - #include <pthread.h> - - /*---------------------------- macros ----------------------------*/ -+#ifndef __once_flag_defined - #define ONCE_FLAG_INIT PTHREAD_ONCE_INIT -+#endif - #ifdef INIT_ONCE_STATIC_INIT - #define TSS_DTOR_ITERATIONS PTHREAD_DESTRUCTOR_ITERATIONS - #else -@@ -66,8 +68,9 @@ typedef pthread_cond_t cnd_t; - typedef pthread_t thrd_t; - typedef pthread_key_t tss_t; - typedef pthread_mutex_t mtx_t; -+#ifndef __once_flag_defined - typedef pthread_once_t once_flag; -- -+#endif - - /* - Implementation limits: -@@ -90,12 +93,13 @@ impl_thrd_routine(void *p) - - /*--------------- 7.25.2 Initialization functions ---------------*/ - // 7.25.2.1 -+#ifndef __once_flag_defined - static inline void - call_once(once_flag *flag, void (*func)(void)) - { - pthread_once(flag, func); - } -- -+#endif - - /*------------- 7.25.3 Condition variable functions -------------*/ - // 7.25.3.1 diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch index 6f0ba3ebab..6064329e35 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch +++ b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch @@ -1,4 +1,4 @@ -From 51c8a5a568b2cd1dfcb53ed3b49a0f8899be7be4 Mon Sep 17 00:00:00 2001 +From b804697f9814c1beac5f2b9a9eb1dd9d04dfcd1c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 6 Jan 2020 12:44:42 +0100 Subject: [PATCH] meson.build: use 'python3' directly for python @@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 193ba32b..c01cae65 100644 +index 69c1bb82..08b1f266 100644 --- a/meson.build +++ b/meson.build @@ -77,7 +77,7 @@ flags = [ @@ -23,5 +23,5 @@ index 193ba32b..c01cae65 100644 -prog_python = import('python').find_installation('python3') +prog_python = 'python3' - not_found = dependency('', required: false) - gbm_dep = not_found + with_host_windows = host_machine.system() == 'windows' + with_host_darwin = host_machine.system() == 'darwin' diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/986b5fc57b07c06b5e0b3a3694d06898ebc80163.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/986b5fc57b07c06b5e0b3a3694d06898ebc80163.patch index 91e01f0616..1aa73c4693 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer/986b5fc57b07c06b5e0b3a3694d06898ebc80163.patch +++ b/meta/recipes-graphics/virglrenderer/virglrenderer/986b5fc57b07c06b5e0b3a3694d06898ebc80163.patch @@ -1,4 +1,4 @@ -From 986b5fc57b07c06b5e0b3a3694d06898ebc80163 Mon Sep 17 00:00:00 2001 +From c0eeacaf2f3487cc3225f1b2316461eccdcf44b5 Mon Sep 17 00:00:00 2001 From: Maximilian Hofmann <[email protected]> Date: Thu, 26 Feb 2026 23:28:58 +0100 Subject: [PATCH] fix: build with glibc 2.43 @@ -19,7 +19,7 @@ Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/15 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/auxiliary/tgsi/tgsi_text.c b/src/gallium/auxiliary/tgsi/tgsi_text.c -index db7d7b952..7e37bf794 100644 +index db7d7b95..7e37bf79 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_text.c +++ b/src/gallium/auxiliary/tgsi/tgsi_text.c @@ -84,7 +84,7 @@ streq_nocase_uprcase(const char *str1, @@ -31,6 +31,3 @@ index db7d7b952..7e37bf794 100644 if (unlikely(str)) { *pcur = str; return false; --- -GitLab - diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_1.2.0.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_1.3.0.bb similarity index 81% rename from meta/recipes-graphics/virglrenderer/virglrenderer_1.2.0.bb rename to meta/recipes-graphics/virglrenderer/virglrenderer_1.3.0.bb index c7aef527b0..ed47563734 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer_1.2.0.bb +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_1.3.0.bb @@ -9,10 +9,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" DEPENDS = "libdrm libepoxy python3-pyyaml-native virtual/egl virtual/libgbm" -SRCREV = "500b41d5c8638f9b80dd558f4044f3301c7457a4" +SRCREV = "ca50e008863837e094747a69974dde3ae148aeaa" SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=main;protocol=https;tag=${PV} \ file://0001-meson.build-use-python3-directly-for-python.patch \ - file://0001-c11-use-glibc-s-once_flag-ONCE_FLAG_INIT-when-presen.patch \ file://986b5fc57b07c06b5e0b3a3694d06898ebc80163.patch \ " @@ -22,9 +21,7 @@ PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'venus', '', PACKAGECONFIG[venus] = "-Dvenus=true,-Dvenus=false,vulkan-loader vulkan-headers" PACKAGECONFIG[va] = "-Dvideo=true,-Dvideo=false,libva" -PACKAGECONFIG[render-server] = "-Drender-server=true,-Drender-server=false" PACKAGECONFIG[minigbm_allocation] = "-Dminigbm_allocation=true,-Dminigbm_allocation=false" -PACKAGECONFIG[venus-validate] = "-Dvenus-validate=true,-Dvenus-validate=false" PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,libcheck" BBCLASSEXTEND = "native nativesdk" -- 2.47.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#238954): https://lists.openembedded.org/g/openembedded-core/message/238954 Mute This Topic: https://lists.openembedded.org/mt/119839195/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
