mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
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>
This commit is contained in:
parent
b384b724ec
commit
c3753a8b18
|
@ -0,0 +1,35 @@
|
|||
From 26faa2c157a27a18a9f767976730fe0c115e3af4 Mon Sep 17 00:00:00 2001
|
||||
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
Date: Wed, 13 Jul 2016 19:19:02 +0300
|
||||
Subject: [PATCH] cmake: install bash-completions in the right place
|
||||
|
||||
The completionsdir variable is a full path and should not be
|
||||
prefixed.
|
||||
|
||||
This does mean the files may be installed outside of
|
||||
CMAKE_INSTALL_PREFIX -- the alternative is more difficult and
|
||||
means that bash completion files may be installed where
|
||||
bash-completion can't find them.
|
||||
|
||||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
Upstream-Status: Submitted [mailing list]
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8e2abba..784a8f9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -532,7 +532,7 @@ install (
|
||||
if (BASH_COMPLETION_FOUND)
|
||||
install(
|
||||
FILES completions/bash/piglit
|
||||
- DESTINATION ${CMAKE_INSTALL_PREFIX}/${BASH_COMPLETION_COMPLETIONSDIR}/
|
||||
+ DESTINATION ${BASH_COMPLETION_COMPLETIONSDIR}/
|
||||
)
|
||||
endif (BASH_COMPLETION_FOUND)
|
||||
|
||||
--
|
||||
2.8.1
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
Upstream-Status: Backport
|
||||
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
||||
|
||||
From e40e0a25f996d2e205c4bdec2c8a5cc7f74e5065 Mon Sep 17 00:00:00 2001
|
||||
From: Otavio Salvador <otavio@ossystems.com.br>
|
||||
Date: Mon, 15 Jun 2015 16:25:30 -0300
|
||||
Subject: tests: Fix missing include of Xutil.h
|
||||
|
||||
The EGL tests rely on Xutil.h being included. Some EGL implementation
|
||||
does not explitly include it by default and then the build fails.
|
||||
|
||||
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
||||
Reviewed-by: Neil Roberts <neil@linux.intel.com>
|
||||
|
||||
diff --git a/tests/egl/egl-configless-context.c b/tests/egl/egl-configless-context.c
|
||||
index 0504a26..154b55c 100644
|
||||
--- a/tests/egl/egl-configless-context.c
|
||||
+++ b/tests/egl/egl-configless-context.c
|
||||
@@ -32,6 +32,7 @@
|
||||
/* Chunks of code in this file are taken from egl-util.c */
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
+#include <X11/Xutil.h>
|
||||
|
||||
#include "piglit-util-gl.h"
|
||||
#include "piglit-util-egl.h"
|
||||
--
|
||||
cgit v0.10.2
|
|
@ -3,18 +3,19 @@ LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause"
|
|||
LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
|
||||
|
||||
SRC_URI = "git://anongit.freedesktop.org/piglit \
|
||||
file://0001-tests-Fix-missing-include-of-Xutil.h.patch"
|
||||
file://0001-cmake-install-bash-completions-in-the-right-place.patch \
|
||||
"
|
||||
|
||||
# From 2015-02-19
|
||||
SRCREV = "c4585427913e4cb28994b4bfb11d49778273aa2c"
|
||||
# From 2016-07-07
|
||||
SRCREV = "c39e41a86551eb390b8da23232dc8577639403d0"
|
||||
# (when PV goes above 1.0 remove the trailing r)
|
||||
PV = "1.0+gitr${SRCPV}"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
DEPENDS = "virtual/libx11 libxrender waffle virtual/libgl libglu python-mako-native python-numpy-native"
|
||||
DEPENDS = "libpng virtual/libx11 libxrender waffle virtual/libgl libglu python3-mako-native python3-numpy-native python3-six-native"
|
||||
|
||||
inherit cmake pythonnative distro_features_check
|
||||
inherit cmake python3native distro_features_check bash-completion
|
||||
# depends on virtual/libx11
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
|
@ -34,10 +35,14 @@ do_configure_prepend() {
|
|||
fi
|
||||
}
|
||||
|
||||
RDEPENDS_${PN} = "waffle python python-mako python-json python-subprocess \
|
||||
python-argparse python-importlib python-unixadmin python-xml \
|
||||
python-multiprocessing python-textutils python-netserver python-shell \
|
||||
mesa-demos bash \
|
||||
do_install() {
|
||||
oe_runmake -C ${B} 'DESTDIR=${D}' install/strip
|
||||
}
|
||||
|
||||
RDEPENDS_${PN} = "waffle python3 python3-mako python3-json \
|
||||
python3-subprocess python3-misc python3-importlib \
|
||||
python3-unixadmin python3-xml python3-multiprocessing \
|
||||
python3-six python3-shell python3-io mesa-demos bash \
|
||||
"
|
||||
|
||||
INSANE_SKIP_${PN} += "dev-so"
|
||||
INSANE_SKIP_${PN} += "dev-so already-stripped"
|
||||
|
|
Loading…
Reference in New Issue
Block a user