[OE-core] [PATCH] piglit: upgrade to more recent srvrev

[Ross Burton]

Upgrade to 126c7d from December 2014.  Still not the latest but it's got no
added build dependencies and importantly handles installs out of the box instead
of us having to hack and kludge, and builds with cmake 3.x.

The usage has changed: now there's a "piglit" binary that has run/resume/summary
subcommands, for example:

$ piglit run quick quick-results/

For reference the quick test suite on a IvyBridge NUC results in:

[27714/27714] crash: 3, fail: 326, pass: 18275, skip: 9107, warn: 3 -

Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 .../piglit/piglit/cmake-module-path.patch          | 29 ++++++++++++++++
 meta/recipes-graphics/piglit/piglit_git.bb         | 40 +++++-----------------
 2 files changed, 37 insertions(+), 32 deletions(-)
 create mode 100644 meta/recipes-graphics/piglit/piglit/cmake-module-path.patch

diff --git a/meta/recipes-graphics/piglit/piglit/cmake-module-path.patch b/meta/recipes-graphics/piglit/piglit/cmake-module-path.patch
new file mode 100644
index 0000000..0afe088
--- /dev/null
+++ b/meta/recipes-graphics/piglit/piglit/cmake-module-path.patch
@@ -0,0 +1,29 @@
+It turns out that project() reads the toolchain file which then forcibly sets
+CMAKE_MODULE_PATH, so piglit can find its own modules (eg FindNumpy).
+
+So, move the extension of CMAKE_MODULE_PATH to after project() so the build
+succeeds.
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton <ross.burton at intel.com>
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index db5f718..aea9534 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,7 +1,5 @@
+ cmake_minimum_required(VERSION 2.8.5)
+ 
+-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
+-
+ INCLUDE (GNUInstallDirs)
+ INCLUDE (CheckCCompilerFlag)
+ INCLUDE (CheckCSourceCompiles)
+@@ -11,6 +9,7 @@ INCLUDE (CheckIncludeFile)
+ INCLUDE (FindPkgConfig)
+ 
+ project (piglit)
++list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
+ 
+ # Require MSVC 2013 U4
+ if (MSVC)
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index e33e4a7..b201a0a 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -2,10 +2,11 @@ SUMMARY = "OpenGL driver testing framework"
 LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
 
-SRC_URI = "git://anongit.freedesktop.org/piglit"
+SRC_URI = "git://anongit.freedesktop.org/piglit \
+           file://cmake-module-path.patch"
 
-# From 2012/12/30.
-SRCREV = "bbeff5d21b06d37338ad28e42d88f499bef13268"
+# From 2014/12/04
+SRCREV = "126c7d049b8f32e541625d5a35fbc5f5e4e7fbf8"
 # (when PV goes above 1.0 remove the trailing r)
 PV = "1.0+gitr${SRCPV}"
 
@@ -17,40 +18,15 @@ inherit cmake pythonnative distro_features_check
 # depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
-# As piglit doesn't install, enforce in-tree builds so that we can easily copy
-# contents out of $S and $B.
-B="${S}"
-
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut,"
 
-# CMake sets the rpath at build time with the source tree, and will reset it at
-# install time. As we don't install this doesn't happen, so force the rpath to
-# what we need.
-EXTRA_OECMAKE = "-DCMAKE_BUILD_WITH_INSTALL_RPATH=1 -DCMAKE_INSTALL_RPATH=${libdir}/piglit/lib"
-
-do_install() {
-	install -d ${D}${bindir}
-	install -m 0755 piglit-*.py ${D}${bindir}
-
-	install -d ${D}${libdir}/piglit/
-
-	install -d ${D}${libdir}/piglit/bin
-	install -m 755 ${S}/bin/* ${D}${libdir}/piglit/bin
-
-	cp -Pr lib/ ${D}${libdir}/piglit/
-	cp -Pr framework/ ${D}${libdir}/piglit/
-	cp -Pr generated_tests/ ${D}${libdir}/piglit/
-	cp -Pr tests/ ${D}${libdir}/piglit/
-	cp -Pr templates/ ${D}${libdir}/piglit/
-
-	sed -i -e 's|sys.path.append(.*)|sys.path.append("${libdir}/piglit")|' ${D}${bindir}/piglit-*.py
-	sed -i -e 's|^templatedir = .*$|templatedir = "${libdir}/piglit/templates"|' ${D}${bindir}/piglit-summary-html.py
-}
-
 FILES_${PN}-dbg += "${libdir}/piglit/*/.debug/"
 
-RDEPENDS_${PN} = "python waffle python-json python-subprocess \
+RDEPENDS_${PN} = "waffle python python-mako python-json python-subprocess \
+	python-argparse python-importlib python-unixadmin \
 	python-multiprocessing python-textutils python-netserver python-shell \
 	mesa-demos bash \
 	"
+
+INSANE_SKIP_${PN} += "dev-so"
\ No newline at end of file
-- 
2.1.4