[ptxdist] [PATCH 0/5] update drm / mesa support and add testtools

[ptxdist] [PATCH 0/5] update drm / mesa support and add testtools

[Markus Niebel]

From: Markus Niebel <Markus.Niebel@tq-group.com>

Markus Niebel (5):
  host-system-python: add check for mako
  mesalib: version bump 13.0.2 -> 17.0.1
  libdrm: version bump 2.7.74 -> 2.7.75
  kmscube: add new package
  glmark2: add new package

 ...NativeStateDRM-add-imx-drm-driver-support.patch |  29 ++++
 .../series                                         |   1 +
 .../0001-force-autogen-to-look-for-stdc.patch      |  29 ++++
 .../0002-fix-headers.patch                         |  39 ++++++
 .../autogen.sh                                     |  18 +++
 .../series                                         |   2 +
 rules/glmark2.in                                   |  45 ++++++
 rules/glmark2.make                                 | 156 +++++++++++++++++++++
 rules/host-mesalib.in                              |   1 +
 rules/host-mesalib.make                            |   2 -
 rules/host-system-python.in                        |   3 +
 rules/host-system-python.make                      |   6 +
 rules/kmscube.in                                   |   9 ++
 rules/kmscube.make                                 |  92 ++++++++++++
 rules/libdrm.in                                    |   2 -
 rules/libdrm.make                                  |   7 +-
 rules/mesalib.in                                   |  20 +++
 rules/mesalib.make                                 |  25 +++-
 18 files changed, 473 insertions(+), 13 deletions(-)
 create mode 100644 patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/0001-NativeStateDRM-add-imx-drm-driver-support.patch
 create mode 100644 patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/series
 create mode 100644 patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0001-force-autogen-to-look-for-stdc.patch
 create mode 100644 patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0002-fix-headers.patch
 create mode 100755 patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/autogen.sh
 create mode 100644 patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/series
 create mode 100644 rules/glmark2.in
 create mode 100644 rules/glmark2.make
 create mode 100644 rules/kmscube.in
 create mode 100644 rules/kmscube.make

-- 
1.9.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 1/5] host-system-python: add check for mako

[Markus Niebel]

From: Markus Niebel <Markus.Niebel@tq-group.com>

needed for mesa 17 and newer

Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
---
 rules/host-system-python.in   | 3 +++
 rules/host-system-python.make | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/rules/host-system-python.in b/rules/host-system-python.in
index 300b078..61fdbc6 100644
--- a/rules/host-system-python.in
+++ b/rules/host-system-python.in
@@ -14,4 +14,7 @@ config HOST_SYSTEM_PYTHON_ARGPARSE
 config HOST_SYSTEM_PYTHON_BZ2
 	bool
 
+config HOST_SYSTEM_PYTHON_MAKO
+	bool
+
 endif
diff --git a/rules/host-system-python.make b/rules/host-system-python.make
index 31b29b9..a521176 100644
--- a/rules/host-system-python.make
+++ b/rules/host-system-python.make
@@ -41,6 +41,12 @@ ifdef PTXCONF_HOST_SYSTEM_PYTHON_BZ2
 		ptxd_bailout "Python bz2 module not found! \
 	Please install python-bz2";
 endif
+ifdef PTXCONF_HOST_SYSTEM_PYTHON_MAKO
+	@echo "Checking for Python Mako ..."
+	@python -c 'import mako' 2>/dev/null || \
+		ptxd_bailout "Python mako module not found! \
+	Please install python-mako (debian)";
+endif
 	@echo
 	@$(call touch)
 
-- 
1.9.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/5] mesalib: version bump 13.0.2 -> 17.0.1

[Markus Niebel]

From: Markus Niebel <Markus.Niebel@tq-group.com>

- add support for etnaviv
- update config opts
- add fallback download URL (newest mesalib seems to live there)

Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
---
 rules/host-mesalib.in   |  1 +
 rules/host-mesalib.make |  2 --
 rules/mesalib.in        | 20 ++++++++++++++++++++
 rules/mesalib.make      | 25 ++++++++++++++++++-------
 4 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/rules/host-mesalib.in b/rules/host-mesalib.in
index 1bf56ae..29a6a22 100644
--- a/rules/host-mesalib.in
+++ b/rules/host-mesalib.in
@@ -6,4 +6,5 @@ config HOST_MESALIB
 	select HOST_MAKEDEPEND
 	select HOST_SYSTEM_PYTHON
 	select HOST_SYSTEM_PYTHON_XML2
