piglit: upgrade 22eaf6a91c -> c11c9374c1
Quoted 10 lines · Trevor Gamblin via lists.openembedded.org
Commit
766669895dfixes builds with numpy 2.x.Patch '0001-utils-Include-libgen.h-on-musl-linux-systems.patch' dropped because it is now upstream in commit
9c941dfc36.Add wayland and wayland-protocols to DEPENDS to avoid errors during build.
Adjust the x11 PACKAGECONFIG flags so that piglit builds without x11 available.
FYI, I've tried the reproducible tests on piglit with and without TCLIBC=musl, and also with and without the numpy 2.0.1 upgrade, and I can't reproduce them. Hopefully this works on the AB now.
- Trevor
Quoted 236 lines
Changelog:
c11c9374c(HEAD -> main, origin/main, origin/HEAD)arb_bindless_texture: test image/sampler constructorsf11abb664Revert "arb_bindless_texture: add another function param bindless test"
045343687arb_gpu_shader5: add linker version of function overloads test4b1116f3aarb_bindless_texture: add another function param bindless test4a62c2672glsl: test function linking with implicit param conversions9f280db77arb_bindless_texture: add basic function param bindless tests
766669895generated_tests: fix numpy overflow warnings that are errors in numpy 2.05214915dcgenerated_tests: print mako exceptions41bd119f2arb_texture_buffer_object: don't leak src strings582f5490agl-1.0: Add a test for glPushAttrib/glPopAttrib647d07250ext_texture_format_bgra8888: testGL_BGRA8_EXTas welldee2a233fperf: port glsl-compile-time perf-test from mesa demos18333c568perf: port vertexrate perf-test from mesa demose932fa2f5perf: port vbo perf-test from mesa demosf9cf4788aperf: port teximage perf-test from mesa demos20ccc1c10perf: port readpixels perf-test from mesa demos556a9c96dperf: port genmipmap perf-test from mesa demos225b6bfb6perf: port fill perf-test from mesa demosdae4a13f9perf: port fbobind perf-test from mesa demoscd0f812b3perf: port copytex perf-test from mesa demosfdf3fc09dcl: add missing errors01b64dd06glsl-1.10: test a complex partial unroll scenariocf8daaf5bglsl-bug-110796: detect missing ES 3.2 support usingEGL_BAD_MATCH30d34daf7glsl-bug-110796: distinguish which context creation failed3ea14414aSync .mailmap from Mesa7accec34aglsl-bug-110796: check for GL ES 3.2 support12ebd71c7egl-terminate-then-unbind-context: simplify69bc38a77egl_khr_create_context: improve skip reporting209becf6darb_blend_func_extended: simplifyMAX_DUAL_SOURCE_DRAW_BUFFERSdetection800abe232arb_blend_func_extended: gles: follow the specification requirements1cad6ee20arb_texture_multisample: require geometry shaders59bdc8c4eegl: missing EGLconfig isn't stderr materialcee2190b5ext_external_objects: avoid stderr when we skip the test8cbefab52util: remove handwritten defines and drop FIXME11e7aa044texsubimage: fix low bpp formats by expecting less than 8 bits of precisione180f9623UseGBM_LDFLAGSto get all options3bddb36e8fixvk_vert_buf_reusecleanup8f6e71975arb_texture_view: test for NaN in more cases446c20f3eext_direct_state_access: Fix deprecated-non-prototype warnings8a6ce9c6farb_fragment_layer_viewport: don't test out-of-rangegl_Layervalues8d5af6c51glsl-1.30: Test uint to float conversion of sign extended value7aa7bc1b0arb_draw_buffers_blend: Fix deprecated-non-prototype warnings3d3a20a2barb_sample_shading: do not actually runmask_in_oneif it's not supported759cc6454clear-stencil: new test to check for problems clearing stencils2c64a91bbread_depth_offset: new test to check depth offset calculation869a1b6e8replayer: create bin/ everytime9be2db198Reduce precision in depth clear precision check7f40f35a3Add float from half functionf7ece74a1tests/gbm: Addgbm_device_get_fd()testfd4a6c521wayland: Add Wayland dmabuf driver-name testdf0d0ae79conversion-explicit: use a different value for normalized +/- mina482803accmake: if we specifyPIGLIT_BUILD_GL_TESTSOPENGL_FOUNDis always true67b89b3e3README: recommend Ninja by default and switch to cmake --buildefd111853cmake: build is compatible up to 3.28e84aca9b5cmake: add workaround for CMP01482e70ca91eREADME: ccmake is not that common, regular cmake is enough to builde39ba99e5README: update requirementsd945707b9cmake: WGL doesn't need Waffle, pass the definition without it938a9dc9fcmake: remove this 12 years old workaround taking too many lines7e5ca052dcmake: implement switch for the EGL tests and simplify test conditionscd9d15364cmake: makePIGLIT_BUILD_DMA_BUF_TESTSaligned with GBM dependency4af47af27cmake: depend onWGL_TESTSbeing enabled to build WGLa222d50bbcmake: implement GBM and Wayland controls4230c7e9fcmake: fix unusually formated statementd958b70d1cmake: implement X11 option (required for GLX)4319b9fc8cmake: move GLX and WGL option to the beggining of the file44e1c29bfcmake: move first batch ofoption()at the beggining of the file96241ea22cmake: rename default values with prefixDEFAULT_21374d8d3cmake: move defaults into the per-platform section86d3f1132cmake: predefine defaults depending on the system381221a81cmake: drop unused CMP0042 policy99eade7cdcmake: respect indentationdd6f7eaf8texturing: add a test for GPU/CPU sync when creating textures025e462aeutil: fixmultisample_texture_fs_templatef9e26b98btests: add a test forGL_APPLE_syncb24c834d9ci: codespell ignore list is lowercase0a842edd0more spelling fixes accross the whole codebase2c473ea73ci: bump distribution tag7cd28b970arb_multisample: Fix bitwise-instead-of-logical warning19e58247eext_texture_storage: Fix memory leak on error pathd0b5d0c1farb_internalformat_query2: fix internalformat selection formax_layerssubtest74064b1d4arb_clear_texture: only test float depth textures when supported9c941dfc3properly check forlibgen.hc55e22a5carb_copy_image-formats: avoid undefined behavior537831d48intel/ppgtt: Use getpagesize fallback with MinGWb32186ee5README: add Vulkan into the generic description1e631479cfix arb_query_buffer_object-qbo to warn on invalid GS results instead of fail62938a9bctests: Fix cl test program@execute@[email protected] issue about tolerance.Signed-off-by Trevor Gamblin <[email protected]>---
v3 adjusts the PACKAGECONFIG for x11 to handle builds without it. v2 added wayland and wayland-protocols to DEPENDS to solve build errors seen on the AB....clude-libgen.h-on-musl-linux-systems.patch | 83 ------------------- meta/recipes-graphics/piglit/piglit_git.bb | 7 +- 2 files changed, 3 insertions(+), 87 deletions(-)delete mode 100644
meta/recipes-graphics/piglit/piglit/0001-utils-Include-libgen.h-on-musl-linux-systems.patchmeta/recipes-graphics/piglit/piglit/0001-utils-Include-libgen.h-on-musl-linux-systems.patch deleted +0
-83@@ -1,83 +0,0 @@ -From 6c852e6ac292008137a6f3a8aa908090bb5b4b11 Mon Sep 17 00:00:00 2001 -From: Erik Faye-Lund <[email protected]> -Date: Tue, 19 Mar 2024 16:34:02 +0100 -Subject: [PATCH] properly check for libgen.h - -Some users are reporting that basename is not available when building on -Linux with musl libc. And since the POSIX spec[1] says that basename is -defined in libgen.h, we should include that when available. - -So let's properly detect the header, and include it if it exists. This -should hopefully make things a bit more robust. - -Since we're also including this from the CL program-tester, let's -rearrange the includes a bit so we know that config.h has been included. - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/888] -Reviewed-by: David Heidelberg <[email protected]> -Signed-off-by: Khem Raj <[email protected]> ---- - CMakeLists.txt | 1 + - tests/cl/program/program-tester.c | 5 ++++- - tests/util/config.h.in | 1 + - tests/util/piglit-util.h | 4 ++-- - 4 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dd2bf67125..5563fe0e20 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -492,6 +492,7 @@ check_include_file(unistd.h HAVE_UNISTD_H) - check_include_file(fcntl.h HAVE_FCNTL_H) - check_include_file(linux/sync_file.h HAVE_LINUX_SYNC_FILE_H) - check_include_file(endian.h HAVE_ENDIAN_H) -+check_include_file(libgen.h HAVE_LIBGEN_H) - - if(DEFINED PIGLIT_INSTALL_VERSION) - set(PIGLIT_INSTALL_VERSION_SUFFIX -diff --git a/tests/cl/program/program-tester.c b/tests/cl/program/program-tester.c -index 97fe64906d..e47fb5aacc 100644 ---- a/tests/cl/program/program-tester.c -+++ b/tests/cl/program/program-tester.c -@@ -31,10 +31,13 @@ - #include <inttypes.h> - #include <math.h> - #include <regex.h> --#include <libgen.h> - - #include "piglit-framework-cl-program.h" - -+#ifdef HAVE_LIBGEN_H -+#include <libgen.h> -+#endif -+ - /* Regexes */ - - /* -diff --git a/tests/util/config.h.in b/tests/util/config.h.in -index 8ed5af1709..437eb91418 100644 ---- a/tests/util/config.h.in -+++ b/tests/util/config.h.in -@@ -16,3 +16,4 @@ - #cmakedefine HAVE_SYS_RESOURCE_H 1 - #cmakedefine HAVE_UNISTD_H 1 - #cmakedefine HAVE_ENDIAN_H 1 -+#cmakedefine HAVE_LIBGEN_H 1 -diff --git a/tests/util/piglit-util.h b/tests/util/piglit-util.h -index 4d3606c708..de999980b6 100644 ---- a/tests/util/piglit-util.h -+++ b/tests/util/piglit-util.h -@@ -52,8 +52,8 @@ extern "C" { - #include <math.h> - #include <float.h> - --#if defined(__APPLE__) || defined(__MINGW32__) --# include "libgen.h" // for basename -+#ifdef HAVE_LIBGEN_H -+# include <libgen.h> // for basename - #elif defined(_MSC_VER) - - static inline char * --- -GitLab -meta/recipes-graphics/piglit/piglit_git.bb +3
-5@@ -10,11 +10,10 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=ma file://0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \ 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-utils-Include-libgen.h-on-musl-linux-systems.patch \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "22eaf6a91cfd57f7bb3df4e5068c2ac1472d4ec1" +SRCREV = "c11c9374c1448d01b31e7f724921cc1f4ee2c84c" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr"@@ -23,7 +22,7 @@ S = "${WORKDIR}/git" X11_DEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxrender libglu', '', d)}" X11_RDEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa-demos', '', d)}" -DEPENDS = "libpng waffle libxkbcommon python3-mako-native python3-numpy-native python3-six-native virtual/egl" +DEPENDS = "libpng waffle libxkbcommon python3-mako-native python3-numpy-native python3-six-native virtual/egl wayland wayland-protocols" inherit cmake pkgconfig python3native features_check bash-completion@@ -40,7 +39,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glx', '', PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut," PACKAGECONFIG[glx] = "-DPIGLIT_BUILD_GLX_TESTS=ON,-DPIGLIT_BUILD_GLX_TESTS=OFF" PACKAGECONFIG[opencl] = "-DPIGLIT_BUILD_CL_TESTS=ON,-DPIGLIT_BUILD_CL_TESTS=OFF,virtual/opencl-icd" -PACKAGECONFIG[x11] = "-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}" +PACKAGECONFIG[x11] = "-DPIGLIT_USE_X11=1 -DPIGLIT_BUILD_GL_TESTS=ON -DPIGLIT_BUILD_DMA_BUF_TESTS=ON,-DPIGLIT_USE_X11=0 -DPIGLIT_BUILD_GL_TESTS=OFF -DPIGLIT_BUILD_DMA_BUF_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}" PACKAGECONFIG[vulkan] = "-DPIGLIT_BUILD_VK_TESTS=ON,-DPIGLIT_BUILD_VK_TESTS=OFF,glslang-native vulkan-loader,glslang" export PIGLIT_BUILD_DIR = "../../../../git" -=-=-=-=-=-=-=-=-=-=-=-Links: You receive all messages sent to this group.
View/Reply Online (#203610): https://lists.openembedded.org/g/openembedded-core/message/203610
Mute This Topic: https://lists.openembedded.org/mt/108025942/7611679
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Quoted 12 lines · Trevor Gamblin via lists.openembedded.org
Quoted 9 lines · Trevor Gamblin via lists.openembedded.org
Commit
766669895dfixes builds with numpy 2.x.Patch '0001-utils-Include-libgen.h-on-musl-linux-systems.patch' dropped
because it is now upstream in commit9c941dfc36.Add wayland and wayland-protocols to DEPENDS to avoid errors during build.
Quoted 7 lines
Quoted 3 lines
Adjust the x11 PACKAGECONFIG flags so that piglit builds without x11
available.FYI, I've tried the reproducible tests on piglit with and without TCLIBC=musl, and also with and without the numpy 2.0.1 upgrade, and I can't reproduce them. Hopefully this works on the AB now.
Unfortunately it didn't :(.
reproducible:
https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/5220
world docs build:
https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/6306
world build:
https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/6306
musl:
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/9404/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/9416/steps/11/logs/stdio
no-x11:
https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/9390/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/9390/steps/15/logs/stdio
It is hard to see which are warnings and which are errors in the logs. I did wonder if the issue was python version specific. Are there any related commits upstream looking to fix anything like this?
Cheers,
Richard
Quoted 37 lines · Richard Purdie via lists.openembedded.org
Quoted 12 lines · Trevor Gamblin via lists.openembedded.org
Quoted 9 lines · Trevor Gamblin via lists.openembedded.org
Commit
766669895dfixes builds with numpy 2.x.Patch '0001-utils-Include-libgen.h-on-musl-linux-systems.patch' dropped
because it is now upstream in commit9c941dfc36.Add wayland and wayland-protocols to DEPENDS to avoid errors during build.
Quoted 7 lines
Quoted 3 lines
Adjust the x11 PACKAGECONFIG flags so that piglit builds without x11
available.FYI, I've tried the reproducible tests on piglit with and without TCLIBC=musl, and also with and without the numpy 2.0.1 upgrade, and I can't reproduce them. Hopefully this works on the AB now.
Unfortunately it didn't :(.
reproducible:
https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/5220
world docs build:
https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/6306
world build:
https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/6306
musl:
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/9404/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/9416/steps/11/logs/stdio
no-x11:
https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/9390/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/9390/steps/15/logs/stdio
Quoted 3 lines
It is hard to see which are warnings and which are errors in the logs. I did wonder if the issue was python version specific. Are there any related commits upstream looking to fix anything like this?
I have a lead, I think it is using a hardcoded path into the host system for wayland-scanner:
/bin/sh: 1: /usr/bin/wayland-scanner: not found
We're trying builds on systems with wayland installed, the autobuilders don't have that!
So have a look for a hardcoded path to that...
Cheers,
Richard