diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2022-08-22 17:04:14 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-25 11:08:06 +0100 |
commit | e0c378d692bd4d08301b30949a71fd867de27a23 (patch) | |
tree | c66604e203deb65a84734fa52a8cf9d1d0077870 /meta/recipes-graphics/piglit/piglit_git.bb | |
parent | cf6648d437b8110917e5d80f8ba2dc6e54145161 (diff) | |
download | poky-e0c378d692bd4d08301b30949a71fd867de27a23.tar.gz |
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 <tom.hochstein@nxp.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/piglit/piglit_git.bb')
-rw-r--r-- | meta/recipes-graphics/piglit/piglit_git.bb | 12 |
1 files changed, 7 insertions, 5 deletions
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" | |||
8 | 8 | ||
9 | SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=main \ | 9 | SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=main \ |
10 | file://0001-cmake-install-bash-completions-in-the-right-place.patch \ | 10 | file://0001-cmake-install-bash-completions-in-the-right-place.patch \ |
11 | file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \ | 11 | file://0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \ |
12 | file://0002-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch \ | 12 | file://0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch \ |
13 | file://0001-CMakeLists.txt-add-missing-endian.h-check.patch \ | 13 | file://0004-CMakeLists.txt-add-missing-endian.h-check.patch \ |
14 | " | 14 | file://0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch" |
15 | UPSTREAM_CHECK_COMMITS = "1" | 15 | UPSTREAM_CHECK_COMMITS = "1" |
16 | 16 | ||
17 | SRCREV = "6403e90dc7da02d486906cddab8d02c2552a8d46" | 17 | SRCREV = "6403e90dc7da02d486906cddab8d02c2552a8d46" |
@@ -36,8 +36,10 @@ REQUIRED_DISTRO_FEATURES += "opengl" | |||
36 | export TEMP = "${B}/temp/" | 36 | export TEMP = "${B}/temp/" |
37 | do_compile[dirs] =+ "${B}/temp/" | 37 | do_compile[dirs] =+ "${B}/temp/" |
38 | 38 | ||
39 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" | 39 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glx', '', d)}" |
40 | PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut," | 40 | PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut," |
41 | PACKAGECONFIG[glx] = "-DPIGLIT_BUILD_GLX_TESTS=ON,-DPIGLIT_BUILD_GLX_TESTS=OFF" | ||
42 | PACKAGECONFIG[opencl] = "-DPIGLIT_BUILD_CL_TESTS=ON,-DPIGLIT_BUILD_CL_TESTS=OFF,opencl-icd-loader" | ||
41 | PACKAGECONFIG[x11] = "-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}" | 43 | PACKAGECONFIG[x11] = "-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}" |
42 | PACKAGECONFIG[vulkan] = "-DPIGLIT_BUILD_VK_TESTS=ON,-DPIGLIT_BUILD_VK_TESTS=OFF,vulkan-loader" | 44 | PACKAGECONFIG[vulkan] = "-DPIGLIT_BUILD_VK_TESTS=ON,-DPIGLIT_BUILD_VK_TESTS=OFF,vulkan-loader" |
43 | 45 | ||