+	select HOST_SYSTEM_PYTHON_MAKO
 	select HOST_LIBPTHREAD_STUBS
diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
index 1619d20..48702ac 100644
--- a/rules/host-mesalib.make
+++ b/rules/host-mesalib.make
@@ -53,7 +53,6 @@ HOST_MESALIB_CONF_OPT	:= \
 	--disable-opencl \
 	--disable-opencl-icd \
 	--disable-gallium-tests \
-	--disable-shader-cache \
 	--enable-shared-glapi \
 	--disable-glx-read-only-text \
 	--disable-driglx-direct \
@@ -61,7 +60,6 @@ HOST_MESALIB_CONF_OPT	:= \
 	--disable-llvm-shared-libs \
 	--disable-gallium-llvm \
 	--disable-libglvnd \
-	--with-sha1= \
 	--with-gallium-drivers= \
 	--with-dri-drivers= \
 	--without-vulkan-drivers
diff --git a/rules/mesalib.in b/rules/mesalib.in
index 430c94e..a4daf2d 100644
--- a/rules/mesalib.in
+++ b/rules/mesalib.in
@@ -7,6 +7,10 @@ menuconfig MESALIB
 	select HOST_MAKEDEPEND
 	select HOST_SYSTEM_PYTHON
 	select HOST_SYSTEM_PYTHON_XML2
+<<<<<<< HEAD
+=======
+	select HOST_SYSTEM_PYTHON_MAKO
+>>>>>>> 27c7b2f... mesalib: version bump 13.0.2 -> 17.0
 	select GCCLIBS
 	select GCCLIBS_CXX
 	select LIBDRM
@@ -19,6 +23,10 @@ menuconfig MESALIB
 	select LIBDRM_RADEON		if MESALIB_DRI_RADEONSI
 	select LIBDRM_NOUVEAU		if MESALIB_DRI_NOUVEAU || MESALIB_DRI_NOUVEAU_VIEUX
 	select LIBDRM_FREEDRENO		if MESALIB_DRI_FREEDRENO
+<<<<<<< HEAD
+=======
+	select LIBDRM_ETNAVIV		if MESALIB_DRI_ETNAVIV
+>>>>>>> 27c7b2f... mesalib: version bump 13.0.2 -> 17.0
 	select XORG_PROTO_DRI2		if MESALIB_GLX
 	select XORG_LIB_X11		if MESALIB_GLX
 	select XORG_LIB_XEXT		if MESALIB_GLX
@@ -91,6 +99,18 @@ config MESALIB_DRI_FREEDRENO
 	bool
 	prompt "Freedreno"
 
+<<<<<<< HEAD
+=======
+config MESALIB_DRI_ETNAVIV
+	bool
+	prompt "Etnaviv"
+
+config MESALIB_DRI_IMX
+	bool
+	depends on MESALIB_DRI_ETNAVIV
+	prompt "imx"
+
+>>>>>>> 27c7b2f... mesalib: version bump 13.0.2 -> 17.0
 config MESALIB_DRI_VC4
 	bool
 	prompt "vc4"
diff --git a/rules/mesalib.make b/rules/mesalib.make
index 2c7389b..5299a0c 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -19,11 +19,13 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
 #
 # Paths and names
 #
-MESALIB_VERSION	:= 13.0.2
-MESALIB_MD5	:= 9442c2dee914cde3d1f090371ab04113
+MESALIB_VERSION	:= 17.0.1
+MESALIB_MD5	:= 6a7e768241846c8c69bbadbf904dcc58
 MESALIB		:= mesa-$(MESALIB_VERSION)
 MESALIB_SUFFIX	:= tar.xz
-MESALIB_URL	:= ftp://ftp.freedesktop.org/pub/mesa/$(MESALIB_VERSION)/$(MESALIB).$(MESALIB_SUFFIX)
+MESALIB_URL	:= \
+	ftp://ftp.freedesktop.org/pub/mesa/$(MESALIB_VERSION)/$(MESALIB).$(MESALIB_SUFFIX) \
+	ftp://ftp.freedesktop.org/pub/mesa/$(MESALIB).$(MESALIB_SUFFIX)
 MESALIB_SOURCE	:= $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX)
 MESALIB_DIR	:= $(BUILDDIR)/Mesa-$(MESALIB_VERSION)
 MESALIB_LICENSE	:= MIT
@@ -55,6 +57,10 @@ endif
 
 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_NOUVEAU)	+= nouveau
 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_FREEDRENO)+= freedreno
