mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-03 02:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

piglit: update the patch to fix building the test without wayland

Browse Source 
Fix the following error appearing if building on a pure-X11 distros:

<PATH>/git/tests/egl/egl-wayland.c:29:10: fatal error: wayland-client.h: No such file or directory
   29 | #include <wayland-client.h>
      |          ^~~~~~~~~~~~~~~~~~

(From OE-Core rev: 61d344636cf59ad11805923665543cde4eb6cbd7)

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Dmitry Baryshkov
2024-12-01 01:13:31 +02:00
committed by Richard Purdie
parent 77f8b8e981
commit 156fd7be4f
1 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
meta/recipes-graphics/piglit/piglit/0001-tests-egl-spec-make-egl_ext_surface_compression-cond.patch
View File

@@ -11,23 +11,45 @@ Otherwise, this error occurs:
| | ^~~~~~~~~~~~
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/974]
Co-developed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
tests/egl/spec/CMakeLists.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
.../spec/egl_ext_surface_compression/CMakeLists.gles3.txt | 6 ++++--
tests/egl/spec/egl_ext_surface_compression/create_surface.c | 1 -
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/egl/spec/egl_ext_surface_compression/CMakeLists.gles3.txt b/tests/egl/spec/egl_ext_surface_compression/CMakeLists.gles3.txt
index d9540bcfde27..01a70164f444 100644
--- a/tests/egl/spec/egl_ext_surface_compression/CMakeLists.gles3.txt
+++ b/tests/egl/spec/egl_ext_surface_compression/CMakeLists.gles3.txt
@@ -2,10 +2,12 @@ link_libraries(
piglitutil_${piglit_target_api}
)
-piglit_add_executable(egl_ext_surface_compression-create ../../egl-util.c
+if (PIGLIT_HAS_WAYLAND)
+piglit_add_executable(egl_ext_surface_compression-create
../../egl-wayland.c create_surface.c)
+endif (PIGLIT_HAS_WAYLAND)
-piglit_add_executable(egl_ext_surface_compression-image ../../egl-util.c
+piglit_add_executable(egl_ext_surface_compression-image
image_storage.c)
# vim: ft=cmake:
diff --git a/tests/egl/spec/egl_ext_surface_compression/create_surface.c b/tests/egl/spec/egl_ext_surface_compression/create_surface.c
index e3d55d4331fb..35f13fd007b4 100644
--- a/tests/egl/spec/egl_ext_surface_compression/create_surface.c
+++ b/tests/egl/spec/egl_ext_surface_compression/create_surface.c
@@ -25,7 +25,6 @@
#include "piglit-util.h"
#include "piglit-util-egl.h"
#include "piglit-util-gl.h"
-#include "../../egl-util.h"
#include "../../egl-wayland.h"
static enum piglit_result
--
2.39.5
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)