diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-07-13 20:00:33 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-20 10:28:48 +0100 |
commit | c3753a8b187c24fcac57c37c8a6d98be64af9f3b (patch) | |
tree | 89554edcd646057532928f5d238efa97f83091b6 /meta/recipes-graphics/piglit/piglit | |
parent | b384b724ec51da702ee42ace4c38546fc16f296f (diff) | |
download | poky-c3753a8b187c24fcac57c37c8a6d98be64af9f3b.tar.gz |
piglit: Upgrade version, use python3
* Remove backported patch
* Update dependencies to use python3 modules, add depencies added
in the new version
* Install only stripped binaries to keep size down
* Fix bash-completion install location
(From OE-Core rev: f7193a306cfc3ac0a3fdcf891716a59f5b8178e8)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/piglit/piglit')
2 files changed, 35 insertions, 28 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 new file mode 100644 index 0000000000..e07e810a73 --- /dev/null +++ b/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch | |||
@@ -0,0 +1,35 @@ | |||
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/0001-tests-Fix-missing-include-of-Xutil.h.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch deleted file mode 100644 index c27cc04f01..0000000000 --- a/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | |||
4 | From e40e0a25f996d2e205c4bdec2c8a5cc7f74e5065 Mon Sep 17 00:00:00 2001 | ||
5 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
6 | Date: Mon, 15 Jun 2015 16:25:30 -0300 | ||
7 | Subject: tests: Fix missing include of Xutil.h | ||
8 | |||
9 | The EGL tests rely on Xutil.h being included. Some EGL implementation | ||
10 | does not explitly include it by default and then the build fails. | ||
11 | |||
12 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
13 | Reviewed-by: Neil Roberts <neil@linux.intel.com> | ||
14 | |||
15 | diff --git a/tests/egl/egl-configless-context.c b/tests/egl/egl-configless-context.c | ||
16 | index 0504a26..154b55c 100644 | ||
17 | --- a/tests/egl/egl-configless-context.c | ||
18 | +++ b/tests/egl/egl-configless-context.c | ||
19 | @@ -32,6 +32,7 @@ | ||
20 | /* Chunks of code in this file are taken from egl-util.c */ | ||
21 | |||
22 | #include <X11/Xlib.h> | ||
23 | +#include <X11/Xutil.h> | ||
24 | |||
25 | #include "piglit-util-gl.h" | ||
26 | #include "piglit-util-egl.h" | ||
27 | -- | ||
28 | cgit v0.10.2 | ||