+
+MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_ETNAVIV)+= etnaviv
+MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_IMX)+= imx
+
 ifdef PTXCONF_ARCH_ARM
 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_VC4)	+= vc4
 endif
@@ -62,8 +68,15 @@ endif
 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_SWRAST)	+= swrast
 
 MESALIB_DRI_LIBS-y += \
-	$(subst nouveau,nouveau_vieux,$(MESALIB_DRI_DRIVERS-y)) \
-	$(subst freedreno,kgsl,$(MESALIB_GALLIUM_DRIVERS-y))
+	$(MESALIB_DRI_DRIVERS-y) \
+	$(MESALIB_GALLIUM_DRIVERS-y)
+
+MESALIB_DRI_LIBS-y := \
+	$(subst nouveau,nouveau_vieux,$(MESALIB_DRI_LIBS-y))
+MESALIB_DRI_LIBS-y := \
+	$(subst imx,imx-drm,$(MESALIB_DRI_LIBS-y))
+MESALIB_DRI_LIBS-y := \
+	$(subst freedreno,kgsl,$(MESALIB_DRI_LIBS-y))
 
 MESALIB_LIBS-y				:= libglapi
 MESALIB_LIBS-$(PTXCONF_MESALIB_GLX)	+= libGL
@@ -111,7 +124,6 @@ MESALIB_CONF_OPT	:= \
 	--disable-opencl \
 	--disable-opencl-icd \
 	--disable-gallium-tests \
-	--disable-shader-cache \
 	--enable-shared-glapi \
 	--disable-glx-read-only-text \
 	--enable-driglx-direct \
@@ -119,7 +131,6 @@ MESALIB_CONF_OPT	:= \
 	--disable-gallium-llvm \
 	--enable-llvm-shared-libs \
 	--disable-libglvnd \
-	--with-sha1= \
 	--with-gallium-drivers=$(subst $(space),$(comma),$(MESALIB_GALLIUM_DRIVERS-y)) \
 	--with-dri-driverdir=/usr/lib/dri \
 	--with-dri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y)) \
-- 
1.9.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 3/5] libdrm: version bump 2.7.74 -> 2.7.75

[Markus Niebel]

From: Markus Niebel <Markus.Niebel@tq-group.com>

drop not longer needed udev dep

Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
---
 rules/libdrm.in   | 2 --
 rules/libdrm.make | 7 +++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/rules/libdrm.in b/rules/libdrm.in
index 5e77665..b6aa08f 100644
--- a/rules/libdrm.in
+++ b/rules/libdrm.in
@@ -4,8 +4,6 @@ menuconfig LIBDRM
 	tristate
 	prompt "libdrm                        "
 	select LIBC_RT
-	select UDEV
-	select UDEV_LIBUDEV
 	select LIBPTHREAD_STUBS
 	select LIBPCIACCESS	if LIBDRM_INTEL
 	help
diff --git a/rules/libdrm.make b/rules/libdrm.make
index ec02cc7..f97e011 100644
--- a/rules/libdrm.make
+++ b/rules/libdrm.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBDRM) += libdrm
 #
 # Paths and names
 #
-LIBDRM_VERSION	:= 2.4.74
-LIBDRM_MD5	:= b661a54514109caad3de3b520680b98e
+LIBDRM_VERSION	:= 2.4.75
+LIBDRM_MD5	:= 743c16109d91a2539dfc9cc56130d695
 LIBDRM		:= libdrm-$(LIBDRM_VERSION)
 LIBDRM_SUFFIX	:= tar.gz
 LIBDRM_URL	:= http://dri.freedesktop.org/libdrm/$(LIBDRM).$(LIBDRM_SUFFIX)
@@ -61,7 +61,10 @@ LIBDRM_BACKENDSL-y += $(LIBDRM_BACKENDS-y)
 LIBDRM_CONF_TOOL := autoconf
 LIBDRM_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
+<<<<<<< HEAD
 	--enable-udev \
+=======
+>>>>>>> 2436ea2... libdrm: version bump 2.7.75 -> 2.7.75
 	--$(call ptx/endis, PTXCONF_LIBDRM_LIBKMS)-libkms \
 	$(addprefix --enable-,$(LIBDRM_BACKENDSC-y)) \
 	$(addprefix --disable-,$(LIBDRM_BACKENDSC-)) \
-- 
1.9.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 4/5] kmscube: add new package

[Markus Niebel]

