Skip to contentSkip to conversation

Add Piglit

PATCH New Ross Burton 1 participant 8 messages Jan 14, 2014

lore
Share & tools
lore
#0 lore raw

v3 cover Add Piglit

Hi,

V3 of the Piglit series that adds a missing build dependency from meta-oe (honestly no idea how this ever worked for me), and fixes cmake.bbclass for multilib builds.

Ross

The following changes since commit d6ed40fa2a7646e3353460390090aaaecf5b38a3:

cmake: default to out-of-tree builds (2014-01-14 11:33:56 +0000)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib ross/piglit

for you to fetch changes up to f0636fc5fd95fc5f9f1271ccbaf347d06489d3e7:

packagegroup-core-tools-testapps: add Piglit (2014-01-14 14:42:06 +0000)

----------------------------------------------------------------
Ross Burton (7):
cmake: specify all install paths
python-mako: add (from meta-oe)
python-nose: add (from meta-oe)
python-numpy: add (from meta-oe)
waffle: add (from meta-oe)
piglit: add (from meta-oe) packagegroup-core-tools-testapps: add Piglit

 meta/classes/cmake.bbclass                         |    9 ++
 .../packagegroup-core-tools-testapps.bb            |    7 +-
 meta/recipes-devtools/python/python-mako_0.9.1.bb  |   20 +++
 meta/recipes-devtools/python/python-nose_1.2.1.bb  |   14 ++
 .../python/python-numpy/aarch64/_numpyconfig.h     |   30 +++++
 .../python/python-numpy/aarch64/config.h           |  139 ++++++++++++++++++++
 .../python/python-numpy/arm/config.h               |   21 +++
 .../python/python-numpy/arm/numpyconfig.h          |   17 +++
 .../python/python-numpy/armeb/config.h             |   21 +++
 .../python/python-numpy/armeb/numpyconfig.h        |   17 +++
 .../python/python-numpy/i586/config.h              |  108 +++++++++++++++
 .../python/python-numpy/i586/numpyconfig.h         |   24 ++++
 .../python/python-numpy/mipsel/config.h            |   21 +++
 .../python/python-numpy/mipsel/numpyconfig.h       |   17 +++
 .../python/python-numpy/trycompile.diff            |   33 +++++
 .../python/python-numpy/unbreak-assumptions.diff   |   16 +++
 .../python/python-numpy/x86-64/_numpyconfig.h      |   30 +++++
 .../python/python-numpy/x86-64/config.h            |  139 ++++++++++++++++++++
 meta/recipes-devtools/python/python-numpy_1.7.0.bb |   78 +++++++++++
 meta/recipes-graphics/piglit/piglit_git.bb         |   48 +++++++
 meta/recipes-graphics/waffle/waffle_1.3.0.bb       |   32 +++++
 21 files changed, 840 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/python/python-mako_0.9.1.bb
 create mode 100644 meta/recipes-devtools/python/python-nose_1.2.1.bb
 create mode 100644 meta/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/aarch64/config.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/arm/config.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/arm/numpyconfig.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/armeb/config.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/armeb/numpyconfig.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/i586/config.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/i586/numpyconfig.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/mipsel/config.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/mipsel/numpyconfig.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/trycompile.diff
 create mode 100644 meta/recipes-devtools/python/python-numpy/unbreak-assumptions.diff
 create mode 100644 meta/recipes-devtools/python/python-numpy/x86-64/_numpyconfig.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/x86-64/config.h
 create mode 100644 meta/recipes-devtools/python/python-numpy_1.7.0.bb
 create mode 100644 meta/recipes-graphics/piglit/piglit_git.bb
 create mode 100644 meta/recipes-graphics/waffle/waffle_1.3.0.bb

