From e0c378d692bd4d08301b30949a71fd867de27a23 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 22 Aug 2022 17:04:14 -0500 Subject: piglit: Add PACKAGECONFIG for glx and opencl - Allow GLX tests to be disabled for systems that don't support it. - Allow OpenCL tests to be enabled. (From OE-Core rev: 53c90930fca17cdaec2a5492320a286b6db6bdda) Signed-off-by: Tom Hochstein Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- meta/recipes-graphics/piglit/piglit_git.bb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'meta/recipes-graphics/piglit/piglit_git.bb') diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index 7c1bc89c22..29360a246b 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0" SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=main \ file://0001-cmake-install-bash-completions-in-the-right-place.patch \ - file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \ - file://0002-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch \ - file://0001-CMakeLists.txt-add-missing-endian.h-check.patch \ - " + file://0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \ + file://0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch \ + file://0004-CMakeLists.txt-add-missing-endian.h-check.patch \ + file://0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch" UPSTREAM_CHECK_COMMITS = "1" SRCREV = "6403e90dc7da02d486906cddab8d02c2552a8d46" @@ -36,8 +36,10 @@ REQUIRED_DISTRO_FEATURES += "opengl" export TEMP = "${B}/temp/" do_compile[dirs] =+ "${B}/temp/" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glx', '', d)}" 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,opencl-icd-loader" PACKAGECONFIG[x11] = "-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}" PACKAGECONFIG[vulkan] = "-DPIGLIT_BUILD_VK_TESTS=ON,-DPIGLIT_BUILD_VK_TESTS=OFF,vulkan-loader" -- cgit v1.2.3-54-g00ecf