mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH 1/6] python: install python2 symlink
@ 2016-01-28 17:27 Lucas Stach
  2016-01-28 17:27 ` [ptxdist] [PATCH 2/6] host-python-six: new package Lucas Stach
                   ` (5 more replies)
  0 siblings, 6 replies; 9+ messages in thread
From: Lucas Stach @ 2016-01-28 17:27 UTC (permalink / raw)
  To: ptxdist

Some programs call python2 in order to explicitly request python2.x.
Allow this by installing a symlink to the the correct binary.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/python.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/python.make b/rules/python.make
index 8cc13efcec1a..a99f628f1456 100644
--- a/rules/python.make
+++ b/rules/python.make
@@ -185,6 +185,7 @@ $(STATEDIR)/python.targetinstall:
 	done
 
 	@$(call install_copy, python, 0, 0, 755, -, /usr/bin/python$(PYTHON_MAJORMINOR))
+	@$(call install_link, python, python$(PYTHON_MAJORMINOR), /usr/bin/python2)
 	@$(call install_lib, python, 0, 0, 644, libpython$(PYTHON_MAJORMINOR))
 
 ifdef PTXCONF_PYTHON_SYMLINK
-- 
2.7.0.rc3


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [ptxdist] [PATCH 2/6] host-python-six: new package
  2016-01-28 17:27 [ptxdist] [PATCH 1/6] python: install python2 symlink Lucas Stach
@ 2016-01-28 17:27 ` Lucas Stach
  2016-01-28 17:27 ` [ptxdist] [PATCH 3/6] host-python-numpy: " Lucas Stach
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 9+ messages in thread
From: Lucas Stach @ 2016-01-28 17:27 UTC (permalink / raw)
  To: ptxdist

Six is a Python 2 and 3 compatibility library.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/host-python-six.in   |  8 ++++++++
 rules/host-python-six.make | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 rules/host-python-six.in
 create mode 100644 rules/host-python-six.make

