From: Alexander Kanavin <[email protected]> Signed-off-by: Alexander Kanavin <[email protected]> --- ...o-not-obtain-wayland-scanner-path-fr.patch | 7 ++-- ...Fix-narrowing-errors-seen-with-clang.patch | 2 +- ...ake-egl_ext_surface_compression-cond.patch | 33 +++++++++++++++++++ ...proper-WAYLAND_INCLUDE_DIRS-variable.patch | 2 +- ...t-shader.c-do-not-hardcode-build-pat.patch | 2 +- meta/recipes-graphics/piglit/piglit_git.bb | 3 +- 6 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 meta/recipes-graphics/piglit/piglit/0001-tests-egl-spec-make-egl_ext_surface_compression-cond.patch
diff --git a/meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch b/meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch index b47e16af6b3..0c872d3e9b6 100644 --- a/meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch +++ b/meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch @@ -1,4 +1,4 @@ -From 8f25cdf54e35ab1a174cabf5078784b8e48bda01 Mon Sep 17 00:00:00 2001 +From 2af98d67e16e083c36e3193aefbda942399a455a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 23 Aug 2024 15:29:45 +0200 Subject: [PATCH] CMakeLists.txt: do not obtain wayland-scanner path from @@ -17,7 +17,7 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index d169fb481..8394f5236 100644 +index 73750f67e..8018a1bb7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -211,11 +211,7 @@ if(PIGLIT_USE_WAYLAND) @@ -33,6 +33,3 @@ index d169fb481..8394f5236 100644 add_executable(WaylandScannerExe IMPORTED) set_property(TARGET WaylandScannerExe PROPERTY IMPORTED_LOCATION ${WaylandScannerPath}) endif() --- -2.39.2 - diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch index 08e709b1d02..cfdfeb683e0 100644 --- a/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch +++ b/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch @@ -1,4 +1,4 @@ -From 77f327909e4a99c64261290cd76e234e10cc64d2 Mon Sep 17 00:00:00 2001 +From 70f8d56bf9db9d85f3d197ab9de972e3a514514c Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Wed, 3 May 2023 21:59:43 -0700 Subject: [PATCH] tests: Fix narrowing errors seen with clang diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-egl-spec-make-egl_ext_surface_compression-cond.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-egl-spec-make-egl_ext_surface_compression-cond.patch new file mode 100644 index 00000000000..47f8b03961c --- /dev/null +++ b/meta/recipes-graphics/piglit/piglit/0001-tests-egl-spec-make-egl_ext_surface_compression-cond.patch @@ -0,0 +1,33 @@ +From 0c97d5eacae4f584313c9251e585bb0246cceffc Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Fri, 22 Nov 2024 22:52:31 +0100 +Subject: [PATCH] tests/egl/spec: make egl_ext_surface_compression conditional + to X11 + +Otherwise, this error occurs: +| In file included from /srv/storage/alex/yocto/build-64/workspace/sources/piglit/tests/egl/spec/egl_ext_surface_compression/create_surface.c:28: +| /srv/storage/alex/yocto/build-64/workspace/sources/piglit/tests/egl/spec/egl_ext_surface_compression/../../egl-util.h:12:10: fatal error: X11/Xlib.h: No such file or directory +| 12 | #include <X11/Xlib.h> +| | ^~~~~~~~~~~~ + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/974] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + tests/egl/spec/CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/egl/spec/CMakeLists.txt b/tests/egl/spec/CMakeLists.txt +index 33c504978..1dea6d8fc 100644 +--- a/tests/egl/spec/CMakeLists.txt ++++ b/tests/egl/spec/CMakeLists.txt +@@ -7,7 +7,9 @@ add_subdirectory (egl_ext_device_drm) + add_subdirectory (egl_ext_platform_device) + add_subdirectory (egl_ext_image_dma_buf_import_modifiers) + add_subdirectory (egl_ext_protected_content) +-add_subdirectory (egl_ext_surface_compression) ++if (PIGLIT_HAS_X11) ++ add_subdirectory (egl_ext_surface_compression) ++endif (PIGLIT_HAS_X11) + add_subdirectory (egl_khr_create_context) + add_subdirectory (egl_khr_display_reference) + add_subdirectory (egl_khr_get_all_proc_addresses) diff --git a/meta/recipes-graphics/piglit/piglit/0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch b/meta/recipes-graphics/piglit/piglit/0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch index 70bb55053dc..17bcbce1908 100644 --- a/meta/recipes-graphics/piglit/piglit/0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch +++ b/meta/recipes-graphics/piglit/piglit/0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch @@ -1,4 +1,4 @@ -From cb8e4b99fcfe81399e3e6d922156db4a48a39a8e Mon Sep 17 00:00:00 2001 +From 9b2c2213a2d7aaea350649ee031e227b44343428 Mon Sep 17 00:00:00 2001 From: Pascal Bach <[email protected]> Date: Thu, 4 Oct 2018 14:43:17 +0200 Subject: [PATCH] cmake: use proper WAYLAND_INCLUDE_DIRS variable diff --git a/meta/recipes-graphics/piglit/piglit/0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch b/meta/recipes-graphics/piglit/piglit/0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch index ce5cbd3ea97..767e93c43e1 100644 --- a/meta/recipes-graphics/piglit/piglit/0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch +++ b/meta/recipes-graphics/piglit/piglit/0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch @@ -1,4 +1,4 @@ -From 7d2d23125f1946a7b74f9a427388d469500fcd8d Mon Sep 17 00:00:00 2001 +From 3d621cf028acb3b464759abb72a38102844079b2 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Tue, 10 Nov 2020 17:13:50 +0000 Subject: [PATCH] tests/util/piglit-shader.c: do not hardcode build path into diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index fbf20de176e..3e950ff61c5 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -11,10 +11,11 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=ma file://0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch \ file://0001-tests-Fix-narrowing-errors-seen-with-clang.patch \ file://0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch \ + file://0001-tests-egl-spec-make-egl_ext_surface_compression-cond.patch \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "c11c9374c1448d01b31e7f724921cc1f4ee2c84c" +SRCREV = "d04d6fff00849a2a8e29ef3251c6ca04a2f68dc7" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr" -- 2.39.5
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#207764): https://lists.openembedded.org/g/openembedded-core/message/207764 Mute This Topic: https://lists.openembedded.org/mt/109769673/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