From: Markus Niebel <Markus.Niebel@tq-group.com>

Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
---
 .../0001-force-autogen-to-look-for-stdc.patch      | 29 +++++++
 .../0002-fix-headers.patch                         | 39 +++++++++
 .../autogen.sh                                     | 18 +++++
 .../series                                         |  2 +
 rules/kmscube.in                                   |  9 +++
 rules/kmscube.make                                 | 92 ++++++++++++++++++++++
 6 files changed, 189 insertions(+)
 create mode 100644 patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0001-force-autogen-to-look-for-stdc.patch
 create mode 100644 patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0002-fix-headers.patch
 create mode 100755 patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/autogen.sh
 create mode 100644 patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/series
 create mode 100644 rules/kmscube.in
 create mode 100644 rules/kmscube.make

diff --git a/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0001-force-autogen-to-look-for-stdc.patch b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0001-force-autogen-to-look-for-stdc.patch
new file mode 100644
index 0000000..3aa1cb8
--- /dev/null
+++ b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0001-force-autogen-to-look-for-stdc.patch
@@ -0,0 +1,29 @@
+From 3690585109ca98669a9faeadd0c5ecbe1e24dbe0 Mon Sep 17 00:00:00 2001
+From: Markus Niebel <Markus.Niebel@tq-group.com>
+Date: Thu, 2 Mar 2017 17:17:20 +0100
+Subject: [PATCH 1/2] force autogen to look for stdc
+
+needed since sources using constructs needing stdc99
+
+Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 4441d2d..2b456d4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,6 +36,9 @@ AM_MAINTAINER_MODE
+ # Enable quiet compiles on automake 1.11.
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
++AC_PROG_CC
++AC_PROG_CC_STDC
++
+ # Initialize libtool
+ AC_PROG_LIBTOOL
+ 
+-- 
+1.9.1
+
diff --git a/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0002-fix-headers.patch b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0002-fix-headers.patch
new file mode 100644
index 0000000..cee67d9
--- /dev/null
+++ b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/0002-fix-headers.patch
@@ -0,0 +1,39 @@
+From 20877b1bc6c7bee69e2a13e7f8c69bc02f2e7405 Mon Sep 17 00:00:00 2001
+From: Markus Niebel <Markus.Niebel@tq-group.com>
+Date: Thu, 2 Mar 2017 17:18:53 +0100
+Subject: [PATCH 2/2] fix headers
+
+Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
+---
+ drm-atomic.c | 1 +
+ drm-legacy.c | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/drm-atomic.c b/drm-atomic.c
+index b4755e1..1c71840 100644
+--- a/drm-atomic.c
++++ b/drm-atomic.c
+@@ -25,6 +25,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ 
+ #include "common.h"
+diff --git a/drm-legacy.c b/drm-legacy.c
+index 29d5f3c..1029904 100644
+--- a/drm-legacy.c
++++ b/drm-legacy.c
+@@ -24,6 +24,8 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <unistd.h>
++#include <sys/select.h>
+ 
+ #include "common.h"
+ #include "drm.h"
+-- 
+1.9.1
+
diff --git a/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/autogen.sh b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/autogen.sh
new file mode 100755
index 0000000..df78c38
--- /dev/null
+++ b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/autogen.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+aclocal $ACLOCAL_FLAGS
+
+libtoolize \
+	--force \
+	--copy
+
+autoreconf \
+	--force \
+	--install \
+	--warnings=cross \
+	--warnings=syntax \
+	--warnings=obsolete \
+	--warnings=unsupported
+
diff --git a/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/series b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/series
new file mode 100644
index 0000000..b2ac20a
--- /dev/null
+++ b/patches/kmscube-87e3ff5683ee54228b3e6e75f7d4de83901fadb0/series
@@ -0,0 +1,2 @@
+0001-force-autogen-to-look-for-stdc.patch
+0002-fix-headers.patch
diff --git a/rules/kmscube.in b/rules/kmscube.in
new file mode 100644
index 0000000..6f9034e
--- /dev/null
+++ b/rules/kmscube.in
@@ -0,0 +1,9 @@
+## SECTION=multimedia_libs
+
+config KMSCUBE
+	bool
+	prompt "kmscube"
+	depends on MESALIB
+	depends on LIBDRM
+	help
+	  FIXME
diff --git a/rules/kmscube.make b/rules/kmscube.make
new file mode 100644
index 0000000..91446cc
--- /dev/null
+++ b/rules/kmscube.make
@@ -0,0 +1,92 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2017 by Markus Niebel <Markus.Niebel@tq-group.com>
+#
+# 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_KMSCUBE) += kmscube
+
+#
+# Paths and names
+#
+KMSCUBE_VERSION	:= 87e3ff5683ee54228b3e6e75f7d4de83901fadb0
+KMSCUBE		:= kmscube-$(KMSCUBE_VERSION)
+KMSCUBE_MD5	:= 1a0b817a51705259ec1c19026dd25d49
+KMSCUBE_URL	:= git://anongit.freedesktop.org/mesa/kmscube;tag=$(KMSCUBE_VERSION)
+KMSCUBE_SUFFIX	:= tar.gz
+KMSCUBE_SOURCE	:= $(SRCDIR)/$(KMSCUBE).$(KMSCUBE_SUFFIX)
+KMSCUBE_DIR		:= $(BUILDDIR)/$(KMSCUBE)
+
+KMSCUBE_LICENSE	:= BSD
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+KMSCUBE_CONF_ENV	:= \
+	$(CROSS_ENV) \
+	CPPFLAGS=-I$(KERNEL_HEADERS_INCLUDE_DIR) $(CROSS_CPPFLAGS) \
+
+
+
+	CFLAGS=-std=c11 $(CROSS_CFLAGS)
+
+#
+# autoconf
+#
+KMSCUBE_CONF_TOOL	:= autoconf
+KMSCUBE_CONF_OPT	:= $(CROSS_AUTOCONF_USR)
+
+$(STATEDIR)/kmscube.prepare:
+	@$(call targetinfo)
+	$(call world/prepare, KMSCUBE)
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+#$(STATEDIR)/kmscube.install:
+#	@$(call targetinfo)
+#	@$(call world/install, KMSCUBE)
+#	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/kmscube.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, kmscube)
+	@$(call install_fixup, kmscube, PRIORITY, optional)
+	@$(call install_fixup, kmscube, SECTION, base)
+	@$(call install_fixup, kmscube, AUTHOR, "Markus Niebel <Markus.Niebel@tq-group.com>")
+	@$(call install_fixup, kmscube, DESCRIPTION, missing)
+
+	$(call install_copy, kmscube, 0, 0, 0755, -, /usr/bin/kmscube)
+
+	@$(call install_finish, kmscube)
+
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+#$(STATEDIR)/kmscube.clean:
+#	@$(call targetinfo)
+#	@$(call clean_pkg, KMSCUBE)
+
+# vim: syntax=make
-- 
1.9.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 5/5] glmark2: add new package