diff --git a/rules/host-python-six.in b/rules/host-python-six.in
new file mode 100644
index 000000000000..d1e9f5b61f23
--- /dev/null
+++ b/rules/host-python-six.in
@@ -0,0 +1,8 @@
+## SECTION=python
+
+config HOST_PYTHON_SIX
+	tristate
+	prompt "python-six"
+	select HOST_PYTHON
+	help
+	  Six is a Python 2 and 3 compatibility library.
diff --git a/rules/host-python-six.make b/rules/host-python-six.make
new file mode 100644
index 000000000000..c8bf336019bf
--- /dev/null
+++ b/rules/host-python-six.make
@@ -0,0 +1,33 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2015 by Lucas Stach <l.stach@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_PYTHON_SIX) += host-python-six
+
+#
+# Paths and names
+#
+HOST_PYTHON_SIX_VERSION	:= 1.10.0
+HOST_PYTHON_SIX_MD5	:= 34eed507548117b2ab523ab14b2f8b55
+HOST_PYTHON_SIX		:= six-$(HOST_PYTHON_SIX_VERSION)
+HOST_PYTHON_SIX_SUFFIX	:= tar.gz
+HOST_PYTHON_SIX_URL	:= https://pypi.python.org/packages/source/s/six/$(HOST_PYTHON_SIX).$(HOST_PYTHON_SIX_SUFFIX)
+HOST_PYTHON_SIX_SOURCE	:= $(SRCDIR)/$(HOST_PYTHON_SIX).$(HOST_PYTHON_SIX_SUFFIX)
+HOST_PYTHON_SIX_DIR	:= $(HOST_BUILDDIR)/$(HOST_PYTHON_SIX)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+HOST_PYTHON_SIX_CONF_TOOL	:= python
+
+# vim: syntax=make
-- 
2.7.0.rc3


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [ptxdist] [PATCH 3/6] host-python-numpy: new package
  2016-01-28 17:27 [ptxdist] [PATCH 1/6] python: install python2 symlink Lucas Stach
  2016-01-28 17:27 ` [ptxdist] [PATCH 2/6] host-python-six: new package Lucas Stach
@ 2016-01-28 17:27 ` Lucas Stach
  2016-01-28 17:27 ` [ptxdist] [PATCH 4/6] python-mako: " Lucas Stach
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 9+ messages in thread
From: Lucas Stach @ 2016-01-28 17:27 UTC (permalink / raw)
  To: ptxdist

NumPy is a general-purpose array-processing package designed to
efficiently manipulate large multi-dimensional arrays of arbitrary
records without sacrificing too much speed for small
multi-dimensional arrays.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/host-python-numpy.in   | 11 +++++++++++
 rules/host-python-numpy.make | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 rules/host-python-numpy.in
 create mode 100644 rules/host-python-numpy.make

diff --git a/rules/host-python-numpy.in b/rules/host-python-numpy.in
new file mode 100644
index 000000000000..79b29a8ed8f5
--- /dev/null
+++ b/rules/host-python-numpy.in
@@ -0,0 +1,11 @@
+## SECTION=python
+
+config HOST_PYTHON_NUMPY
+	tristate
+	prompt "python-numpy"
+	select HOST_PYTHON
+	help
+	  NumPy is a general-purpose array-processing package designed to
+	  efficiently manipulate large multi-dimensional arrays of arbitrary
+	  records without sacrificing too much speed for small
+	  multi-dimensional arrays.
diff --git a/rules/host-python-numpy.make b/rules/host-python-numpy.make
new file mode 100644
index 000000000000..7d26e36e6d91
--- /dev/null
+++ b/rules/host-python-numpy.make
@@ -0,0 +1,33 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2016 by Lucas Stach <l.stach@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_PYTHON_NUMPY) += host-python-numpy
+
+#
+# Paths and names
+#
+HOST_PYTHON_NUMPY_VERSION	:= 1.10.4
+HOST_PYTHON_NUMPY_MD5		:= aed294de0aa1ac7bd3f9745f4f1968ad
+HOST_PYTHON_NUMPY		:= numpy-$(HOST_PYTHON_NUMPY_VERSION)
+HOST_PYTHON_NUMPY_SUFFIX	:= tar.gz
+HOST_PYTHON_NUMPY_URL		:= https://pypi.python.org/packages/source/n/numpy/$(HOST_PYTHON_NUMPY).$(HOST_PYTHON_NUMPY_SUFFIX)
+HOST_PYTHON_NUMPY_SOURCE	:= $(SRCDIR)/$(HOST_PYTHON_NUMPY).$(HOST_PYTHON_NUMPY_SUFFIX)
+HOST_PYTHON_NUMPY_DIR		:= $(HOST_BUILDDIR)/$(HOST_PYTHON_NUMPY)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+HOST_PYTHON_NUMPY_CONF_TOOL	:= python
+
+# vim: syntax=make
-- 
2.7.0.rc3


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [ptxdist] [PATCH 4/6] python-mako: new package
  2016-01-28 17:27 [ptxdist] [PATCH 1/6] python: install python2 symlink Lucas Stach
  2016-01-28 17:27 ` [ptxdist] [PATCH 2/6] host-python-six: new package Lucas Stach
  2016-01-28 17:27 ` [ptxdist] [PATCH 3/6] host-python-numpy: " Lucas Stach
@ 2016-01-28 17:27 ` Lucas Stach
  2016-01-28 17:27 ` [ptxdist] [PATCH 5/6] waffle: " Lucas Stach
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 9+ messages in thread
From: Lucas Stach @ 2016-01-28 17:27 UTC (permalink / raw)
  To: ptxdist

Mako is a template library written in Python. It provides a
familiar, non-XML syntax which compiles into Python modules
for maximum performance.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/python-mako.in   | 11 ++++++++++
 rules/python-mako.make | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 rules/python-mako.in
 create mode 100644 rules/python-mako.make

diff --git a/rules/python-mako.in b/rules/python-mako.in
new file mode 100644
index 000000000000..bec88ccb4b96
--- /dev/null
+++ b/rules/python-mako.in
@@ -0,0 +1,11 @@
+## SECTION=python
+
+config PYTHON_MAKO
+	tristate
+	prompt "python-mako"
+	select PYTHON
+	select HOST_PYTHON_SETUPTOOLS
+	help
+	  Mako is a template library written in Python. It provides a
+	  familiar, non-XML syntax which compiles into Python modules
+	  for maximum performance. 
diff --git a/rules/python-mako.make b/rules/python-mako.make
new file mode 100644
index 000000000000..394d8a6eb6b1
--- /dev/null
+++ b/rules/python-mako.make
@@ -0,0 +1,59 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2015 by Lucas Stach <l.stach@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_PYTHON_MAKO) += python-mako
+
+#
+# Paths and names
+#
+PYTHON_MAKO_VERSION	:= 1.0.3
+PYTHON_MAKO_MD5		:= a78f20f6366a8a0659ce5532f8614e53
+PYTHON_MAKO		:= Mako-$(PYTHON_MAKO_VERSION)
+PYTHON_MAKO_SUFFIX	:= tar.gz
+PYTHON_MAKO_URL		:= https://pypi.python.org/packages/source/M/Mako/$(PYTHON_MAKO).$(PYTHON_MAKO_SUFFIX)
+PYTHON_MAKO_SOURCE	:= $(SRCDIR)/$(PYTHON_MAKO).$(PYTHON_MAKO_SUFFIX)
+PYTHON_MAKO_DIR		:= $(BUILDDIR)/$(PYTHON_MAKO)
+PYTHON_MAKO_LICENSE	:= MIT
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+PYTHON_MAKO_CONF_TOOL	:= python
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+PYTHON_MAKO_PYTHON_PATH = /usr/lib/python$(PYTHON_MAJORMINOR)/site-packages/mako
+
+$(STATEDIR)/python-mako.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, python-mako)
+	@$(call install_fixup, python-mako,PRIORITY,optional)
+	@$(call install_fixup, python-mako,SECTION,base)
+	@$(call install_fixup, python-mako,AUTHOR,"Lucas Stach <l.stach@pengutronix.de>")
+	@$(call install_fixup, python-mako,DESCRIPTION,missing)
+
+	@cd "$(PYTHON_MAKO_PKGDIR)$(PYTHON_MAKO_PYTHON_PATH)" && \
+	find -type d -o -type f -name "*.py" -printf '%P\n' | while read fn; do \
+		$(call install_copy, python-mako, 0, 0, 0644, -, \
+		$(PYTHON_MAKO_PYTHON_PATH)/$$fn); \
+	done
+
+	@$(call install_finish, python-mako)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.7.0.rc3


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [ptxdist] [PATCH 5/6] waffle: new package
  2016-01-28 17:27 [ptxdist] [PATCH 1/6] python: install python2 symlink Lucas Stach
                   ` (2 preceding siblings ...)
  2016-01-28 17:27 ` [ptxdist] [PATCH 4/6] python-mako: " Lucas Stach
@ 2016-01-28 17:27 ` Lucas Stach
  2016-02-01 14:39   ` Michael Olbrich
  2016-01-28 17:27 ` [ptxdist] [PATCH 6/6] piglit: " Lucas Stach
  2016-02-11 11:26 ` [ptxdist] [PATCH 1/6] python: install python2 symlink Michael Olbrich
  5 siblings, 1 reply; 9+ messages in thread
From: Lucas Stach @ 2016-01-28 17:27 UTC (permalink / raw)
  To: ptxdist

Waffle is a cross-platform C library that allows one to defer
selection of an OpenGL API and window system until runtime.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/waffle.in   | 33 ++++++++++++++++++++++++++++++
 rules/waffle.make | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 rules/waffle.in
 create mode 100644 rules/waffle.make

diff --git a/rules/waffle.in b/rules/waffle.in
new file mode 100644
index 000000000000..8ee10a17a716
--- /dev/null
+++ b/rules/waffle.in
@@ -0,0 +1,33 @@
+## SECTION=multimedia_libs
+
+menuconfig WAFFLE
+	tristate
+	prompt "waffle"
+	help
+	  Waffle is a cross-platform C library that allows one to defer
+	  selection of an OpenGL API and window system until runtime.
+
+if WAFFLE
+
+config WAFFLE_GLX
+	bool
+	prompt "GLX support"
+	depends on LIBXCB && MESALIB_OPENGL
+
+config WAFFLE_WAYLAND
+	bool
+	prompt "Wayland support"
+	depends on WAYLAND && MESALIB_EGL
+
+config WAFFLE_X11_EGL
+	bool
+	prompt "X11 EGL support"
+	depends on LIBXCB && MESALIB_EGL
+
+config WAFFLE_GBM
+	bool
+	prompt "GBM support"
+	depends on MESALIB_GBM && MESALIB_EGL && UDEV_LIBUDEV
+
+endif
+
diff --git a/rules/waffle.make b/rules/waffle.make
new file mode 100644
index 000000000000..f5f2b52b2721
--- /dev/null
+++ b/rules/waffle.make
@@ -0,0 +1,60 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2016 by Lucas Stach <l.stach@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_WAFFLE) += waffle
+
+#
+# Paths and names
+#
+WAFFLE_VERSION	:= 1.5.2
+WAFFLE_MD5	:= c669c91bf2f7e13a5d781c3dbb30fd8c
+WAFFLE		:= waffle-$(WAFFLE_VERSION)
+WAFFLE_SUFFIX	:= tar.xz
+WAFFLE_URL	:= http://www.waffle-gl.org/files/release/$(WAFFLE)/$(WAFFLE).$(WAFFLE_SUFFIX)
+WAFFLE_SOURCE	:= $(SRCDIR)/$(WAFFLE).$(WAFFLE_SUFFIX)
+WAFFLE_DIR	:= $(BUILDDIR)/$(WAFFLE)
+WAFFLE_LICENSE	:= BSD
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+WAFFLE_CONF_TOOL	:= cmake
+WAFFLE_CONF_OPT	:= \
+	$(CROSS_CMAKE_USR) \
+	-Dwaffle_has_glx=$(call ptx/ifdef,PTXCONF_WAFFLE_GLX,1,0) \
+	-Dwaffle_has_wayland=$(call ptx/ifdef,PTXCONF_WAFFLE_WAYLAND,1,0) \
+	-Dwaffle_has_x11_egl=$(call ptx/ifdef,PTXCONF_WAFFLE_X11_EGL,1,0) \
+	-Dwaffle_has_gbm=$(call ptx/ifdef,PTXCONF_WAFFLE_GBM,1,0)
+
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/waffle.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, waffle)
+	@$(call install_fixup, waffle,PRIORITY,optional)
+	@$(call install_fixup, waffle,SECTION,base)
+	@$(call install_fixup, waffle,AUTHOR,"Lucas Stach <l.stach@pengutronix.de>")
+	@$(call install_fixup, waffle,DESCRIPTION,missing)
+
+	@$(call install_lib, waffle, 0, 0, 0644, libwaffle-1)
+
+	@$(call install_finish, waffle)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.7.0.rc3


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [ptxdist] [PATCH 6/6] piglit: new package
  2016-01-28 17:27 [ptxdist] [PATCH 1/6] python: install python2 symlink Lucas Stach
                   ` (3 preceding siblings ...)
  2016-01-28 17:27 ` [ptxdist] [PATCH 5/6] waffle: " Lucas Stach
@ 2016-01-28 17:27 ` Lucas Stach
  2016-02-01 14:43   ` Michael Olbrich
  2016-02-11 11:26 ` [ptxdist] [PATCH 1/6] python: install python2 symlink Michael Olbrich
  5 siblings, 1 reply; 9+ messages in thread
