diff mbox series

[AUH] piglit: upgrading to fdf3fc09deb6beecdf212e65a16c645112540b59 FAILED

Message ID 010101901d23bd00-cf515d81-a43a-449c-8235-895ab620cd61-000000@us-west-2.amazonses.com
State New
Headers show
Series [AUH] piglit: upgrading to fdf3fc09deb6beecdf212e65a16c645112540b59 FAILED | expand

Commit Message

auh@yoctoproject.org June 15, 2024, 6:23 p.m. UTC
Hello,

this email is a notification from the Auto Upgrade Helper
that the automatic attempt to upgrade the recipe *piglit* to *fdf3fc09deb6beecdf212e65a16c645112540b59* has Failed(do_compile).

Detailed error information:

do_compile failed



Next steps:
    - apply the patch: git am 0001-piglit-upgrade-to-latest-revision.patch
    - check the changes to upstream patches and summarize them in the commit message,
    - compile an image that contains the package
    - perform some basic sanity tests
    - amend the patch and sign it off: git commit -s --reset-author --amend
    - send it to the appropriate mailing list

Alternatively, if you believe the recipe should not be upgraded at this time,
you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that
automatic upgrades would no longer be attempted.

Please review the attached files for further information and build/update failures.
Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler

Regards,
The Upgrade Helper

-- >8 --
From 87682422de39254485a7a9fba6e34008792d3f21 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Sat, 15 Jun 2024 14:24:32 +0000
Subject: [PATCH] piglit: upgrade to latest revision

---
 ...Fix-narrowing-errors-seen-with-clang.patch |  2 +-
 ...clude-libgen.h-on-musl-linux-systems.patch | 83 -------------------
 ...proper-WAYLAND_INCLUDE_DIRS-variable.patch |  2 +-
 ...t-shader.c-do-not-hardcode-build-pat.patch |  2 +-
 meta/recipes-graphics/piglit/piglit_git.bb    |  3 +-
 5 files changed, 4 insertions(+), 88 deletions(-)
 delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-utils-Include-libgen.h-on-musl-linux-systems.patch
diff mbox series

Patch

diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch
index 08e709b1d0..3447437708 100644
--- a/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch
+++ b/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-narrowing-errors-seen-with-clang.patch
@@ -1,4 +1,4 @@ 
-From 77f327909e4a99c64261290cd76e234e10cc64d2 Mon Sep 17 00:00:00 2001
+From be488861157973ab1ab06212a2566d3743db38b9 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 3 May 2023 21:59:43 -0700
 Subject: [PATCH] tests: Fix narrowing errors seen with clang
diff --git a/meta/recipes-graphics/piglit/piglit/0001-utils-Include-libgen.h-on-musl-linux-systems.patch b/meta/recipes-graphics/piglit/piglit/0001-utils-Include-libgen.h-on-musl-linux-systems.patch
deleted file mode 100644
index 2875dd52ec..0000000000
--- a/meta/recipes-graphics/piglit/piglit/0001-utils-Include-libgen.h-on-musl-linux-systems.patch
+++ /dev/null
@@ -1,83 +0,0 @@ 
-From 6c852e6ac292008137a6f3a8aa908090bb5b4b11 Mon Sep 17 00:00:00 2001
-From: Erik Faye-Lund <erik.faye-lund@collabora.com>
-Date: Tue, 19 Mar 2024 16:34:02 +0100
-Subject: [PATCH] properly check for libgen.h
-
-Some users are reporting that basename is not available when building on
-Linux with musl libc. And since the POSIX spec[1] says that basename is
-defined in libgen.h, we should include that when available.
-
-So let's properly detect the header, and include it if it exists. This
-should hopefully make things a bit more robust.
-
-Since we're also including this from the CL program-tester, let's
-rearrange the includes a bit so we know that config.h has been included.
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/888]
-Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- CMakeLists.txt                    | 1 +
- tests/cl/program/program-tester.c | 5 ++++-
- tests/util/config.h.in            | 1 +
- tests/util/piglit-util.h          | 4 ++--
- 4 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dd2bf67125..5563fe0e20 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -492,6 +492,7 @@ 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)
-+check_include_file(libgen.h    HAVE_LIBGEN_H)
- 
- if(DEFINED PIGLIT_INSTALL_VERSION)
- 	set(PIGLIT_INSTALL_VERSION_SUFFIX
-diff --git a/tests/cl/program/program-tester.c b/tests/cl/program/program-tester.c
-index 97fe64906d..e47fb5aacc 100644
---- a/tests/cl/program/program-tester.c
-+++ b/tests/cl/program/program-tester.c
-@@ -31,10 +31,13 @@
- #include <inttypes.h>
- #include <math.h>
- #include <regex.h>
--#include <libgen.h>
- 
- #include "piglit-framework-cl-program.h"
- 
-+#ifdef HAVE_LIBGEN_H
-+#include <libgen.h>
-+#endif
-+
- /* Regexes */
- 
- /*
-diff --git a/tests/util/config.h.in b/tests/util/config.h.in
-index 8ed5af1709..437eb91418 100644
---- a/tests/util/config.h.in
-+++ b/tests/util/config.h.in
-@@ -16,3 +16,4 @@
- #cmakedefine HAVE_SYS_RESOURCE_H 1
- #cmakedefine HAVE_UNISTD_H 1
- #cmakedefine HAVE_ENDIAN_H 1
-+#cmakedefine HAVE_LIBGEN_H 1
-diff --git a/tests/util/piglit-util.h b/tests/util/piglit-util.h
-index 4d3606c708..de999980b6 100644
---- a/tests/util/piglit-util.h
-+++ b/tests/util/piglit-util.h
-@@ -52,8 +52,8 @@ extern "C" {
- #include <math.h>
- #include <float.h>
- 
--#if defined(__APPLE__) || defined(__MINGW32__)
--#  include "libgen.h" // for basename
-+#ifdef HAVE_LIBGEN_H
-+#  include <libgen.h> // for basename
- #elif defined(_MSC_VER)
- 
- static inline char *
--- 
-GitLab
-
diff --git a/meta/recipes-graphics/piglit/piglit/0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch b/meta/recipes-graphics/piglit/piglit/0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
index 70bb55053d..cd8cc3eb91 100644
--- a/meta/recipes-graphics/piglit/piglit/0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
+++ b/meta/recipes-graphics/piglit/piglit/0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
@@ -1,4 +1,4 @@ 
-From cb8e4b99fcfe81399e3e6d922156db4a48a39a8e Mon Sep 17 00:00:00 2001
+From a2c4fb86a43007a9da8dbee0e0eaa0fe9932da5a Mon Sep 17 00:00:00 2001
 From: Pascal Bach <pascal.bach@siemens.com>
 Date: Thu, 4 Oct 2018 14:43:17 +0200
 Subject: [PATCH] cmake: use proper WAYLAND_INCLUDE_DIRS variable
diff --git a/meta/recipes-graphics/piglit/piglit/0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch b/meta/recipes-graphics/piglit/piglit/0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch
index ce5cbd3ea9..8ecb097eae 100644
--- a/meta/recipes-graphics/piglit/piglit/0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch
+++ b/meta/recipes-graphics/piglit/piglit/0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch
@@ -1,4 +1,4 @@ 
-From 7d2d23125f1946a7b74f9a427388d469500fcd8d Mon Sep 17 00:00:00 2001
+From c7dce95010cb9c03a41e9ff5a2a55d6507444ade Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Tue, 10 Nov 2020 17:13:50 +0000
 Subject: [PATCH] tests/util/piglit-shader.c: do not hardcode build path into
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 99d75e64f8..56f8e75f2f 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://0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \
            file://0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch \
            file://0001-tests-Fix-narrowing-errors-seen-with-clang.patch \
-           file://0001-utils-Include-libgen.h-on-musl-linux-systems.patch \
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-SRCREV = "22eaf6a91cfd57f7bb3df4e5068c2ac1472d4ec1"
+SRCREV = "fdf3fc09deb6beecdf212e65a16c645112540b59"
 # (when PV goes above 1.0 remove the trailing r)
 PV = "1.0+gitr"