Ross Burton (7):
cmake: specify all install paths
python-mako: add (from meta-oe)
python-nose: add (from meta-oe)
python-numpy: add (from meta-oe)
waffle: add (from meta-oe)
piglit: add (from meta-oe)
packagegroup-core-tools-testapps: add Piglit

 meta/classes/cmake.bbclass                         |    9 ++
 .../packagegroup-core-tools-testapps.bb            |    7 +-
 meta/recipes-devtools/python/python-mako_0.9.1.bb  |   20 +++
 meta/recipes-devtools/python/python-nose_1.2.1.bb  |   14 ++
 .../python/python-numpy/aarch64/_numpyconfig.h     |   30 +++++
 .../python/python-numpy/aarch64/config.h           |  139 ++++++++++++++++++++
 .../python/python-numpy/arm/config.h               |   21 +++
 .../python/python-numpy/arm/numpyconfig.h          |   17 +++
 .../python/python-numpy/armeb/config.h             |   21 +++
 .../python/python-numpy/armeb/numpyconfig.h        |   17 +++
 .../python/python-numpy/i586/config.h              |  108 +++++++++++++++
 .../python/python-numpy/i586/numpyconfig.h         |   24 ++++
 .../python/python-numpy/mipsel/config.h            |   21 +++
 .../python/python-numpy/mipsel/numpyconfig.h       |   17 +++
 .../python/python-numpy/trycompile.diff            |   33 +++++
 .../python/python-numpy/unbreak-assumptions.diff   |   16 +++
 .../python/python-numpy/x86-64/_numpyconfig.h      |   30 +++++
 .../python/python-numpy/x86-64/config.h            |  139 ++++++++++++++++++++
 meta/recipes-devtools/python/python-numpy_1.7.0.bb |   78 +++++++++++
 meta/recipes-graphics/piglit/piglit_git.bb         |   48 +++++++
 meta/recipes-graphics/waffle/waffle_1.3.0.bb       |   32 +++++
 21 files changed, 840 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/python/python-mako_0.9.1.bb
 create mode 100644 meta/recipes-devtools/python/python-nose_1.2.1.bb
 create mode 100644 meta/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/aarch64/config.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/arm/config.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/arm/numpyconfig.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/armeb/config.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/armeb/numpyconfig.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/i586/config.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/i586/numpyconfig.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/mipsel/config.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/mipsel/numpyconfig.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/trycompile.diff
 create mode 100644 meta/recipes-devtools/python/python-numpy/unbreak-assumptions.diff
 create mode 100644 meta/recipes-devtools/python/python-numpy/x86-64/_numpyconfig.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/x86-64/config.h
 create mode 100644 meta/recipes-devtools/python/python-numpy_1.7.0.bb
 create mode 100644 meta/recipes-graphics/piglit/piglit_git.bb
 create mode 100644 meta/recipes-graphics/waffle/waffle_1.3.0.bb
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH v3 1/7 cmake: specify all install paths

Specify the full set of install paths (bindir, libdir, etc) for packages that use the GNUInstallDirs module, instead of just the prefix and leaving the rest as default (which breaks with multilib).

---
 meta/classes/cmake.bbclass |    9 +++++++++
 1 file changed, 9 insertions(+)