From: Lucas Stach @ 2016-01-28 17:27 UTC (permalink / raw)
  To: ptxdist

Piglit is the opensource OpenGL/OpenCL test suite.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/piglit.in   | 47 +++++++++++++++++++++++++++++++++++++++++
 rules/piglit.make | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 rules/piglit.in
 create mode 100644 rules/piglit.make

diff --git a/rules/piglit.in b/rules/piglit.in
new file mode 100644
index 000000000000..2039afd4f7f6
--- /dev/null
+++ b/rules/piglit.in
@@ -0,0 +1,47 @@
+## SECTION=test_suites
+
+menuconfig PIGLIT
+	tristate
+	prompt "piglit"
+	select HOST_CMAKE
+	select HOST_PYTHON
+	select HOST_PYTHON_SIX
+	select HOST_PYTHON_NUMPY
+	select HOST_PYTHON_SETUPTOOLS
+	select PYTHON
+	select PYTHON_MAKO
+	select WAFFLE
+	select FREEGLUT if PIGLIT_TESTS_OPENGL
+	help
+	  Piglit is the opensource OpenGL/OpenCL test suite.
+
+if PIGLIT
+
+# OpenGL tests need some more dependencies sorted out
+
+config PIGLIT_TESTS_OPENGL
+	bool
+	prompt "build OpenGL tests"
+	depends on MESALIB_OPENGL
+
+config PIGLIT_TESTS_OPENGLES1
+	bool
+	prompt "build OpenGL ES1 tests"
+	depends on MESALIB_GLES1
+
+config PIGLIT_TESTS_OPENGLES2
+	bool
+	prompt "build OpenGL ES2 tests"
+	depends on MESALIB_GLES2
+
+config PIGLIT_TESTS_OPENGLES3
+	bool
+	prompt "build OpenGL ES3 tests"
+	depends on BROKEN
+
+config PIGLIT_TESTS_OPENCL
+	bool
+	prompt "build OpenCL tests"
+	depends on BROKEN
+
+endif
diff --git a/rules/piglit.make b/rules/piglit.make
new file mode 100644
index 000000000000..f18ec4a43c8d
--- /dev/null
+++ b/rules/piglit.make
@@ -0,0 +1,63 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2015 by Lucas Stach <l.stach@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_PIGLIT) += piglit
+
+#
+# Paths and names
+#
+PIGLIT_VERSION	:= 8de771e67db8
+PIGLIT_MD5	:= 7a32e68e30865d12524157a9213226d3
+PIGLIT		:= piglit-$(PIGLIT_VERSION)
+PIGLIT_SUFFIX	:= tar.xz
+PIGLIT_URL	:= http://anongit.freedesktop.org/git/piglit.git;tag=$(PIGLIT_VERSION)
+PIGLIT_SOURCE	:= $(SRCDIR)/$(PIGLIT).$(PIGLIT_SUFFIX)
+PIGLIT_DIR	:= $(BUILDDIR)/$(PIGLIT)
+PIGLIT_LICENSE	:= unknown
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+PIGLIT_BUILD_OOT	:= NO
+PIGLIT_CONF_TOOL	:= cmake
+
+PIGLIT_CONF_OPT	:= $(CROSS_CMAKE_USR) \
+	-DPIGLIT_USE_WAFFLE=1 \
+	-DPIGLIT_BUILD_GL_TESTS=$(call ptx/ifdef, PTXCONF_PIGLIT_TESTS_OPENGL,1,0) \
+	-DPIGLIT_BUILD_GLES1_TESTS=$(call ptx/ifdef, PTXCONF_PIGLIT_TESTS_OPENGLES1,1,0) \
+	-DPIGLIT_BUILD_GLES2_TESTS=$(call ptx/ifdef, PTXCONF_PIGLIT_TESTS_OPENGLES2,1,0) \
+	-DPIGLIT_BUILD_GLES3_TESTS=$(call ptx/ifdef, PTXCONF_PIGLIT_TESTS_OPENGLES3,1,0) \
+	-DPIGLIT_BUILD_CL_TESTS=$(call ptx/ifdef, PTXCONF_PIGLIT_TESTS_OPENCL,1,0)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/piglit.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, piglit)
+	@$(call install_fixup, piglit,PRIORITY,optional)
+	@$(call install_fixup, piglit,SECTION,base)
+	@$(call install_fixup, piglit,AUTHOR,"Lucas Stach <l.stach@pengutronix.de>")
+	@$(call install_fixup, piglit,DESCRIPTION,missing)
+
+	@$(call install_copy, piglit, 0, 0, 755, -, /usr/bin/piglit)
+	@$(call install_tree, piglit, 0, 0, -, /usr/lib/piglit)
+
+	@$(call install_finish, piglit)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.7.0.rc3


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [ptxdist] [PATCH 5/6] waffle: new package
  2016-01-28 17:27 ` [ptxdist] [PATCH 5/6] waffle: " Lucas Stach
@ 2016-02-01 14:39   ` Michael Olbrich
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2016-02-01 14:39 UTC (permalink / raw)
  To: ptxdist

