Skip to content

Commit dcf467a

Browse files
lumagleimaohui
authored andcommitted
piglit: update the patch to fix building the test without wayland
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 <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
1 parent 3bc570b commit dcf467a

File tree

1 file changed

+39
-17
lines changed

1 file changed

+39
-17
lines changed

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

+39-17
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,45 @@ Otherwise, this error occurs:
1111
| | ^~~~~~~~~~~~
1212

1313
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/974]
14+
Co-developed-by: Dmitry Baryshkov <[email protected]>
15+
Signed-off-by: Dmitry Baryshkov <[email protected]>
1416
Signed-off-by: Alexander Kanavin <[email protected]>
1517
---
16-
tests/egl/spec/CMakeLists.txt | 4 +++-
17-
1 file changed, 3 insertions(+), 1 deletion(-)
18+
.../spec/egl_ext_surface_compression/CMakeLists.gles3.txt | 6 ++++--
19+
tests/egl/spec/egl_ext_surface_compression/create_surface.c | 1 -
20+
2 files changed, 4 insertions(+), 3 deletions(-)
21+
22+
diff --git a/tests/egl/spec/egl_ext_surface_compression/CMakeLists.gles3.txt b/tests/egl/spec/egl_ext_surface_compression/CMakeLists.gles3.txt
23+
index d9540bcfde27..01a70164f444 100644
24+
--- a/tests/egl/spec/egl_ext_surface_compression/CMakeLists.gles3.txt
25+
+++ b/tests/egl/spec/egl_ext_surface_compression/CMakeLists.gles3.txt
26+
@@ -2,10 +2,12 @@ link_libraries(
27+
piglitutil_${piglit_target_api}
28+
)
29+
30+
-piglit_add_executable(egl_ext_surface_compression-create ../../egl-util.c
31+
+if (PIGLIT_HAS_WAYLAND)
32+
+piglit_add_executable(egl_ext_surface_compression-create
33+
../../egl-wayland.c create_surface.c)
34+
+endif (PIGLIT_HAS_WAYLAND)
35+
36+
-piglit_add_executable(egl_ext_surface_compression-image ../../egl-util.c
37+
+piglit_add_executable(egl_ext_surface_compression-image
38+
image_storage.c)
39+
40+
# vim: ft=cmake:
41+
diff --git a/tests/egl/spec/egl_ext_surface_compression/create_surface.c b/tests/egl/spec/egl_ext_surface_compression/create_surface.c
42+
index e3d55d4331fb..35f13fd007b4 100644
43+
--- a/tests/egl/spec/egl_ext_surface_compression/create_surface.c
44+
+++ b/tests/egl/spec/egl_ext_surface_compression/create_surface.c
45+
@@ -25,7 +25,6 @@
46+
#include "piglit-util.h"
47+
#include "piglit-util-egl.h"
48+
#include "piglit-util-gl.h"
49+
-#include "../../egl-util.h"
50+
#include "../../egl-wayland.h"
51+
52+
static enum piglit_result
53+
--
54+
2.39.5
1855

19-
diff --git a/tests/egl/spec/CMakeLists.txt b/tests/egl/spec/CMakeLists.txt
20-
index 33c504978..1dea6d8fc 100644
21-
--- a/tests/egl/spec/CMakeLists.txt
22-
+++ b/tests/egl/spec/CMakeLists.txt
23-
@@ -7,7 +7,9 @@ add_subdirectory (egl_ext_device_drm)
24-
add_subdirectory (egl_ext_platform_device)
25-
add_subdirectory (egl_ext_image_dma_buf_import_modifiers)
26-
add_subdirectory (egl_ext_protected_content)
27-
-add_subdirectory (egl_ext_surface_compression)
28-
+if (PIGLIT_HAS_X11)
29-
+ add_subdirectory (egl_ext_surface_compression)
30-
+endif (PIGLIT_HAS_X11)
31-
add_subdirectory (egl_khr_create_context)
32-
add_subdirectory (egl_khr_display_reference)
33-
add_subdirectory (egl_khr_get_all_proc_addresses)

0 commit comments

Comments
 (0)