summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2020-03-04 11:28:17 +0200
committerKhem Raj <raj.khem@gmail.com>2020-03-04 08:15:19 -0800
commit757eece4ac1892e3ec2355e54a6cd354101d025b (patch)
tree88b9358a0344f689c67fbf7fe813e006db6c34e2
parent127ad16f25910a1504905d8b06889fa9c0c4a165 (diff)
downloadmeta-openembedded-757eece4ac1892e3ec2355e54a6cd354101d025b.tar.gz
Revert "piglist: add from oe-core"
This reverts commit af22a7a46ab6306aa4d59037e59b4dcf373b2603. The recipe is staying in OE-core. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch35
-rw-r--r--meta-oe/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch32
-rw-r--r--meta-oe/recipes-graphics/piglit/piglit_git.bb64
3 files changed, 0 insertions, 131 deletions
diff --git a/meta-oe/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch b/meta-oe/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch
deleted file mode 100644
index e07e810a73..0000000000
--- a/meta-oe/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 26faa2c157a27a18a9f767976730fe0c115e3af4 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed, 13 Jul 2016 19:19:02 +0300
4Subject: [PATCH] cmake: install bash-completions in the right place
5
6The completionsdir variable is a full path and should not be
7prefixed.
8
9This does mean the files may be installed outside of
10CMAKE_INSTALL_PREFIX -- the alternative is more difficult and
11means that bash completion files may be installed where
12bash-completion can't find them.
13
14Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
15Upstream-Status: Submitted [mailing list]
16---
17 CMakeLists.txt | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/CMakeLists.txt b/CMakeLists.txt
21index 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--
342.8.1
35
diff --git a/meta-oe/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch b/meta-oe/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
deleted file mode 100644
index 5d6ec368ba..0000000000
--- a/meta-oe/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 3bf1beee1ddd19bc536ff2856e04ac269d43daa2 Mon Sep 17 00:00:00 2001
2From: Pascal Bach <pascal.bach@siemens.com>
3Date: Thu, 4 Oct 2018 14:43:17 +0200
4Subject: [PATCH] cmake: use proper WAYLAND_INCLUDE_DIRS variable
5
6WAYLAND_wayland-client_INCLUDEDIR is an internal variable and is not correctly
7set when cross compiling. WAYLAND_INCLUDE_DIRS includes the correct path even
8when cross compiling.
9
10Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
11
12Upstream-Status: Submitted [piglit@lists.freedesktop.org]
13---
14 tests/util/CMakeLists.txt | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
18index a5f080156..a303a9f58 100644
19--- a/tests/util/CMakeLists.txt
20+++ b/tests/util/CMakeLists.txt
21@@ -97,7 +97,7 @@ if(PIGLIT_USE_WAFFLE)
22 piglit-framework-gl/piglit_wl_framework.c
23 )
24 list(APPEND UTIL_GL_INCLUDES
25- ${WAYLAND_wayland-client_INCLUDEDIR}
26+ ${WAYLAND_INCLUDE_DIRS}
27 )
28 endif()
29 if(PIGLIT_HAS_X11)
30--
312.11.0
32
diff --git a/meta-oe/recipes-graphics/piglit/piglit_git.bb b/meta-oe/recipes-graphics/piglit/piglit_git.bb
deleted file mode 100644
index 58d10d6b9b..0000000000
--- a/meta-oe/recipes-graphics/piglit/piglit_git.bb
+++ /dev/null
@@ -1,64 +0,0 @@
1SUMMARY = "OpenGL driver testing framework"
2DESCRIPTION = "Piglit is an open-source test suite for OpenGL and OpenCL \
3implementations."
4LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause"
5LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
6
7SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https \
8 file://0001-cmake-install-bash-completions-in-the-right-place.patch \
9 file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \
10 "
11UPSTREAM_CHECK_COMMITS = "1"
12
13SRCREV = "6126c2d4e476c7770d216ffa1932c10e2a5a7813"
14# (when PV goes above 1.0 remove the trailing r)
15PV = "1.0+gitr${SRCPV}"
16
17S = "${WORKDIR}/git"
18
19X11_DEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxrender libglu', '', d)}"
20X11_RDEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa-demos', '', d)}"
21
22DEPENDS = "libpng waffle libxkbcommon virtual/libgl python3-mako-native python3-numpy-native python3-six-native virtual/egl"
23
24inherit cmake pkgconfig python3native features_check bash-completion
25
26# depends on virtual/libgl
27REQUIRED_DISTRO_FEATURES += "opengl"
28
29# The built scripts go into the temporary directory according to tempfile
30# (typically /tmp) which can race if multiple builds happen on the same machine,
31# so tell it to use a directory in ${B} to avoid overwriting.
32export TEMP = "${B}/temp/"
33do_compile[dirs] =+ "${B}/temp/"
34
35PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
36PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut,"
37PACKAGECONFIG[x11] = "-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}"
38
39
40do_configure_prepend() {
41 if [ "${@bb.utils.contains('PACKAGECONFIG', 'freeglut', 'yes', 'no', d)}" = "no" ]; then
42 sed -i -e "/^#.*include <GL\/freeglut_ext.h>$/d" ${S}/src/piglit/glut_wrap.h
43 sed -i -e "/^#.*include.*<GL\/glut.h>$/d" ${S}/src/piglit/glut_wrap.h
44 fi
45}
46
47# Forcibly strip because Piglit is *huge*
48OECMAKE_TARGET_INSTALL = "install/strip"
49
50RDEPENDS_${PN} = "waffle waffle-bin python3 python3-mako python3-json \
51 python3-misc \
52 python3-unixadmin python3-xml python3-multiprocessing \
53 python3-six python3-shell python3-io \
54 python3-netserver bash \
55 "
56
57INSANE_SKIP_${PN} += "dev-so already-stripped"
58
59# As nothing builds against Piglit we don't need to have anything in the
60# sysroot, especially when this is ~2GB of test suite
61SYSROOT_DIRS_remove = "${libdir}"
62
63# Can't be built with ccache
64CCACHE_DISABLE = "1"