On Thu, Jan 28, 2016 at 06:27:07PM +0100, Lucas Stach wrote:
> Waffle is a cross-platform C library that allows one to defer
> selection of an OpenGL API and window system until runtime.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  rules/waffle.in   | 33 ++++++++++++++++++++++++++++++
>  rules/waffle.make | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 93 insertions(+)
>  create mode 100644 rules/waffle.in
>  create mode 100644 rules/waffle.make
> 
> diff --git a/rules/waffle.in b/rules/waffle.in
> new file mode 100644
> index 000000000000..8ee10a17a716
> --- /dev/null
> +++ b/rules/waffle.in
> @@ -0,0 +1,33 @@
> +## SECTION=multimedia_libs
> +
> +menuconfig WAFFLE
> +	tristate
> +	prompt "waffle"
> +	help
> +	  Waffle is a cross-platform C library that allows one to defer
> +	  selection of an OpenGL API and window system until runtime.
> +
> +if WAFFLE
> +
> +config WAFFLE_GLX
> +	bool
> +	prompt "GLX support"
> +	depends on LIBXCB && MESALIB_OPENGL

This does not work.

	select LIBXCB		if WAFFLE_GLX
	select MESALIB_OPENGL	if WAFFLE_GLX

Must be added to the top-level option instead. Otherwise the necessary
dependencies will be missing.

