diff --git a/meta/recipes-graphics/piglit/piglit/0001-utils-Include-libgen.h-on-musl-linux-systems.patch b/meta/recipes-graphics/piglit/piglit/0001-utils-Include-libgen.h-on-musl-linux-systems.patch deleted file mode 100644 index 2875dd52ec..0000000000 --- a/meta/recipes-graphics/piglit/piglit/0001-utils-Include-libgen.h-on-musl-linux-systems.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 6c852e6ac292008137a6f3a8aa908090bb5b4b11 Mon Sep 17 00:00:00 2001 -From: Erik Faye-Lund -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 -Signed-off-by: Khem Raj ---- - 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 - #include - #include --#include - - #include "piglit-framework-cl-program.h" - -+#ifdef HAVE_LIBGEN_H -+#include -+#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 - #include - --#if defined(__APPLE__) || defined(__MINGW32__) --# include "libgen.h" // for basename -+#ifdef HAVE_LIBGEN_H -+# include // for basename - #elif defined(_MSC_VER) - - static inline char * --- -GitLab - diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index 99d75e64f8..a1fd2b8bde 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -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-native 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"