From: Wang Mingyu <wan...@fujitsu.com> 0001-meson.build-use-python3-directly-for-python.patch refreshed for 1.0.1
0001-vtest-Fix-undefined-behavior-with-clang.patch removed since it's included in 1.0.1 Signed-off-by: Wang Mingyu <wan...@fujitsu.com> --- ...uild-use-python3-directly-for-python.patch | 6 +- ...st-Fix-undefined-behavior-with-clang.patch | 56 ------------------- ...nderer_1.0.0.bb => virglrenderer_1.0.1.bb} | 3 +- 3 files changed, 4 insertions(+), 61 deletions(-) delete mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-Fix-undefined-behavior-with-clang.patch rename meta/recipes-graphics/virglrenderer/{virglrenderer_1.0.0.bb => virglrenderer_1.0.1.bb} (92%) 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 06379ee716..3e12495970 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 2afe24fc95dbb89e99df29ccbe73afa835f58202 Mon Sep 17 00:00:00 2001 +From dec8cca59124d7f8796b54902482ceb295a71b51 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kana...@gmail.com> Date: Mon, 6 Jan 2020 12:44:42 +0100 Subject: [PATCH] meson.build: use 'python3' directly for python @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index de6d16b5..79cedbf6 100644 +index 9f91ff2f..2391f89d 100644 --- a/meson.build +++ b/meson.build -@@ -68,7 +68,7 @@ flags = [ +@@ -74,7 +74,7 @@ flags = [ add_project_arguments(cc.get_supported_arguments(flags), language : 'c') diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-Fix-undefined-behavior-with-clang.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-Fix-undefined-behavior-with-clang.patch deleted file mode 100644 index 48488d7be1..0000000000 --- a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-Fix-undefined-behavior-with-clang.patch +++ /dev/null @@ -1,56 +0,0 @@ -From ea328b246d093477cf26a68b42e975aaaef6abad Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.k...@gmail.com> -Date: Tue, 28 Nov 2023 21:55:36 -0800 -Subject: [PATCH] vtest: Fix undefined behavior with clang - -This is seen when compiling with CC="clang -D_FORTIFY_SOURCE=2" -Move #ifdef outside of printf() call. - -Fixes - -| ../git/vtest/vtest_server.c:244:2: error: embedding a directive within macro arguments has undefined behavior [-Werror,-Wembedded-directive] -| 244 | #ifdef ENABLE_VENUS -| | ^ -| ../git/vtest/vtest_server.c:246:2: error: embedding a directive within macro arguments has undefined behavior [-Werror,-Wembedded-directive] -| 246 | #endif -| | ^ - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1309] -Signed-off-by: Khem Raj <raj.k...@gmail.com> ---- - vtest/vtest_server.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/vtest/vtest_server.c b/vtest/vtest_server.c -index 1ca7f74f..93d949d7 100644 ---- a/vtest/vtest_server.c -+++ b/vtest/vtest_server.c -@@ -197,6 +197,12 @@ static void vtest_server_parse_args(int argc, char **argv) - /* getopt_long stores the option index here. */ - int option_index = 0; - -+#ifdef ENABLE_VENUS -+ char* ven = " [--venus]"; -+#else -+ char* ven = ""; -+#endif -+ - do { - ret = getopt_long(argc, argv, "", long_options, &option_index); - -@@ -244,10 +250,8 @@ static void vtest_server_parse_args(int argc, char **argv) - printf("Usage: %s [--no-fork] [--no-loop-or-fork] [--multi-clients] " - "[--use-glx] [--use-egl-surfaceless] [--use-gles] [--no-virgl]" - "[--rendernode <dev>] [--socket-path <path>] " --#ifdef ENABLE_VENUS -- " [--venus]" --#endif -- " [file]\n", argv[0]); -+ "%s" -+ " [file]\n", argv[0], ven); - exit(EXIT_FAILURE); - break; - } --- -2.43.0 - diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.0.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.1.bb similarity index 92% rename from meta/recipes-graphics/virglrenderer/virglrenderer_1.0.0.bb rename to meta/recipes-graphics/virglrenderer/virglrenderer_1.0.1.bb index eb7ba1089f..0501b0c59c 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.0.bb +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.1.bb @@ -9,10 +9,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" DEPENDS = "libdrm libepoxy virtual/egl virtual/libgbm" -SRCREV = "9c9d55ecbe502e0d71ee99529709efcca69aac42" +SRCREV = "690680e5f0f952e22424fca1538c1b24457a0868" SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=main;protocol=https \ file://0001-meson.build-use-python3-directly-for-python.patch \ - file://0001-vtest-Fix-undefined-behavior-with-clang.patch \ " S = "${WORKDIR}/git" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#193665): https://lists.openembedded.org/g/openembedded-core/message/193665 Mute This Topic: https://lists.openembedded.org/mt/103735731/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-