From cfcbd686835a3c0fca01e774e290da77c8a396ac Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 7 Apr 2022 19:00:18 +0200 Subject: piglit: update to latest revision Drop upstreamed patch. (From OE-Core rev: cf4fc54875df6e98022a455745af0f0f12dda380) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...-a-missing-include-for-htobe32-definition.patch | 27 ---------------------- ...CMakeLists.txt-add-missing-endian.h-check.patch | 25 ++++++++++++++++++++ meta/recipes-graphics/piglit/piglit_git.bb | 4 ++-- 3 files changed, 27 insertions(+), 29 deletions(-) delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-Add-a-missing-include-for-htobe32-definition.patch create mode 100644 meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-add-missing-endian.h-check.patch (limited to 'meta/recipes-graphics/piglit') diff --git a/meta/recipes-graphics/piglit/piglit/0001-Add-a-missing-include-for-htobe32-definition.patch b/meta/recipes-graphics/piglit/piglit/0001-Add-a-missing-include-for-htobe32-definition.patch deleted file mode 100644 index 7b0cb17925..0000000000 --- a/meta/recipes-graphics/piglit/piglit/0001-Add-a-missing-include-for-htobe32-definition.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d623e9797b7ee9b3739a8a4afe1a01f7e03754aa Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Sun, 1 Nov 2020 20:08:49 +0000 -Subject: [PATCH] Add a missing include for htobe32 definition - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/609] -Signed-off-by: Alexander Kanavin ---- - tests/spec/nv_copy_depth_to_color/nv_copy_depth_to_color.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/spec/nv_copy_depth_to_color/nv_copy_depth_to_color.c b/tests/spec/nv_copy_depth_to_color/nv_copy_depth_to_color.c -index 5f45e0c23..c755ee29a 100644 ---- a/tests/spec/nv_copy_depth_to_color/nv_copy_depth_to_color.c -+++ b/tests/spec/nv_copy_depth_to_color/nv_copy_depth_to_color.c -@@ -34,6 +34,8 @@ - - #include "piglit-util-gl.h" - -+#include -+ - #define IMAGE_WIDTH 60 - #define IMAGE_HEIGHT 60 - --- -2.17.1 - diff --git a/meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-add-missing-endian.h-check.patch b/meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-add-missing-endian.h-check.patch new file mode 100644 index 0000000000..68f783ebe4 --- /dev/null +++ b/meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-add-missing-endian.h-check.patch @@ -0,0 +1,25 @@ +From a8ea135125b284a8a9c965d8091b3d1d9a31849c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 5 Apr 2022 16:51:34 +0200 +Subject: [PATCH] CMakeLists.txt: add missing endian.h check + +This is needed to actually have HAVE_ENDIAN_H defined properly in config.h. + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/648] +Signed-off-by: Alexander Kanavin +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9fb0508da..158fac4bc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -481,6 +481,7 @@ check_include_file(sys/stat.h HAVE_SYS_STAT_H) + check_include_file(unistd.h HAVE_UNISTD_H) + check_include_file(fcntl.h HAVE_FCNTL_H) + check_include_file(linux/sync_file.h HAVE_LINUX_SYNC_FILE_H) ++check_include_file(endian.h HAVE_ENDIAN_H) + + if(DEFINED PIGLIT_INSTALL_VERSION) + set(PIGLIT_INSTALL_VERSION_SUFFIX diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index 3ae7a14e46..840050bfc9 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -9,12 +9,12 @@ 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://0001-Add-a-missing-include-for-htobe32-definition.patch \ file://0002-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch \ + file://0001-CMakeLists.txt-add-missing-endian.h-check.patch \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "2f80c7cc9c02d37574dc8ba3140b7dd8eb3cbf82" +SRCREV = "445711587d461539a4d8f9d35a7fe996a86d3c8d" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}" -- cgit v1.2.3-54-g00ecf