diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-01-04 12:04:46 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-06 12:03:47 +0000 |
commit | 1604b546a05421db3396d7fb7bf47b6e6873bb09 (patch) | |
tree | 83fb3ca51954a3a87b64a455b97f089ad807184d /meta/recipes-graphics/piglit | |
parent | a84dbf1481b57a5eb3392aa23f5868e6df25e9fa (diff) | |
download | poky-1604b546a05421db3396d7fb7bf47b6e6873bb09.tar.gz |
piglit: upgrade to latest revision
(From OE-Core rev: a747c85b64bd90aca18dc2d4702a4d6531d18e7f)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/piglit')
-rw-r--r-- | meta/recipes-graphics/piglit/piglit/0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch | 32 | ||||
-rw-r--r-- | meta/recipes-graphics/piglit/piglit_git.bb | 3 |
2 files changed, 1 insertions, 34 deletions
diff --git a/meta/recipes-graphics/piglit/piglit/0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch b/meta/recipes-graphics/piglit/piglit/0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch deleted file mode 100644 index ef6fda0f4e..0000000000 --- a/meta/recipes-graphics/piglit/piglit/0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 13ff43fe760ac343b33d8e8c84b89886aac07116 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tom Hochstein <tom.hochstein@nxp.com> | ||
3 | Date: Fri, 3 Jun 2022 10:44:29 -0500 | ||
4 | Subject: [PATCH] cmake: Don't enable GLX if tests are disabled | ||
5 | |||
6 | Allow building for systems that don't support GLX. | ||
7 | |||
8 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/720] | ||
9 | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> | ||
10 | --- | ||
11 | CMakeLists.txt | 5 +---- | ||
12 | 1 file changed, 1 insertion(+), 4 deletions(-) | ||
13 | |||
14 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
15 | index e1aeb5ddf..85e171aba 100644 | ||
16 | --- a/CMakeLists.txt | ||
17 | +++ b/CMakeLists.txt | ||
18 | @@ -134,10 +134,7 @@ if(PIGLIT_BUILD_CL_TESTS) | ||
19 | endif(PIGLIT_BUILD_CL_TESTS) | ||
20 | |||
21 | IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") | ||
22 | - if(X11_FOUND AND OPENGL_gl_LIBRARY) | ||
23 | - # Assume the system has GLX. In the future, systems may exist | ||
24 | - # with libGL and libX11 but no GLX, but that world hasn't | ||
25 | - # arrived yet. | ||
26 | + if(X11_FOUND AND OPENGL_gl_LIBRARY AND PIGLIT_BUILD_GLX_TESTS) | ||
27 | set(PIGLIT_HAS_GLX True) | ||
28 | add_definitions(-DPIGLIT_HAS_GLX) | ||
29 | endif() | ||
30 | -- | ||
31 | 2.17.1 | ||
32 | |||
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index 8d66df4e09..7858fa0b08 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 | |||
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://0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \ | 11 | file://0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \ |
12 | file://0003-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://0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch \ | ||
14 | " | 13 | " |
15 | UPSTREAM_CHECK_COMMITS = "1" | 14 | UPSTREAM_CHECK_COMMITS = "1" |
16 | 15 | ||
17 | SRCREV = "1cd716180cfb6ef0c1fc54702460ef49e5115791" | 16 | SRCREV = "e300648a805d62101de341232d99bfec1cce78c5" |
18 | # (when PV goes above 1.0 remove the trailing r) | 17 | # (when PV goes above 1.0 remove the trailing r) |
19 | PV = "1.0+gitr${SRCPV}" | 18 | PV = "1.0+gitr${SRCPV}" |
20 | 19 | ||