[Markus Niebel]

From: Markus Niebel <Markus.Niebel@tq-group.com>

Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
---
 ...NativeStateDRM-add-imx-drm-driver-support.patch |  29 ++++
 .../series                                         |   1 +
 rules/glmark2.in                                   |  45 ++++++
 rules/glmark2.make                                 | 156 +++++++++++++++++++++
 4 files changed, 231 insertions(+)
 create mode 100644 patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/0001-NativeStateDRM-add-imx-drm-driver-support.patch
 create mode 100644 patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/series
 create mode 100644 rules/glmark2.in
 create mode 100644 rules/glmark2.make

diff --git a/patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/0001-NativeStateDRM-add-imx-drm-driver-support.patch b/patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/0001-NativeStateDRM-add-imx-drm-driver-support.patch
new file mode 100644
index 0000000..275db2b
--- /dev/null
+++ b/patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/0001-NativeStateDRM-add-imx-drm-driver-support.patch
@@ -0,0 +1,29 @@
+From e002a3f6d912591cfc33404174ce7140120b7d6c Mon Sep 17 00:00:00 2001
+From: Markus Niebel <Markus.Niebel@tq-group.com>
+Date: Tue, 7 Mar 2017 13:53:33 +0100
+Subject: [PATCH] NativeStateDRM: add imx-drm driver support
+
+originated from buildroot commit a10b15ebeb5fd82fdb0530d485095f5800103a49
+
+glmark2: add imx-drm driver support
+Upstream status: pending
+https://github.com/glmark2/glmark2/pull/29
+
+Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
+Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
+---
+ src/native-state-drm.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/native-state-drm.cpp b/src/native-state-drm.cpp
+index 4df75ec..454a24d 100644
+--- a/src/native-state-drm.cpp
++++ b/src/native-state-drm.cpp
+@@ -201,6 +201,7 @@ NativeStateDRM::init()
+     // driver (udev?).
+     static const char* drm_modules[] = {
+         "i915",
++        "imx-drm",
+         "nouveau",
+         "radeon",
+         "vmgfx",
diff --git a/patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/series b/patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/series
new file mode 100644
index 0000000..873d5a7
--- /dev/null
+++ b/patches/glmark2-7215c0f337dae0b232535549c37fca441747a891/series
@@ -0,0 +1 @@
+0001-NativeStateDRM-add-imx-drm-driver-support.patch
diff --git a/rules/glmark2.in b/rules/glmark2.in
new file mode 100644
index 0000000..d549196
--- /dev/null
+++ b/rules/glmark2.in
@@ -0,0 +1,45 @@
+## SECTION=multimedia_libs
+
+menuconfig GLMARK2
+	tristate
+	prompt "glmark2"
+	select MESALIB
+	select HOST_PYTHON
+	select LIBPNG
+	select LIBJPEG
+	help
+	  FIXME
+
+if GLMARK2
+
+config GLMARK2_FLAVOR_X11_GL
+	bool
+	prompt "x11-gl"
+	depends on MESALIB_GLX && MESALIB_OPENGL
+
+config GLMARK2_FLAVOR_X11_GLES2
+	bool
+	prompt "x11-gles2"
+	depends on MESALIB_GLX && MESALIB_GLES2
+
+config GLMARK2_FLAVOR_DRM_GL
+	bool
+	prompt "drm-gl"
+	depends on MESALIB_EGL_DRM && MESALIB_OPENGL
+
+config GLMARK2_FLAVOR_DRM_GLES2
+	bool
+	prompt "drm-gles2"
+	depends on MESALIB_EGL_DRM && MESALIB_GLES2
+
+config GLMARK2_FLAVOR_WAYLAND_GL
+	bool
+	prompt "wayland-gl"
+	depends on MESALIB_EGL_WAYLAND && MESALIB_OPENGL
+
+config GLMARK2_FLAVOR_WAYLAND_GLES2
+	bool
+	prompt "wayland-gles2"
+	depends on MESALIB_EGL_WAYLAND && MESALIB_GLES2
+
+endif
diff --git a/rules/glmark2.make b/rules/glmark2.make
new file mode 100644
index 0000000..d286708
--- /dev/null
+++ b/rules/glmark2.make
@@ -0,0 +1,156 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2017 by Markus Niebel <Markus.Niebel@tqs.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_GLMARK2) += glmark2
+
+#
+# Paths and names
+#
+GLMARK2_VERSION	:= 7215c0f337dae0b232535549c37fca441747a891
+GLMARK2_MD5	:= 7547b54da2ff7335c9316e084519adc9
+GLMARK2		:= glmark2-$(GLMARK2_VERSION)
+GLMARK2_SUFFIX	:= tar.xz
+GLMARK2_URL	:= https://github.com/glmark2/glmark2.git;tag=$(GLMARK2_VERSION)
+GLMARK2_SOURCE	:= $(SRCDIR)/$(GLMARK2).$(GLMARK2_SUFFIX)
+GLMARK2_DIR	:= $(BUILDDIR)/$(GLMARK2)
+GLMARK2_LICENSE	:= GPL-3.0, SGIv1
+GLMARK2_LICENSE_FILES := \
+	file://COPYING;md5=899fbe7e42d494c7c8c159c7001693d5 \
+	file://COPYING.SGI;md5=899fbe7e42d494c7c8c159c7001693d5
+
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+GLMARK2_CONF_ENV	:= \
+	$(CROSS_ENV)
+
+space :=
+space +=
+comma := ,
+
+GLMARK2_FLAVORS :=
+
+ifeq ($(PTXCONF_GLMARK2_FLAVOR_X11_GL),y)
+GLMARK2_FLAVORS += x11-gl
+endif
+
+ifeq ($(PTXCONF_GLMARK2_FLAVOR_X11_GLES2),y)
+GLMARK2_FLAVORS += x11-gles2
+endif
+
+ifeq ($(PTXCONF_GLMARK2_FLAVOR_DRM_GL),y)
+GLMARK2_FLAVORS += drm-gl
+endif
+
+ifeq ($(PTXCONF_GLMARK2_FLAVOR_DRM_GLES2),y)
+GLMARK2_FLAVORS += drm-glesv2
+endif
+
+ifeq ($(PTXCONF_GLMARK2_FLAVOR_WAYLAND_GL),y)
+GLMARK2_FLAVORS += wayland-gl
+endif
+
+ifeq ($(PTXCONF_GLMARK2_FLAVOR_WAYLAND_GLES2),y)
+GLMARK2_FLAVORS += wayland-glesv2
+endif
+
+GLMARK2_FLAVORS := $(strip $(GLMARK2_FLAVORS))
+GLMARK2_FLAVORS := $(subst $(space),$(comma),$(GLMARK2_FLAVORS))
+
+GLMARK2_CONF_TOOL	:= NO
+GLMARK2_CONF_OPT	:= \
+	--prefix=/usr \
+	--with-flavors=$(GLMARK2_FLAVORS)
+
+$(STATEDIR)/glmark2.prepare:
+	@$(call targetinfo)
+	cd $(GLMARK2_DIR) && \
+		$(GLMARK2_PATH) $(GLMARK2_CONF_ENV) \
+		python2 ./waf configure $(GLMARK2_CONF_OPT)
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/glmark2.compile:
+	@$(call targetinfo)
+	cd $(GLMARK2_DIR) && \
+		$(GLMARK2_PATH) $(GLMARK2_ENV) \
+		python2 ./waf build -j 1
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/glmark2.install:
+	@$(call targetinfo)
+	rm -rf "$(GLMARK2_PKGDIR)"
+	mkdir -p "$(GLMARK2_PKGDIR)"
+	cd "$(GLMARK2_DIR)" && \
+		$(GLMARK2_PATH) $(GLMARK2_ENV) \
+		python2 ./waf --destdir=$(GLMARK2_PKGDIR) install
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/glmark2.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, glmark2)
+	@$(call install_fixup, glmark2, PRIORITY, optional)
+	@$(call install_fixup, glmark2, SECTION, base)
+	@$(call install_fixup, glmark2, AUTHOR, "Markus Niebel <Markus.Niebel@tqs.de>")
+	@$(call install_fixup, glmark2, DESCRIPTION, missing)
+
+#	#
+#	# example code:; copy all libraries, links and binaries
+#	#
+
+	@for i in $(shell cd $(GLMARK2_PKGDIR) && find bin sbin usr/bin usr/sbin -type f); do \
+		$(call install_copy, glmark2, 0, 0, 0755, -, /$$i); \
+	done
+	@for i in $(shell cd $(GLMARK2_PKGDIR) && find lib usr/lib -name "*.so*"); do \
+		$(call install_copy, glmark2, 0, 0, 0644, -, /$$i); \
+	done
+	@links="$(shell cd $(GLMARK2_PKGDIR) && find lib usr/lib -type l)"; \
+	if [ -n "$$links" ]; then \
+		for i in $$links; do \
+			from="`readlink $(GLMARK2_PKGDIR)/$$i`"; \
+			to="/$$i"; \
+			$(call install_link, glmark2, $$from, $$to); \
+		done; \
+	fi
+
+#	#
+#	# FIXME: add all necessary things here
+#	#
+
+	@$(call install_finish, glmark2)
+
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+#$(STATEDIR)/glmark2.clean:
+#	@$(call targetinfo)
+#	@$(call clean_pkg, GLMARK2)
+
+# vim: syntax=make
-- 
1.9.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/5] mesalib: version bump 13.0.2 -> 17.0.1

