mirror of
https://git.yoctoproject.org/poky
synced 2026-04-19 15:32:13 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
a84dbf1481
commit
1604b546a0
@@ -1,32 +0,0 @@
|
||||
From 13ff43fe760ac343b33d8e8c84b89886aac07116 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Hochstein <tom.hochstein@nxp.com>
|
||||
Date: Fri, 3 Jun 2022 10:44:29 -0500
|
||||
Subject: [PATCH] cmake: Don't enable GLX if tests are disabled
|
||||
|
||||
Allow building for systems that don't support GLX.
|
||||
|
||||
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/720]
|
||||
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
|
||||
---
|
||||
CMakeLists.txt | 5 +----
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e1aeb5ddf..85e171aba 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -134,10 +134,7 @@ if(PIGLIT_BUILD_CL_TESTS)
|
||||
endif(PIGLIT_BUILD_CL_TESTS)
|
||||
|
||||
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
- if(X11_FOUND AND OPENGL_gl_LIBRARY)
|
||||
- # Assume the system has GLX. In the future, systems may exist
|
||||
- # with libGL and libX11 but no GLX, but that world hasn't
|
||||
- # arrived yet.
|
||||
+ if(X11_FOUND AND OPENGL_gl_LIBRARY AND PIGLIT_BUILD_GLX_TESTS)
|
||||
set(PIGLIT_HAS_GLX True)
|
||||
add_definitions(-DPIGLIT_HAS_GLX)
|
||||
endif()
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -10,11 +10,10 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=ma
|
||||
file://0001-cmake-install-bash-completions-in-the-right-place.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://0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch \
|
||||
"
|
||||
UPSTREAM_CHECK_COMMITS = "1"
|
||||
|
||||
SRCREV = "1cd716180cfb6ef0c1fc54702460ef49e5115791"
|
||||
SRCREV = "e300648a805d62101de341232d99bfec1cce78c5"
|
||||
# (when PV goes above 1.0 remove the trailing r)
|
||||
PV = "1.0+gitr${SRCPV}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user