meta/classes/cmake.bbclass +9 -0
index 3ac3fcc..7ff9984 100644
@@ -86,6 +86,15 @@ cmake_do_configure() {
 	  ${OECMAKE_SITEFILE} \
 	  ${S} \
 	  -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
+	  -DCMAKE_INSTALL_BINDIR:PATH=${bindir} \
+	  -DCMAKE_INSTALL_SBINDIR:PATH=${sbindir} \
+	  -DCMAKE_INSTALL_LIBEXECDIR:PATH=${libexecdir} \
+	  -DCMAKE_INSTALL_SYSCONFDIR:PATH=${sysconfdir} \
+	  -DCMAKE_INSTALL_SHAREDSTATEDIR:PATH=${sharedstatedir} \
+	  -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=${localstatedir} \
+	  -DCMAKE_INSTALL_LIBDIR:PATH=${libdir} \
+	  -DCMAKE_INSTALL_INCLUDEDIR:PATH=${includedir} \
+	  -DCMAKE_INSTALL_DATAROOTDIR:PATH=${datadir} \
 	  -DCMAKE_INSTALL_SO_NO_EXE=0 \
 	  -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
 	  -DCMAKE_VERBOSE_MAKEFILE=1 \
Signature · 1 line
1.7.10.4
#3 lore raw

PATCH v3 3/7 python-nose: add (from meta-oe)

In reply to Ross Burton

python-nose is a build dependecy for python-numpy, needed for Piglit. This recipe is taken directly from meta-oe.

---
 meta/recipes-devtools/python/python-nose_1.2.1.bb |   14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python-nose_1.2.1.bb
meta/recipes-devtools/python/python-nose_1.2.1.bb new file +14 -0
new file mode 100644
index 0000000..083d052
@@ -0,0 +1,14 @@
+DESCRIPTION = "nose extends the test loading and running features of unittest, \
+making it easier to write, find and run tests."
+SECTION = "devel/python"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://lgpl.txt;md5=a6f89e2100d9b6cdffcea4f398e37343"
+
+SRC_URI = "http://pypi.python.org/packages/source/n/nose/nose-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "735e3f1ce8b07e70ee1b742a8a53585a"
+SRC_URI[sha256sum] = "2171e9202d118d302d5db1decb52dd862b79e2a626ca19653a6914574a6ca7d9"
+
+S = "${WORKDIR}/nose-${PV}"
+
+inherit distutils
Signature · 1 line
1.7.10.4
#4 lore raw

PATCH v3 4/7 python-numpy: add (from meta-oe)

In reply to Ross Burton

python-numpy is needed for Piglit. This recipe is taken directly from meta-oe.

---
 .../python/python-numpy/aarch64/_numpyconfig.h     |   30 +++++
 .../python/python-numpy/aarch64/config.h           |  139 ++++++++++++++++++++
 .../python/python-numpy/arm/config.h               |   21 +++
 .../python/python-numpy/arm/numpyconfig.h          |   17 +++
 .../python/python-numpy/armeb/config.h             |   21 +++
 .../python/python-numpy/armeb/numpyconfig.h        |   17 +++
 .../python/python-numpy/i586/config.h              |  108 +++++++++++++++
 .../python/python-numpy/i586/numpyconfig.h         |   24 ++++
 .../python/python-numpy/mipsel/config.h            |   21 +++
 .../python/python-numpy/mipsel/numpyconfig.h       |   17 +++
 .../python/python-numpy/trycompile.diff            |   33 +++++
 .../python/python-numpy/unbreak-assumptions.diff   |   16 +++
 .../python/python-numpy/x86-64/_numpyconfig.h      |   30 +++++
 .../python/python-numpy/x86-64/config.h            |  139 ++++++++++++++++++++
 meta/recipes-devtools/python/python-numpy_1.7.0.bb |   78 +++++++++++
 15 files changed, 711 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/aarch64/config.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/arm/config.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/arm/numpyconfig.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/armeb/config.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/armeb/numpyconfig.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/i586/config.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/i586/numpyconfig.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/mipsel/config.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/mipsel/numpyconfig.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/trycompile.diff
 create mode 100644 meta/recipes-devtools/python/python-numpy/unbreak-assumptions.diff
 create mode 100644 meta/recipes-devtools/python/python-numpy/x86-64/_numpyconfig.h
 create mode 100644 meta/recipes-devtools/python/python-numpy/x86-64/config.h
 create mode 100644 meta/recipes-devtools/python/python-numpy_1.7.0.bb
meta/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h new file +30 -0
new file mode 100644
index 0000000..be57ac2
@@ -0,0 +1,30 @@
+#define NPY_HAVE_ENDIAN_H 1
+#define NPY_SIZEOF_SHORT SIZEOF_SHORT
+#define NPY_SIZEOF_INT SIZEOF_INT
+#define NPY_SIZEOF_LONG SIZEOF_LONG
+#define NPY_SIZEOF_FLOAT 4
+#define NPY_SIZEOF_COMPLEX_FLOAT 8
+#define NPY_SIZEOF_DOUBLE 8
+#define NPY_SIZEOF_COMPLEX_DOUBLE 16
+#define NPY_SIZEOF_LONGDOUBLE 16
+#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32
+#define NPY_SIZEOF_PY_INTPTR_T 8
+#define NPY_SIZEOF_PY_LONG_LONG 8
+#define NPY_SIZEOF_LONGLONG 8
+#define NPY_NO_SMP 0
+#define NPY_HAVE_DECL_ISNAN
+#define NPY_HAVE_DECL_ISINF
+#define NPY_HAVE_DECL_ISFINITE
+#define NPY_HAVE_DECL_SIGNBIT
+#define NPY_USE_C99_COMPLEX 1
+#define NPY_HAVE_COMPLEX_DOUBLE 1
+#define NPY_HAVE_COMPLEX_FLOAT 1
+#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1
+#define NPY_USE_C99_FORMATS 1
+#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden")))
+#define NPY_ABI_VERSION 0x01000009
+#define NPY_API_VERSION 0x00000007
+
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS 1
+#endif
meta/recipes-devtools/python/python-numpy/aarch64/config.h new file +139 -0

139 lines not on this page · raw message

meta/recipes-devtools/python/python-numpy/arm/config.h new file +21 -0
new file mode 100644
index 0000000..17ef186
@@ -0,0 +1,21 @@
+/* ./src.linux-i686-2.5/numpy/core/include/numpy/config.h */
+/* #define SIZEOF_SHORT 2 */
+/* #define SIZEOF_INT 4 */
+/* #define SIZEOF_LONG 4 */
+/* #define SIZEOF_FLOAT 4 */
+/* #define SIZEOF_DOUBLE 8 */
+#define SIZEOF_LONG_DOUBLE 12
+#define SIZEOF_PY_INTPTR_T 4
+/* #define SIZEOF_LONG_LONG 8 */
+#define SIZEOF_PY_LONG_LONG 8
+/* #define CHAR_BIT 8 */
+#define MATHLIB m
+#define HAVE_FLOAT_FUNCS
+#define HAVE_LOG1P
+#define HAVE_EXPM1
+#define HAVE_INVERSE_HYPERBOLIC
+#define HAVE_INVERSE_HYPERBOLIC_FLOAT
+#define HAVE_ISNAN
+#define HAVE_ISINF
+#define HAVE_RINT
+
meta/recipes-devtools/python/python-numpy/arm/numpyconfig.h new file +17 -0
new file mode 100644
index 0000000..c4bf654
@@ -0,0 +1,17 @@
+/* cat ./src.linux-i686-2.5/numpy/core/include/numpy/numpyconfig.h */
+/*
+ *  * This file is generated by numpy/core/setup.pyc. DO NOT EDIT 
+ *   */
+#define NPY_SIZEOF_SHORT 2 
+#define NPY_SIZEOF_INT 4 
+#define NPY_SIZEOF_LONG 4 
+#define NPY_SIZEOF_FLOAT 4 
+#define NPY_SIZEOF_DOUBLE 8 
+#define NPY_SIZEOF_LONGDOUBLE 12 
+#define NPY_SIZEOF_PY_INTPTR_T 4 
+#define NPY_NO_SMP 0
+
+#define NPY_SIZEOF_LONGLONG 8 
+#define NPY_SIZEOF_PY_LONG_LONG 8 
+/* #define CHAR_BIT 8 */
+
meta/recipes-devtools/python/python-numpy/armeb/config.h new file +21 -0
new file mode 100644
index 0000000..17ef186
@@ -0,0 +1,21 @@
+/* ./src.linux-i686-2.5/numpy/core/include/numpy/config.h */
+/* #define SIZEOF_SHORT 2 */
+/* #define SIZEOF_INT 4 */
+/* #define SIZEOF_LONG 4 */
+/* #define SIZEOF_FLOAT 4 */
+/* #define SIZEOF_DOUBLE 8 */
+#define SIZEOF_LONG_DOUBLE 12
+#define SIZEOF_PY_INTPTR_T 4
+/* #define SIZEOF_LONG_LONG 8 */
+#define SIZEOF_PY_LONG_LONG 8
+/* #define CHAR_BIT 8 */
+#define MATHLIB m
+#define HAVE_FLOAT_FUNCS
+#define HAVE_LOG1P
+#define HAVE_EXPM1
+#define HAVE_INVERSE_HYPERBOLIC
+#define HAVE_INVERSE_HYPERBOLIC_FLOAT
+#define HAVE_ISNAN
+#define HAVE_ISINF
+#define HAVE_RINT
+
meta/recipes-devtools/python/python-numpy/armeb/numpyconfig.h new file +17 -0
new file mode 100644
index 0000000..c4bf654
@@ -0,0 +1,17 @@
+/* cat ./src.linux-i686-2.5/numpy/core/include/numpy/numpyconfig.h */
+/*
+ *  * This file is generated by numpy/core/setup.pyc. DO NOT EDIT 
+ *   */
+#define NPY_SIZEOF_SHORT 2 
+#define NPY_SIZEOF_INT 4 
+#define NPY_SIZEOF_LONG 4 
+#define NPY_SIZEOF_FLOAT 4 
+#define NPY_SIZEOF_DOUBLE 8 
+#define NPY_SIZEOF_LONGDOUBLE 12 
+#define NPY_SIZEOF_PY_INTPTR_T 4 
+#define NPY_NO_SMP 0
+
+#define NPY_SIZEOF_LONGLONG 8 
+#define NPY_SIZEOF_PY_LONG_LONG 8 
+/* #define CHAR_BIT 8 */
+
meta/recipes-devtools/python/python-numpy/i586/config.h new file +108 -0

108 lines not on this page · raw message

meta/recipes-devtools/python/python-numpy/i586/numpyconfig.h new file +24 -0
new file mode 100644
index 0000000..ff7938c
@@ -0,0 +1,24 @@
+#ifndef _NPY_NUMPYCONFIG_H_
+#define _NPY_NUMPYCONFIG_H_
+
+#include "_numpyconfig.h"
+
+/* 
+ * On Mac OS X, because there is only one configuration stage for all the archs
+ * in universal builds, any macro which depends on the arch needs to be
+ * harcoded
+ */
+#ifdef __APPLE__
+	#undef NPY_SIZEOF_LONG
+	#undef NPY_SIZEOF_PY_INTPTR_T
+
+	#ifdef __LP64__
+		#define NPY_SIZEOF_LONG 		8
+		#define NPY_SIZEOF_PY_INTPTR_T 	8
+	#else
+		#define NPY_SIZEOF_LONG 		4
+		#define NPY_SIZEOF_PY_INTPTR_T 	4
+	#endif
+#endif
+
+#endif
meta/recipes-devtools/python/python-numpy/mipsel/config.h new file +21 -0
new file mode 100644
index 0000000..17ef186
@@ -0,0 +1,21 @@
+/* ./src.linux-i686-2.5/numpy/core/include/numpy/config.h */
+/* #define SIZEOF_SHORT 2 */
+/* #define SIZEOF_INT 4 */
+/* #define SIZEOF_LONG 4 */
+/* #define SIZEOF_FLOAT 4 */
+/* #define SIZEOF_DOUBLE 8 */
+#define SIZEOF_LONG_DOUBLE 12
+#define SIZEOF_PY_INTPTR_T 4
+/* #define SIZEOF_LONG_LONG 8 */
+#define SIZEOF_PY_LONG_LONG 8
+/* #define CHAR_BIT 8 */
+#define MATHLIB m
+#define HAVE_FLOAT_FUNCS
+#define HAVE_LOG1P
+#define HAVE_EXPM1
+#define HAVE_INVERSE_HYPERBOLIC
+#define HAVE_INVERSE_HYPERBOLIC_FLOAT
+#define HAVE_ISNAN
+#define HAVE_ISINF
+#define HAVE_RINT
+
meta/recipes-devtools/python/python-numpy/mipsel/numpyconfig.h new file +17 -0
new file mode 100644
index 0000000..c4bf654
@@ -0,0 +1,17 @@
+/* cat ./src.linux-i686-2.5/numpy/core/include/numpy/numpyconfig.h */
+/*
+ *  * This file is generated by numpy/core/setup.pyc. DO NOT EDIT 
+ *   */
+#define NPY_SIZEOF_SHORT 2 
+#define NPY_SIZEOF_INT 4 
+#define NPY_SIZEOF_LONG 4 
+#define NPY_SIZEOF_FLOAT 4 
+#define NPY_SIZEOF_DOUBLE 8 
+#define NPY_SIZEOF_LONGDOUBLE 12 
+#define NPY_SIZEOF_PY_INTPTR_T 4 
+#define NPY_NO_SMP 0
+
+#define NPY_SIZEOF_LONGLONG 8 
+#define NPY_SIZEOF_PY_LONG_LONG 8 
+/* #define CHAR_BIT 8 */
+
meta/recipes-devtools/python/python-numpy/trycompile.diff new file +33 -0
new file mode 100644
index 0000000..3ab3d72
@@ -0,0 +1,33 @@
+--- /tmp/setup.py	2008-09-01 10:37:44.000000000 +0200
++++ numpy-1.1.1/numpy/core/setup.py	2008-09-01 10:38:20.373198000 +0200
+@@ -80,8 +80,7 @@
+                 raise SystemError,\
+                       "Non-existing %s. Perhaps you need to install"\
+                       " python-dev|python-devel." % (python_h)
+-            result = config_cmd.try_run(tc,include_dirs=[python_include],
+-                                        library_dirs = default_lib_dirs)
++            result = config_cmd.try_compile(tc)
+             if not result:
+                 raise SystemError,"Failed to test configuration. "\
+                       "See previous error messages for more information."
+@@ -95,7 +94,7 @@
+             if mathlib:
+                 mathlibs_choices.insert(0,mathlib.split(','))
+             for libs in mathlibs_choices:
+-                if config_cmd.try_run(tc,libraries=libs):
++                if config_cmd.try_compile(tc):
+                     mathlibs = libs
+                     break
+             else:
+@@ -180,10 +179,7 @@
+                       " python-dev|python-devel." % (python_h)
+ 
+             config.numpy_include_dirs
+-            result = config_cmd.try_run(testcode,
+-                                include_dirs = [python_include] + \
+-                                                       config.numpy_include_dirs,
+-                                        library_dirs = default_lib_dirs)
++            result = config_cmd.try_compile(testcode)
+ 
+             if not result:
+                 raise SystemError,"Failed to generate numpy configuration. "\
meta/recipes-devtools/python/python-numpy/unbreak-assumptions.diff new file +16 -0
new file mode 100644
index 0000000..c5b4481
@@ -0,0 +1,16 @@
+--- /tmp/system_info.py	2008-08-22 00:38:16.000000000 +0200
++++ numpy-1.1.1/numpy/distutils/system_info.py	2008-08-22 00:40:33.013198000 +0200
+@@ -137,11 +137,8 @@
+     default_x11_lib_dirs = []
+     default_x11_include_dirs = []
+ else:
+-    default_lib_dirs = ['/usr/local/lib', '/opt/lib', '/usr/lib',
+-                        '/opt/local/lib', '/sw/lib']
+-    default_include_dirs = ['/usr/local/include',
+-                            '/opt/include', '/usr/include',
+-                            '/opt/local/include', '/sw/include']
++    default_lib_dirs = ['/non-existant-dir']
++    default_include_dirs = ['non-existant-dir']
+     default_src_dirs = ['.','/usr/local/src', '/opt/src','/sw/src']
+ 
+     try:
meta/recipes-devtools/python/python-numpy/x86-64/_numpyconfig.h new file +30 -0
new file mode 100644
index 0000000..be57ac2
@@ -0,0 +1,30 @@
+#define NPY_HAVE_ENDIAN_H 1
+#define NPY_SIZEOF_SHORT SIZEOF_SHORT
+#define NPY_SIZEOF_INT SIZEOF_INT
+#define NPY_SIZEOF_LONG SIZEOF_LONG
+#define NPY_SIZEOF_FLOAT 4
+#define NPY_SIZEOF_COMPLEX_FLOAT 8
+#define NPY_SIZEOF_DOUBLE 8
+#define NPY_SIZEOF_COMPLEX_DOUBLE 16
+#define NPY_SIZEOF_LONGDOUBLE 16
+#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32
+#define NPY_SIZEOF_PY_INTPTR_T 8
+#define NPY_SIZEOF_PY_LONG_LONG 8
+#define NPY_SIZEOF_LONGLONG 8
+#define NPY_NO_SMP 0
+#define NPY_HAVE_DECL_ISNAN
+#define NPY_HAVE_DECL_ISINF
+#define NPY_HAVE_DECL_ISFINITE
+#define NPY_HAVE_DECL_SIGNBIT
+#define NPY_USE_C99_COMPLEX 1
+#define NPY_HAVE_COMPLEX_DOUBLE 1
+#define NPY_HAVE_COMPLEX_FLOAT 1
+#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1
+#define NPY_USE_C99_FORMATS 1
+#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden")))
+#define NPY_ABI_VERSION 0x01000009
+#define NPY_API_VERSION 0x00000007
+
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS 1
+#endif
meta/recipes-devtools/python/python-numpy/x86-64/config.h new file +139 -0

139 lines not on this page · raw message

meta/recipes-devtools/python/python-numpy_1.7.0.bb new file +78 -0

78 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#2 lore raw

PATCH v3 2/7 python-mako: add (from meta-oe)

In reply to Ross Burton

python-mako is needed for Piglit. This recipe is taken from meta-oe, and upgraded to the latest upstream version.

Checksums updated as the upstream LICENSE file contains the copyright dates.

---
 meta/recipes-devtools/python/python-mako_0.9.1.bb |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python-mako_0.9.1.bb
meta/recipes-devtools/python/python-mako_0.9.1.bb new file +20 -0
new file mode 100644
index 0000000..84071c8
@@ -0,0 +1,20 @@
+DESCRIPTION = "Templating library for Python"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=da2a9d126b93cab0996a8287dacc480b"
+
+SRC_URI = "https://pypi.python.org/packages/source/M/Mako/Mako-${PV}.tar.gz"
+SRC_URI[md5sum] = "fe3f394ef714776d09ec6133923736a7"
+SRC_URI[sha256sum] = "ed74d72b720a97a51590dfa839f2048ceeb76cc80d1d9ea5731a5262384316ae"
+
+S = "${WORKDIR}/Mako-${PV}"
+
+inherit setuptools
+
+RDEPENDS_${PN} = "python-threading \
+                  python-netclient \
+                  python-html \
+"
+RDEPENDS_${PN}_class-native = ""
+
+BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
1.7.10.4
#5 lore raw

PATCH v3 5/7 waffle: add (from meta-oe)

In reply to Ross Burton

Waffle is needed for Piglit. This recipe is based on the recipe in meta-oe, upgraded to the latest upstream 1.3.0.

---
 meta/recipes-graphics/waffle/waffle_1.3.0.bb |   32 ++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 meta/recipes-graphics/waffle/waffle_1.3.0.bb
meta/recipes-graphics/waffle/waffle_1.3.0.bb new file +32 -0
new file mode 100644
index 0000000..a6d1acd
@@ -0,0 +1,32 @@
+SUMMARY = "cross-platform C library to defer selection of GL API and of window system"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \
+                    file://include/waffle/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf"
+
+SRC_URI = "http://people.freedesktop.org/~chadversary/waffle/files/release/${BPN}-${PV}/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "5020ecc249096c881e1f59ee961f3d41"
+SRC_URI[sha256sum] = "340ee04172dba878249469018cd7ec9d1ecd41af26b612c741b8b52e713bca8e"
+
+inherit cmake
+
+# This should be overridden per-machine to reflect the capabilities of the GL
+# stack.
+PACKAGECONFIG ??= "glx"
+
+# I say virtual/libgl, actually wants gl.pc
+PACKAGECONFIG[glx] = "-Dwaffle_has_glx=1,,virtual/libgl libx11"
+
+# I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland
+# DISTRO_FEATURE.
+PACKAGECONFIG[wayland] = "-Dwaffle_has_wayland=1,,virtual/libgl wayland"
+
+# I say virtual/libgl, actually wants gbm.pc egl.pc
+PACKAGECONFIG[gbm] = "-Dwaffle_has_wayland=1,,virtual/libgl udev"
+
+# I say virtual/libgl, actually wants egl.pc
+PACKAGECONFIG[x11-egl] = "-Dwaffle_has_x11_egl=1,,virtual/libgl libxcb"
+
+# Take the flags added by PACKAGECONFIG and pass them to cmake.
+EXTRA_OECMAKE = "${EXTRA_OECONF}"
+
+FILES_${PN}-dev += "${datadir}/cmake/Modules/FindWaffle.cmake"
Signature · 1 line
1.7.10.4
#6 lore raw

PATCH v3 6/7 piglit: add (from meta-oe)

In reply to Ross Burton

Piglit is an OpenGL testing tool. This recipe is taken directly from meta-oe.

---
 meta/recipes-graphics/piglit/piglit_git.bb |   48 ++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 meta/recipes-graphics/piglit/piglit_git.bb
meta/recipes-graphics/piglit/piglit_git.bb new file +48 -0
new file mode 100644
index 0000000..8616764
@@ -0,0 +1,48 @@
+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"
+
+# From 2012/12/30.
+SRCREV = "bbeff5d21b06d37338ad28e42d88f499bef13268"
+# (when PV goes above 1.0 remove the trailing r)
+PV = "1.0+gitr${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "virtual/libx11 waffle virtual/libgl libglu python-mako-native python-numpy-native"
+
+inherit cmake pythonnative
+
+# As piglit doesn't install, enforce in-tree builds so that we can easily copy
+# contents out of $S and $B.
+B="${S}"
+
+# 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 -a lib/ ${D}${libdir}/piglit/
+	cp -a framework/ ${D}${libdir}/piglit/
+	cp -a generated_tests/ ${D}${libdir}/piglit/
+	cp -a tests/ ${D}${libdir}/piglit/
+	cp -a 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 python-multiprocessing python-textutils python-netserver python-shell mesa-demos"
Signature · 1 line
1.7.10.4
#7 lore raw

PATCH v3 7/7 packagegroup-core-tools-testapps: add Piglit

In reply to Ross Burton

Respect the OpenGL distro feature and if it's enabled, pull in piglit and mesa-tools.

---
 .../packagegroups/packagegroup-core-tools-testapps.bb           |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +6 -1
index 1861ebe..4b8f99b 100644
@@ -24,10 +24,14 @@ KEXECTOOLS_powerpc ?= ""
 KEXECTOOLS_e5500-64b ?= ""
 KEXECTOOLS_aarch64 ?= ""
 
+GLTOOLS = "\
+    mesa-demos \
+    piglit \
+    "
+
 X11TOOLS = "\
     fstests \
     owl-video \
-    mesa-demos \
     x11perf \
     xrestop \
     xwininfo \
@@ -48,4 +52,5 @@ RDEPENDS_${PN} = "\
     ltp \
     connman-client \
     ${@base_contains('DISTRO_FEATURES', 'x11', "${X11TOOLS}", "", d)} \
+    ${@base_contains('DISTRO_FEATURES', 'opengl', "${GLTOOLS}", "", d)} \
     "
Signature · 1 line
1.7.10.4