> +
> +config WAFFLE_WAYLAND
> +	bool
> +	prompt "Wayland support"
> +	depends on WAYLAND && MESALIB_EGL
> +
> +config WAFFLE_X11_EGL
> +	bool
> +	prompt "X11 EGL support"
> +	depends on LIBXCB && MESALIB_EGL
> +
> +config WAFFLE_GBM
> +	bool
> +	prompt "GBM support"
> +	depends on MESALIB_GBM && MESALIB_EGL && UDEV_LIBUDEV
> +
> +endif

The same for the other options.

> +
> diff --git a/rules/waffle.make b/rules/waffle.make
> new file mode 100644
> index 000000000000..f5f2b52b2721
> --- /dev/null
> +++ b/rules/waffle.make
> @@ -0,0 +1,60 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2016 by Lucas Stach <l.stach@pengutronix.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_WAFFLE) += waffle
> +
> +#
> +# Paths and names
> +#
> +WAFFLE_VERSION	:= 1.5.2
> +WAFFLE_MD5	:= c669c91bf2f7e13a5d781c3dbb30fd8c
> +WAFFLE		:= waffle-$(WAFFLE_VERSION)
> +WAFFLE_SUFFIX	:= tar.xz
> +WAFFLE_URL	:= http://www.waffle-gl.org/files/release/$(WAFFLE)/$(WAFFLE).$(WAFFLE_SUFFIX)
> +WAFFLE_SOURCE	:= $(SRCDIR)/$(WAFFLE).$(WAFFLE_SUFFIX)
> +WAFFLE_DIR	:= $(BUILDDIR)/$(WAFFLE)
> +WAFFLE_LICENSE	:= BSD

