Signed-off-by: Alexander Kanavin <[email protected]> --- ...n-t-enable-GLX-if-tests-are-disabled.patch | 32 ------------------- meta/recipes-graphics/piglit/piglit_git.bb | 3 +- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 meta/recipes-graphics/piglit/piglit/0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch
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 @@ -From 13ff43fe760ac343b33d8e8c84b89886aac07116 Mon Sep 17 00:00:00 2001 -From: Tom Hochstein <[email protected]> -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 <[email protected]> ---- - 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 - 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 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}" -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175400): https://lists.openembedded.org/g/openembedded-core/message/175400 Mute This Topic: https://lists.openembedded.org/mt/96047883/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