[Marc Kleine-Budde]

[-- Attachment #1.1.1: Type: text/plain, Size: 2297 bytes --]

On 03/09/2017 11:05 AM, Markus Niebel wrote:
> From: Markus Niebel <Markus.Niebel@tq-group.com>
> 
> - add support for etnaviv
> - update config opts
> - add fallback download URL (newest mesalib seems to live there)
> 
> Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
> ---
>  rules/host-mesalib.in   |  1 +
>  rules/host-mesalib.make |  2 --
>  rules/mesalib.in        | 20 ++++++++++++++++++++
>  rules/mesalib.make      | 25 ++++++++++++++++++-------
>  4 files changed, 39 insertions(+), 9 deletions(-)
> 
> diff --git a/rules/host-mesalib.in b/rules/host-mesalib.in
> index 1bf56ae..29a6a22 100644
> --- a/rules/host-mesalib.in
> +++ b/rules/host-mesalib.in
> @@ -6,4 +6,5 @@ config HOST_MESALIB
>  	select HOST_MAKEDEPEND
>  	select HOST_SYSTEM_PYTHON
>  	select HOST_SYSTEM_PYTHON_XML2
> +	select HOST_SYSTEM_PYTHON_MAKO
>  	select HOST_LIBPTHREAD_STUBS
> diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
> index 1619d20..48702ac 100644
> --- a/rules/host-mesalib.make
> +++ b/rules/host-mesalib.make
> @@ -53,7 +53,6 @@ HOST_MESALIB_CONF_OPT	:= \
>  	--disable-opencl \
>  	--disable-opencl-icd \
>  	--disable-gallium-tests \
> -	--disable-shader-cache \
>  	--enable-shared-glapi \
>  	--disable-glx-read-only-text \
>  	--disable-driglx-direct \
> @@ -61,7 +60,6 @@ HOST_MESALIB_CONF_OPT	:= \
>  	--disable-llvm-shared-libs \
>  	--disable-gallium-llvm \
>  	--disable-libglvnd \
> -	--with-sha1= \
>  	--with-gallium-drivers= \
>  	--with-dri-drivers= \
>  	--without-vulkan-drivers
> diff --git a/rules/mesalib.in b/rules/mesalib.in
> index 430c94e..a4daf2d 100644
> --- a/rules/mesalib.in
> +++ b/rules/mesalib.in
> @@ -7,6 +7,10 @@ menuconfig MESALIB
>  	select HOST_MAKEDEPEND
>  	select HOST_SYSTEM_PYTHON
>  	select HOST_SYSTEM_PYTHON_XML2
> +<<<<<<< HEAD
> +=======
> +	select HOST_SYSTEM_PYTHON_MAKO
> +>>>>>>> 27c7b2f... mesalib: version bump 13.0.2 -> 17.0

This looks like some merge conflics left over.

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 91 bytes --]

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/5] mesalib: version bump 13.0.2 -> 17.0.1