Use the correct SPDX identifier
BSD-2-Clause / BSD-3-Clause / BSD-4-Clause

Michael

> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +WAFFLE_CONF_TOOL	:= cmake
> +WAFFLE_CONF_OPT	:= \
> +	$(CROSS_CMAKE_USR) \
> +	-Dwaffle_has_glx=$(call ptx/ifdef,PTXCONF_WAFFLE_GLX,1,0) \
> +	-Dwaffle_has_wayland=$(call ptx/ifdef,PTXCONF_WAFFLE_WAYLAND,1,0) \
> +	-Dwaffle_has_x11_egl=$(call ptx/ifdef,PTXCONF_WAFFLE_X11_EGL,1,0) \
> +	-Dwaffle_has_gbm=$(call ptx/ifdef,PTXCONF_WAFFLE_GBM,1,0)
> +
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/waffle.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, waffle)
> +	@$(call install_fixup, waffle,PRIORITY,optional)
> +	@$(call install_fixup, waffle,SECTION,base)
> +	@$(call install_fixup, waffle,AUTHOR,"Lucas Stach <l.stach@pengutronix.de>")
> +	@$(call install_fixup, waffle,DESCRIPTION,missing)
> +
> +	@$(call install_lib, waffle, 0, 0, 0644, libwaffle-1)
> +
> +	@$(call install_finish, waffle)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 2.7.0.rc3
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [ptxdist] [PATCH 6/6] piglit: new package
  2016-01-28 17:27 ` [ptxdist] [PATCH 6/6] piglit: " Lucas Stach
@ 2016-02-01 14:43   ` Michael Olbrich
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2016-02-01 14:43 UTC (permalink / raw)
  To: ptxdist

