diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-09-17 11:39:00 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-18 08:53:10 +0100 |
commit | 1f1f56d34941fd6f1f1a42385950315d288b2e8d (patch) | |
tree | 18c2900215745e77fba399e89a083fea58c361fc /meta/recipes-graphics | |
parent | 2f6076ea29ff5a41fcffc879e3aa2fd96f7c3248 (diff) | |
download | poky-1f1f56d34941fd6f1f1a42385950315d288b2e8d.tar.gz |
piglit: update to latest revision
Drop patch as issue finally fixed upstream.
(From OE-Core rev: d2ef4d4feeaa956c46dd241054a72f35d25a7bb5)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r-- | meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch | 35 | ||||
-rw-r--r-- | meta/recipes-graphics/piglit/piglit_git.bb | 3 |
2 files changed, 1 insertions, 37 deletions
diff --git a/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch b/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch deleted file mode 100644 index e07e810a73..0000000000 --- a/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 26faa2c157a27a18a9f767976730fe0c115e3af4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Wed, 13 Jul 2016 19:19:02 +0300 | ||
4 | Subject: [PATCH] cmake: install bash-completions in the right place | ||
5 | |||
6 | The completionsdir variable is a full path and should not be | ||
7 | prefixed. | ||
8 | |||
9 | This does mean the files may be installed outside of | ||
10 | CMAKE_INSTALL_PREFIX -- the alternative is more difficult and | ||
11 | means that bash completion files may be installed where | ||
12 | bash-completion can't find them. | ||
13 | |||
14 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
15 | Upstream-Status: Submitted [mailing list] | ||
16 | --- | ||
17 | CMakeLists.txt | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
21 | index 8e2abba..784a8f9 100644 | ||
22 | --- a/CMakeLists.txt | ||
23 | +++ b/CMakeLists.txt | ||
24 | @@ -532,7 +532,7 @@ install ( | ||
25 | if (BASH_COMPLETION_FOUND) | ||
26 | install( | ||
27 | FILES completions/bash/piglit | ||
28 | - DESTINATION ${CMAKE_INSTALL_PREFIX}/${BASH_COMPLETION_COMPLETIONSDIR}/ | ||
29 | + DESTINATION ${BASH_COMPLETION_COMPLETIONSDIR}/ | ||
30 | ) | ||
31 | endif (BASH_COMPLETION_FOUND) | ||
32 | |||
33 | -- | ||
34 | 2.8.1 | ||
35 | |||
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index 62cada7590..69294c6c94 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb | |||
@@ -7,14 +7,13 @@ LICENSE = "MIT & LGPL-2.0-or-later & GPL-3.0-only & GPL-2.0-or-later & BSD-3-Cla | |||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0" |
8 | 8 | ||
9 | SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=main \ | 9 | SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=main \ |
10 | file://0001-cmake-install-bash-completions-in-the-right-place.patch \ | ||
11 | file://0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \ | 10 | file://0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \ |
12 | file://0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch \ | 11 | file://0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch \ |
13 | file://0001-tests-Fix-narrowing-errors-seen-with-clang.patch \ | 12 | file://0001-tests-Fix-narrowing-errors-seen-with-clang.patch \ |
14 | " | 13 | " |
15 | UPSTREAM_CHECK_COMMITS = "1" | 14 | UPSTREAM_CHECK_COMMITS = "1" |
16 | 15 | ||
17 | SRCREV = "5036601c43fff63f7be5cd8ad7b319a5c1f6652c" | 16 | SRCREV = "71c21b1157c4f9a96453bdfcb9f4dda091360afd" |
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" | 18 | PV = "1.0+gitr" |
20 | 19 | ||