[Markus Niebel]

Am Donnerstag, den 09.03.2017, 11:39 +0100 schrieb Marc Kleine-Budde:
> * PGP Signed by an unknown key
> 
> On 03/09/2017 11:05 AM, Markus Niebel wrote:
> > From: Markus Niebel <Markus.Niebel@tq-group.com>
> > 
> > - add support for etnaviv
> > - update config opts
> > - add fallback download URL (newest mesalib seems to live there)
> > 
> > Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
> > ---
> >  rules/host-mesalib.in   |  1 +
> >  rules/host-mesalib.make |  2 --
> >  rules/mesalib.in        | 20 ++++++++++++++++++++
> >  rules/mesalib.make      | 25 ++++++++++++++++++-------
> >  4 files changed, 39 insertions(+), 9 deletions(-)
> > 
> > diff --git a/rules/host-mesalib.in b/rules/host-mesalib.in
> > index 1bf56ae..29a6a22 100644
> > --- a/rules/host-mesalib.in
> > +++ b/rules/host-mesalib.in
> > @@ -6,4 +6,5 @@ config HOST_MESALIB
> >  	select HOST_MAKEDEPEND
> >  	select HOST_SYSTEM_PYTHON
> >  	select HOST_SYSTEM_PYTHON_XML2
> > +	select HOST_SYSTEM_PYTHON_MAKO
> >  	select HOST_LIBPTHREAD_STUBS
> > diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
> > index 1619d20..48702ac 100644
> > --- a/rules/host-mesalib.make
> > +++ b/rules/host-mesalib.make
> > @@ -53,7 +53,6 @@ HOST_MESALIB_CONF_OPT	:= \
> >  	--disable-opencl \
> >  	--disable-opencl-icd \
> >  	--disable-gallium-tests \
> > -	--disable-shader-cache \
> >  	--enable-shared-glapi \
> >  	--disable-glx-read-only-text \
> >  	--disable-driglx-direct \
> > @@ -61,7 +60,6 @@ HOST_MESALIB_CONF_OPT	:= \
> >  	--disable-llvm-shared-libs \
> >  	--disable-gallium-llvm \
> >  	--disable-libglvnd \
> > -	--with-sha1= \
> >  	--with-gallium-drivers= \
> >  	--with-dri-drivers= \
> >  	--without-vulkan-drivers
> > diff --git a/rules/mesalib.in b/rules/mesalib.in
> > index 430c94e..a4daf2d 100644
> > --- a/rules/mesalib.in
> > +++ b/rules/mesalib.in
> > @@ -7,6 +7,10 @@ menuconfig MESALIB
> >  	select HOST_MAKEDEPEND
> >  	select HOST_SYSTEM_PYTHON
> >  	select HOST_SYSTEM_PYTHON_XML2
> > +<<<<<<< HEAD
> > +=======
> > +	select HOST_SYSTEM_PYTHON_MAKO
> > +>>>>>>> 27c7b2f... mesalib: version bump 13.0.2 -> 17.0
> 
> This looks like some merge conflics left over.
> 

Indeed - I sorted out a bunch of patches. Sorry, will resend the
patches.

> Marc
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de



_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de