On Thu, Jan 28, 2016 at 06:27:08PM +0100, Lucas Stach wrote:
> Piglit is the opensource OpenGL/OpenCL test suite.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  rules/piglit.in   | 47 +++++++++++++++++++++++++++++++++++++++++
>  rules/piglit.make | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 110 insertions(+)
>  create mode 100644 rules/piglit.in
>  create mode 100644 rules/piglit.make
> 
> diff --git a/rules/piglit.in b/rules/piglit.in
> new file mode 100644
> index 000000000000..2039afd4f7f6
> --- /dev/null
> +++ b/rules/piglit.in
> @@ -0,0 +1,47 @@
> +## SECTION=test_suites
> +
> +menuconfig PIGLIT
> +	tristate
> +	prompt "piglit"
         -------------^
add spaces to align the "-->" in the menu.

> +	select HOST_CMAKE
> +	select HOST_PYTHON
> +	select HOST_PYTHON_SIX
> +	select HOST_PYTHON_NUMPY
> +	select HOST_PYTHON_SETUPTOOLS
> +	select PYTHON
> +	select PYTHON_MAKO
> +	select WAFFLE
> +	select FREEGLUT if PIGLIT_TESTS_OPENGL
> +	help
> +	  Piglit is the opensource OpenGL/OpenCL test suite.
> +
> +if PIGLIT
> +
> +# OpenGL tests need some more dependencies sorted out
> +
> +config PIGLIT_TESTS_OPENGL
> +	bool
> +	prompt "build OpenGL tests"
> +	depends on MESALIB_OPENGL

See my comments for waffle.

Michael

> +
> +config PIGLIT_TESTS_OPENGLES1
> +	bool
> +	prompt "build OpenGL ES1 tests"
> +	depends on MESALIB_GLES1
> +
> +config PIGLIT_TESTS_OPENGLES2
> +	bool
> +	prompt "build OpenGL ES2 tests"
> +	depends on MESALIB_GLES2
> +
> +config PIGLIT_TESTS_OPENGLES3
> +	bool
> +	prompt "build OpenGL ES3 tests"
> +	depends on BROKEN
> +
> +config PIGLIT_TESTS_OPENCL
> +	bool
> +	prompt "build OpenCL tests"
> +	depends on BROKEN
> +
> +endif
> diff --git a/rules/piglit.make b/rules/piglit.make
> new file mode 100644
> index 000000000000..f18ec4a43c8d
> --- /dev/null
> +++ b/rules/piglit.make
> @@ -0,0 +1,63 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2015 by Lucas Stach <l.stach@pengutronix.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_PIGLIT) += piglit
> +
> +#
> +# Paths and names
> +#
> +PIGLIT_VERSION	:= 8de771e67db8
> +PIGLIT_MD5	:= 7a32e68e30865d12524157a9213226d3
> +PIGLIT		:= piglit-$(PIGLIT_VERSION)
> +PIGLIT_SUFFIX	:= tar.xz
> +PIGLIT_URL	:= http://anongit.freedesktop.org/git/piglit.git;tag=$(PIGLIT_VERSION)
> +PIGLIT_SOURCE	:= $(SRCDIR)/$(PIGLIT).$(PIGLIT_SUFFIX)
> +PIGLIT_DIR	:= $(BUILDDIR)/$(PIGLIT)
> +PIGLIT_LICENSE	:= unknown
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +PIGLIT_BUILD_OOT	:= NO
> +PIGLIT_CONF_TOOL	:= cmake
> +
> +PIGLIT_CONF_OPT	:= $(CROSS_CMAKE_USR) \
> +	-DPIGLIT_USE_WAFFLE=1 \
> +	-DPIGLIT_BUILD_GL_TESTS=$(call ptx/ifdef, PTXCONF_PIGLIT_TESTS_OPENGL,1,0) \
> +	-DPIGLIT_BUILD_GLES1_TESTS=$(call ptx/ifdef, PTXCONF_PIGLIT_TESTS_OPENGLES1,1,0) \
> +	-DPIGLIT_BUILD_GLES2_TESTS=$(call ptx/ifdef, PTXCONF_PIGLIT_TESTS_OPENGLES2,1,0) \
> +	-DPIGLIT_BUILD_GLES3_TESTS=$(call ptx/ifdef, PTXCONF_PIGLIT_TESTS_OPENGLES3,1,0) \
> +	-DPIGLIT_BUILD_CL_TESTS=$(call ptx/ifdef, PTXCONF_PIGLIT_TESTS_OPENCL,1,0)
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/piglit.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, piglit)
> +	@$(call install_fixup, piglit,PRIORITY,optional)
> +	@$(call install_fixup, piglit,SECTION,base)
> +	@$(call install_fixup, piglit,AUTHOR,"Lucas Stach <l.stach@pengutronix.de>")
> +	@$(call install_fixup, piglit,DESCRIPTION,missing)
> +
> +	@$(call install_copy, piglit, 0, 0, 755, -, /usr/bin/piglit)
> +	@$(call install_tree, piglit, 0, 0, -, /usr/lib/piglit)
> +
> +	@$(call install_finish, piglit)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 2.7.0.rc3
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [ptxdist] [PATCH 1/6] python: install python2 symlink
  2016-01-28 17:27 [ptxdist] [PATCH 1/6] python: install python2 symlink Lucas Stach
                   ` (4 preceding siblings ...)
  2016-01-28 17:27 ` [ptxdist] [PATCH 6/6] piglit: " Lucas Stach
@ 2016-02-11 11:26 ` Michael Olbrich
  5 siblings, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2016-02-11 11:26 UTC (permalink / raw)
  To: ptxdist

On Thu, Jan 28, 2016 at 06:27:03PM +0100, Lucas Stach wrote:
> Some programs call python2 in order to explicitly request python2.x.
> Allow this by installing a symlink to the the correct binary.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

Thanks, applied.

Michael

> ---
>  rules/python.make | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/rules/python.make b/rules/python.make
> index 8cc13efcec1a..a99f628f1456 100644
> --- a/rules/python.make
> +++ b/rules/python.make
> @@ -185,6 +185,7 @@ $(STATEDIR)/python.targetinstall:
>  	done
>  
>  	@$(call install_copy, python, 0, 0, 755, -, /usr/bin/python$(PYTHON_MAJORMINOR))
> +	@$(call install_link, python, python$(PYTHON_MAJORMINOR), /usr/bin/python2)
>  	@$(call install_lib, python, 0, 0, 644, libpython$(PYTHON_MAJORMINOR))
>  
>  ifdef PTXCONF_PYTHON_SYMLINK
> -- 
> 2.7.0.rc3
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2016-02-11 11:26 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-28 17:27 [ptxdist] [PATCH 1/6] python: install python2 symlink Lucas Stach
2016-01-28 17:27 ` [ptxdist] [PATCH 2/6] host-python-six: new package Lucas Stach
2016-01-28 17:27 ` [ptxdist] [PATCH 3/6] host-python-numpy: " Lucas Stach
2016-01-28 17:27 ` [ptxdist] [PATCH 4/6] python-mako: " Lucas Stach
2016-01-28 17:27 ` [ptxdist] [PATCH 5/6] waffle: " Lucas Stach
2016-02-01 14:39   ` Michael Olbrich
2016-01-28 17:27 ` [ptxdist] [PATCH 6/6] piglit: " Lucas Stach
2016-02-01 14:43   ` Michael Olbrich
2016-02-11 11:26 ` [ptxdist] [PATCH 1/6] python: install python2 symlink Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox