Skip to contentSkip to conversation

glmark2 and Mesa updates

PATCH Superseded Spenser Gilliland 4 participants 22 messages Sep 26, 2013 – Jan 8, 2014 Arm/Allwinner sunXi SoC support

lore
Share & tools
lore
#0 lore raw

v3 cover glmark2 and Mesa updates

this patch series adds glmark2 and mesa3d-demos along with supporting updates for mesa3d and libdrm. Additionally, a udev bug fix for EABIhf toolchains is included.

v2->v3:
- Updates based on reviews.

v1->v2:
- updates based on reviews.
- add mesa3d-demos

Spenser Gilliland (11):
udev: explicitly include pthreads
sunxi-mali: add explicit pthread/dl/rt dependencies
libpthread-stubs: move out of x11r7
libdrm: remove x11 dependency.
sunxi-cedarx: bump to newer version, use armel2 binaries, add demo
mesa3d: pull out from x11
mesa3d: modularize and bump to version 9.1.6
libpng12: new package
libpng: ensure libpng12 is installed before libpng
glmark2: new package
mesa3d-demos: new package

 package/Config.in                                  |    5 +
 package/glmark2/Config.in                          |   17 ++
 package/glmark2/glmark2-add-mali-support.patch     |  102 ++++++++
 package/glmark2/glmark2-fix-add-GLchar.patch       |   17 ++
 .../glmark2-gl-to-glesv2-on-drm-flavor.patch       |   25 ++
 package/glmark2/glmark2.mk                         |   70 ++++++
 package/libdrm/Config.in                           |    3 +-
 package/libdrm/libdrm.mk                           |    5 +-
 package/libpng/libpng.mk                           |    4 +
 package/libpng12/Config.in                         |    9 +
 package/libpng12/libpng12.mk                       |   18 ++
 .../Config.in                                      |    2 +-
 package/libpthread-stubs/xlib_libpthread-stubs.mk  |   17 ++
 package/mesa3d-demos/Config.in                     |    8 +
 .../mesa3d-demos/mesa3d-demos-non-mesa-impl.patch  |  244 ++++++++++++++++++++
 .../mesa3d-demos/mesa3d-demos-optional-gl.patch    |   75 ++++++
 package/mesa3d-demos/mesa3d-demos-x11-fix.patch    |   30 +++
 package/mesa3d-demos/mesa3d-demos.mk               |   63 +++++
 package/mesa3d/Config.in                           |  182 +++++++++++++++
 package/mesa3d/mesa3d-cross-glsl-compiler.patch    |   41 ++++
 package/mesa3d/mesa3d-gbm-without-dri.patch        |   30 +++
 package/mesa3d/mesa3d.mk                           |  126 ++++++++++
 package/opengl/Config.in                           |    3 +
 package/opengl/libegl/libegl.mk                    |    4 +
 package/opengl/libgl/libgl.mk                      |   20 ++
 package/opengl/libgles/libgles.mk                  |    4 +
 package/opengl/libopenvg/libopenvg.mk              |    4 +
 package/sunxi-cedarx/Config.in                     |   10 +
 package/sunxi-cedarx/sunxi-cedarx.mk               |   27 ++-
 package/sunxi-mali/egl.pc                          |    2 +-
 package/sunxi-mali/glesv2.pc                       |    2 +-
 package/udev/udev.mk                               |    2 +-
 package/x11r7/Config.in                            |    2 -
 package/x11r7/libxcb/Config.in                     |    2 +-
 package/x11r7/mesa3d/Config.in                     |   15 --
 package/x11r7/mesa3d/mesa3d-uclibc-locale.patch    |   56 -----
 package/x11r7/mesa3d/mesa3d.mk                     |   40 ----
 .../xlib_libpthread-stubs/xlib_libpthread-stubs.mk |   16 --
 .../xserver_xorg-server/xserver_xorg-server.mk     |    4 +-
 39 files changed, 1163 insertions(+), 143 deletions(-)
 create mode 100644 package/glmark2/Config.in
 create mode 100644 package/glmark2/glmark2-add-mali-support.patch
 create mode 100644 package/glmark2/glmark2-fix-add-GLchar.patch
 create mode 100644 package/glmark2/glmark2-gl-to-glesv2-on-drm-flavor.patch
 create mode 100644 package/glmark2/glmark2.mk
 create mode 100644 package/libpng12/Config.in
 create mode 100644 package/libpng12/libpng12.mk
 rename package/{x11r7/xlib_libpthread-stubs => libpthread-stubs}/Config.in (81%)
 create mode 100644 package/libpthread-stubs/xlib_libpthread-stubs.mk
 create mode 100644 package/mesa3d-demos/Config.in
 create mode 100644 package/mesa3d-demos/mesa3d-demos-non-mesa-impl.patch
 create mode 100644 package/mesa3d-demos/mesa3d-demos-optional-gl.patch
 create mode 100644 package/mesa3d-demos/mesa3d-demos-x11-fix.patch
 create mode 100644 package/mesa3d-demos/mesa3d-demos.mk
 create mode 100644 package/mesa3d/Config.in
 create mode 100644 package/mesa3d/mesa3d-cross-glsl-compiler.patch
 create mode 100644 package/mesa3d/mesa3d-gbm-without-dri.patch
 create mode 100644 package/mesa3d/mesa3d.mk
 create mode 100644 package/opengl/libgl/libgl.mk
 delete mode 100644 package/x11r7/mesa3d/Config.in
 delete mode 100644 package/x11r7/mesa3d/mesa3d-uclibc-locale.patch
 delete mode 100644 package/x11r7/mesa3d/mesa3d.mk
 delete mode 100644 package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
#1 lore raw

PATCH v3 1/11 udev: explicitly include pthreads

This fixes builds with Linaro hard float toolchains.

---
 package/udev/udev.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/udev/udev.mk +1 -1
index db86850..b512ec5 100644
@@ -12,7 +12,7 @@ UDEV_LICENSE_FILES = COPYING
 UDEV_INSTALL_STAGING = YES
 
 # mq_getattr is in librt
-UDEV_CONF_ENV += LIBS=-lrt
+UDEV_CONF_ENV += LIBS="-lrt -lpthread"
 
 UDEV_CONF_OPT =			\
 	--sbindir=/sbin		\
Signature · 1 line
1.7.1
#2 lore raw

PATCH v3 1/11 udev: explicitly include pthreads

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Spenser" == Spenser Gilliland <[email protected]> writes:

Spenser> This fixes builds with Linaro hard float toolchains.

Sorry, what toolchain exactly? I just did a test build with our default (Linaro 2013.08) ext toolchain, and didn't have any linker issues.

Spenser> Signed-off-by: Spenser Gilliland <[email protected]> Spenser> ---

 Spenser>  package/udev/udev.mk |    2 +-

Spenser> 1 files changed, 1 insertions(+), 1 deletions(-)

Spenser> diff --git a/package/udev/udev.mk b/package/udev/udev.mk Spenser> index db86850..b512ec5 100644
Spenser> --- a/package/udev/udev.mk
Spenser> +++ b/package/udev/udev.mk
Spenser> @@ -12,7 +12,7 @@ UDEV_LICENSE_FILES = COPYING Spenser> UDEV_INSTALL_STAGING = YES

Spenser> # mq_getattr is in librt
Spenser> -UDEV_CONF_ENV += LIBS=-lrt
Spenser> +UDEV_CONF_ENV += LIBS="-lrt -lpthread"

Spenser> UDEV_CONF_OPT = \
Spenser> --sbindir=/sbin \
Spenser> --
Spenser> 1.7.1

Spenser> _______________________________________________ Spenser> buildroot mailing list
Spenser> buildroot at busybox.net
Spenser> http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH v3 1/11 udev: explicitly include pthreads

Peter,

Quoted 5 lines

Spenser> This fixes builds with Linaro hard float toolchains.

Sorry, what toolchain exactly? I just did a test build with our default (Linaro 2013.08) ext toolchain, and didn't have any linker issues.

This has been occurring with the Linaro 2013.06 toolchain. I'll test with the 2013.08 toolchain. I'm not sure why the 2013.06 was chosen by default.

Thanks,
Spenser

Signature · 3 lines
Spenser Gilliland
Computer Engineer
Doctoral Candidate
#4 lore raw

PATCH v3 2/11 sunxi-mali: add explicit pthread/dl/rt dependencies

In reply to Spenser Gilliland

fixes hard float with Linaro toolchain.

---
 package/sunxi-mali/egl.pc    |    2 +-
 package/sunxi-mali/glesv2.pc |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/sunxi-mali/egl.pc +1 -1
index 56e3990..b0375dc 100644
@@ -7,6 +7,6 @@ Name: egl
 Description: ARM Mali implementation of EGL
 Version: 1.4
 Requires:
-Libs: -L${libdir} -lEGL -lGLESv2 -lUMP
+Libs: -L${libdir} -lEGL -lGLESv2 -lUMP -lrt -lpthread
 Cflags: -I{includedir}/EGL/ -I${includedir}
 
package/sunxi-mali/glesv2.pc +1 -1
index 9273678..b34bf72 100644
@@ -7,6 +7,6 @@ Name: glesv2
 Description: ARM Mali implementation of OpenGL ESv2
 Version: 2.0
 Requires:
-Libs: -L${libdir} -lGLESv2 -lGLESv1_CM -lUMP
+Libs: -L${libdir} -lGLESv2 -lGLESv1_CM -lUMP -ldl -lrt -lpthread
 Cflags: -I${includedir}/GLES2
 
Signature · 1 line
1.7.1
#5 lore raw

PATCH v3 3/11 libpthread-stubs: move out of x11r7

In reply to Spenser Gilliland
---
 package/Config.in                                  |    1 +
 package/libdrm/libdrm.mk                           |    2 +-
 .../Config.in                                      |    2 +-
 package/libpthread-stubs/xlib_libpthread-stubs.mk  |   17 +++++++++++++++++
 package/x11r7/Config.in                            |    1 -
 package/x11r7/libxcb/Config.in                     |    2 +-
 .../xlib_libpthread-stubs/xlib_libpthread-stubs.mk |   16 ----------------
 7 files changed, 21 insertions(+), 20 deletions(-)
 rename package/{x11r7/xlib_libpthread-stubs => libpthread-stubs}/Config.in (81%)
 create mode 100644 package/libpthread-stubs/xlib_libpthread-stubs.mk
 delete mode 100644 package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
package/Config.in +1 -0
index 1dd60d1..ca825f5 100644
@@ -668,6 +668,7 @@ source "package/libglib2/Config.in"
 source "package/libical/Config.in"
 source "package/libnspr/Config.in"
 source "package/libpfm4/Config.in"
+source "package/libpthread-stubs/Config.in"
 source "package/libpthsem/Config.in"
 source "package/libsigc/Config.in"
 source "package/libsigsegv/Config.in"
package/libdrm/libdrm.mk +1 -1
index 697cd2f..da3a87c 100644
@@ -12,7 +12,7 @@ LIBDRM_LICENSE = MIT
 LIBDRM_INSTALL_STAGING = YES
 
 LIBDRM_DEPENDENCIES = \
-	xlib_libpthread-stubs \
+	libpthread-stubs \
 	host-pkgconf
 
 LIBDRM_CONF_OPT = \
package/libpthread-stubs/Config.in renamed from package/x11r7/xlib_libpthread-stubs/Config.in +1 -1
similarity index 81%
rename from package/x11r7/xlib_libpthread-stubs/Config.in
rename to package/libpthread-stubs/Config.in
index fb53585..f81d851 100644
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
+config BR2_PACKAGE_LIBPTHREAD_STUBS
 	bool "libpthread-stubs"
 	help
 	  This library provides weak aliases for pthread functions not
package/libpthread-stubs/xlib_libpthread-stubs.mk new file +17 -0
new file mode 100644
index 0000000..c165183
@@ -0,0 +1,17 @@
+################################################################################
+#
+# libpthread-stubs
+#
+################################################################################
+
+LIBPTHREAD_STUBS_VERSION = 0.3
+LIBPTHREAD_STUBS_SOURCE = libpthread-stubs-$(LIBPTHREAD_STUBS_VERSION).tar.bz2
+LIBPTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/
+LIBPTHREAD_STUBS_LICENSE = MIT
+LIBPTHREAD_STUBS_LICENSE_FILES = COPYING
+
+LIBPTHREAD_STUBS_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
+
package/x11r7/Config.in +0 -1
index 205079c..16cd4b4 100644
@@ -51,7 +51,6 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xlib_libxkbfile/Config.in
 		source package/x11r7/xlib_xtrans/Config.in
 		source package/x11r7/xlib_libpciaccess/Config.in
-		source package/x11r7/xlib_libpthread-stubs/Config.in
 	endmenu
 	menu "X11R7 Applications"
 		source package/x11r7/xapp_appres/Config.in
package/x11r7/libxcb/Config.in +1 -1
index 1e1afb4..32569f7 100644
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBXCB
 	bool "libxcb"
-	select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
+	select BR2_PACKAGE_LIBPTHREAD_STUBS
 	select BR2_PACKAGE_XCB_PROTO
 	select BR2_PACKAGE_XLIB_LIBXDMCP
 	select BR2_PACKAGE_XLIB_LIBXAU
package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk deleted +0 -16
deleted file mode 100644
index 5ea02e9..0000000
@@ -1,16 +0,0 @@
-################################################################################
-#
-# xlib_libpthread-stubs
-#
-################################################################################
-
-XLIB_LIBPTHREAD_STUBS_VERSION = 0.3
-XLIB_LIBPTHREAD_STUBS_SOURCE = libpthread-stubs-$(XLIB_LIBPTHREAD_STUBS_VERSION).tar.bz2
-XLIB_LIBPTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/
-XLIB_LIBPTHREAD_STUBS_LICENSE = MIT
-XLIB_LIBPTHREAD_STUBS_LICENSE_FILES = COPYING
-
-XLIB_LIBPTHREAD_STUBS_INSTALL_STAGING = YES
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
Signature · 1 line
1.7.1
#6 lore raw

PATCH v3 3/11 libpthread-stubs: move out of x11r7

Dear Spenser Gilliland,

package/libpthread-stubs/Config.in line 1

Quoted 5 lines · Spenser Gilliland
package/libpthread-stubs/Config.in renamed from package/x11r7/xlib_libpthread-stubs/Config.in +1 -1
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
+config BR2_PACKAGE_LIBPTHREAD_STUBS

This renaming of option should lead to additions to the Config.in.legacy file.

I think the move makes sense since libpthread-stubs is not part of the X.org releases (see http://www.x.org/releases/X11R7.7/src/everything/).

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#7 lore raw

PATCH v3 3/11 libpthread-stubs: move out of x11r7

Quoted 4 lines · Thomas Petazzoni

Dear Spenser Gilliland,

On Thu, 26 Sep 2013 18:21:46 -0500, Spenser Gilliland wrote:

Quoted 8 lines

package/libpthread-stubs/Config.in line 1

Quoted 5 lines
package/libpthread-stubs/Config.in renamed from package/x11r7/xlib_libpthread-stubs/Config.in +1 -1
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
+config BR2_PACKAGE_LIBPTHREAD_STUBS

This renaming of option should lead to additions to the Config.in.legacy file.

Will fix.

Quoted 10 lines

I think the move makes sense since libpthread-stubs is not part of the X.org releases (see http://www.x.org/releases/X11R7.7/src/everything/).

Best regards,

Thomas
--
Thomas Petazzoni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Regards,
Spenser

Signature · 3 lines
Spenser Gilliland
Computer Engineer
Doctoral Candidate
#9 lore raw

PATCH v3 4/11 libdrm: remove x11 dependency.

In reply to Spenser Gilliland
---
 package/libdrm/Config.in |    3 +--
 package/libdrm/libdrm.mk |    3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)
package/libdrm/Config.in +1 -2
index 533e985..d67a6c2 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LIBDRM
 	bool "libdrm"
-	select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
-	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_LIBPTHREAD_STUBS
 	depends on BR2_LARGEFILE
 	help
 	  Direct Rendering Manager
package/libdrm/libdrm.mk +3 -0
index da3a87c..f9438cd 100644
@@ -19,6 +19,9 @@ LIBDRM_CONF_OPT = \
 	--disable-cairo-tests \
 	--disable-manpages
 
+LIBDRM_CONF_ENV = \
+	LIBS="-lrt -lpthread"
+
 ifeq ($(BR2_PACKAGE_LIBDRM_INTEL),y)
 LIBDRM_CONF_OPT += --enable-intel
 LIBDRM_DEPENDENCIES += libatomic_ops xlib_libpciaccess
Signature · 1 line
1.7.1
#10 lore raw

PATCH v3 4/11 libdrm: remove x11 dependency.

Dear Spenser Gilliland,

Quoted 25 lines · Spenser Gilliland
---
 package/libdrm/Config.in |    3 +--
 package/libdrm/libdrm.mk |    3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)
package/libdrm/Config.in +1 -2
index 533e985..d67a6c2 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LIBDRM
 	bool "libdrm"
-	select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
-	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_LIBPTHREAD_STUBS
 	depends on BR2_LARGEFILE
 	help
 	  Direct Rendering Manager
package/libdrm/libdrm.mk +0 -0
index da3a87c..f9438cd 100644

package/libdrm/libdrm.mk LIBDRM_CONF_OPT = \ · line 23

Quoted 5 lines
package/libdrm/libdrm.mk +2 -0
@@ -19,6 +19,9 @@ LIBDRM_CONF_OPT = \
 	--disable-cairo-tests \
 	--disable-manpages
 
+LIBDRM_CONF_ENV = \
+	LIBS="-lrt -lpthread"

This hunk has nothing to do with the commit title. I am also not really happy with those libraries being explicitly listed. I do remember the problem that you had, and that we did not understand it completely, but it doesn't seem right to do this.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#11 lore raw

PATCH v3 4/11 libdrm: remove x11 dependency.

Quoted 31 lines · Thomas Petazzoni

Dear Spenser Gilliland,

Quoted 28 lines · Spenser Gilliland
---
 package/libdrm/Config.in |    3 +--
 package/libdrm/libdrm.mk |    3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)
package/libdrm/Config.in +1 -2
index 533e985..d67a6c2 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LIBDRM
      bool "libdrm"
-     select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
-     depends on BR2_PACKAGE_XORG7
+     select BR2_PACKAGE_LIBPTHREAD_STUBS
      depends on BR2_LARGEFILE
      help
        Direct Rendering Manager
package/libdrm/libdrm.mk +0 -0
index da3a87c..f9438cd 100644
@@ -19,6 +19,9 @@ LIBDRM_CONF_OPT = \
      --disable-cairo-tests \
      --disable-manpages
 
Quoted 7 lines

package/libdrm/libdrm.mk LIBDRM_CONF_OPT = \ · line 23

Quoted 2 lines
package/libdrm/libdrm.mk +2 -0
+LIBDRM_CONF_ENV = \
+     LIBS="-lrt -lpthread"

This hunk has nothing to do with the commit title. I am also not really happy with those libraries being explicitly listed. I do remember the problem that you had, and that we did not understand it completely, but it doesn't seem right to do this.

Yes, sorry. This was something I added in my code to get it to build reliably with the Linaro toolchain. While it's not the prettiest solution, I haven't found another way to make this work.

Regards,
Spenser

Signature · 3 lines
Spenser Gilliland
Computer Engineer
Doctoral Candidate
#13 lore raw

PATCH v3 5/11 sunxi-cedarx: bump to newer version, use armel2 binaries, add demo

In reply to Spenser Gilliland
---
 package/sunxi-cedarx/Config.in       |   10 ++++++++++
 package/sunxi-cedarx/sunxi-cedarx.mk |   27 +++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 4 deletions(-)
package/sunxi-cedarx/Config.in +10 -0
index b280db0..aa520b5 100644
@@ -10,5 +10,15 @@ config BR2_PACKAGE_SUNXI_CEDARX
 	  http://github.com/linux-sunxi/cedarx-libs
 	  http://linux-sunxi.org/CedarX
 
+if BR2_PACKAGE_SUNXI_CEDARX
+
+config BR2_PACKAGE_SUNXI_CEDARX_DEMO
+	bool "install enc_dec_test demo"
+	help
+	  Install a test program which verifies the functionality of the CedarX
+	  libraries
+
+endif
+
 comment "sunxi-cedarx requires an eglibc/glibc based toolchain"
 	depends on !BR2_TOOLCHAIN_USES_GLIBC && BR2_arm
package/sunxi-cedarx/sunxi-cedarx.mk +23 -4
index 07c85d4..5e68d7d 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SUNXI_CEDARX_VERSION = 74923e55fc
+SUNXI_CEDARX_VERSION = 74c3e9052
 SUNXI_CEDARX_SITE = http://github.com/linux-sunxi/cedarx-libs/tarball/$(SUNXI_CEDARX_VERSION)
 
 SUNXI_CEDARX_INSTALL_STAGING = YES
@@ -14,7 +14,12 @@ SUNXI_CEDARX_CONFIGURE_OPTS = \
 
 ifeq ($(BR2_ARM_EABIHF),y)
 SUNXI_CEDARX_BIN_DIR = $(@D)/libcedarv/linux-armhf
-# libavheap.so is only available on EABIHF
+SUNXI_CEDARX_SAMPLE_LOC = $(SUNXI_CEDARX_BIN_DIR)/sample/ve
+else
+SUNXI_CEDARX_BIN_DIR = $(@D)/libcedarv/linux-armel2
+SUNXI_CEDARX_SAMPLE_LOC = $(SUNXI_CEDARX_BIN_DIR)/sample/output/ve
+endif
+
 define SUNXI_CEDARX_BUILD_AVHEAP
 	$(TARGET_CC) $(TARGET_CFLAGS) \
 		-c $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/avheap.c \
@@ -25,18 +30,31 @@ define SUNXI_CEDARX_BUILD_AVHEAP
 		-o $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/libavheap.so \
 		$(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/avheap.o
 endef
+
 define SUNXI_CEDARX_INSTALL_AVHEAP
 	$(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/libavheap.so \
 		$(1)/usr/lib/libavheap.so
 endef
-else
-SUNXI_CEDARX_BIN_DIR = $(@D)/libcedarv/linux-armel
+
+ifeq ($(BR2_PACKAGE_SUNXI_CEDARX_DEMO),y)
+
+define SUNXI_CEDARX_BUILD_DEMO
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \
+		-C $(SUNXI_CEDARX_BIN_DIR)/sample $(SUNXI_CEDARX_CONFIGURE_OPTS)
+endef
+
+define SUNXI_CEDARX_INSTALL_DEMO
+	$(INSTALL) -D -m 755 $(SUNXI_CEDARX_SAMPLE_LOC) \
+		$(TARGET_DIR)/usr/bin/ve
+endef
+
 endif
 
 define SUNXI_CEDARX_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(SUNXI_CEDARX_BIN_DIR) \
 		$(SUNXI_CEDARX_CONFIGURE_OPTS)
 	$(SUNXI_CEDARX_BUILD_AVHEAP)
+	$(SUNXI_CEDARX_BUILD_DEMO)
 endef
 
 define SUNXI_CEDARX_INSTALL_STAGING_CMDS
@@ -54,6 +72,7 @@ define SUNXI_CEDARX_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/libvecore/libvecore.so \
 		$(TARGET_DIR)/usr/lib/libvecore.so
 	$(call SUNXI_CEDARX_INSTALL_AVHEAP, $(TARGET_DIR))
+	$(SUNXI_CEDARX_INSTALL_DEMO)
 endef
 
 $(eval $(generic-package))
Signature · 1 line
1.7.1
#14 lore raw

PATCH v3 6/11 mesa3d: pull out from x11

In reply to Spenser Gilliland
---
 package/Config.in                                  |    1 +
 package/{x11r7 => }/mesa3d/Config.in               |    0
 .../{x11r7 => }/mesa3d/mesa3d-uclibc-locale.patch  |    0
 package/{x11r7 => }/mesa3d/mesa3d.mk               |    0
 package/x11r7/Config.in                            |    1 -
 5 files changed, 1 insertions(+), 1 deletions(-)
 rename package/{x11r7 => }/mesa3d/Config.in (100%)
 rename package/{x11r7 => }/mesa3d/mesa3d-uclibc-locale.patch (100%)
 rename package/{x11r7 => }/mesa3d/mesa3d.mk (100%)
package/Config.in +1 -0
index ca825f5..408bc24 100644
@@ -301,6 +301,7 @@ source "package/lvm2/Config.in"
 source "package/mdadm/Config.in"
 source "package/media-ctl/Config.in"
 source "package/memtester/Config.in"
+source "package/mesa3d/Config.in"
 source "package/minicom/Config.in"
 source "package/nanocom/Config.in"
 source "package/neard/Config.in"
package/mesa3d/Config.in renamed from package/x11r7/mesa3d/Config.in +0 -0
similarity index 100%
rename from package/x11r7/mesa3d/Config.in
rename to package/mesa3d/Config.in
package/mesa3d/mesa3d-uclibc-locale.patch renamed from package/x11r7/mesa3d/mesa3d-uclibc-locale.patch +0 -0
similarity index 100%
rename from package/x11r7/mesa3d/mesa3d-uclibc-locale.patch
rename to package/mesa3d/mesa3d-uclibc-locale.patch
package/mesa3d/mesa3d.mk renamed from package/x11r7/mesa3d/mesa3d.mk +0 -0
similarity index 100%
rename from package/x11r7/mesa3d/mesa3d.mk
rename to package/mesa3d/mesa3d.mk
package/x11r7/Config.in +0 -1
index 16cd4b4..53c1893 100644
@@ -13,7 +13,6 @@ if BR2_PACKAGE_XORG7
 	endmenu
 	menu "X11R7 Libraries"
 		source package/x11r7/libxcb/Config.in
-		source package/x11r7/mesa3d/Config.in
 		source package/x11r7/xcb-util/Config.in
 		source package/x11r7/xcb-util-image/Config.in
 		source package/x11r7/xcb-util-keysyms/Config.in
Signature · 1 line
1.7.1
#15 lore raw

PATCH v3 7/11 mesa3d: modularize and bump to version 9.1.6

In reply to Spenser Gilliland
---
 package/mesa3d/Config.in                           |  179 +++++++++++++++++++-
 package/mesa3d/mesa3d-cross-glsl-compiler.patch    |   41 +++++
 package/mesa3d/mesa3d-gbm-without-dri.patch        |   30 ++++
 package/mesa3d/mesa3d-uclibc-locale.patch          |   56 ------
 package/mesa3d/mesa3d.mk                           |  120 +++++++++++--
 package/opengl/Config.in                           |    3 +
 package/opengl/libegl/libegl.mk                    |    4 +
 package/opengl/libgl/libgl.mk                      |   20 +++
 package/opengl/libgles/libgles.mk                  |    4 +
 package/opengl/libopenvg/libopenvg.mk              |    4 +
 .../xserver_xorg-server/xserver_xorg-server.mk     |    4 +-
 11 files changed, 384 insertions(+), 81 deletions(-)
 create mode 100644 package/mesa3d/mesa3d-cross-glsl-compiler.patch
 create mode 100644 package/mesa3d/mesa3d-gbm-without-dri.patch
 delete mode 100644 package/mesa3d/mesa3d-uclibc-locale.patch
 create mode 100644 package/opengl/libgl/libgl.mk
package/mesa3d/Config.in +173 -6
index 080f56a..a9770f3 100644
@@ -1,15 +1,182 @@
 config BR2_PACKAGE_MESA3D
 	bool "Mesa 3D Graphics Library"
-	select BR2_PACKAGE_XPROTO_GLPROTO
-	select BR2_PACKAGE_XLIB_LIBXXF86VM
-	select BR2_PACKAGE_XLIB_LIBXDAMAGE
-	select BR2_PACKAGE_XLIB_LIBXFIXES
-	select BR2_PACKAGE_XPROTO_DRI2PROTO
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_HOST_LIBXML2_PYTHON
-	depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
+	select BR2_PACKAGE_XPROTO_DRI2_PROTO if BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XSERVER_XORG_SERVER
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_LARGEFILE
 	help
 	  Mesa 3D, an open-source implementation of the OpenGL specification.
 
+	  http://mesa3d.org
+
+if BR2_PACKAGE_MESA3D
+
+menu "libraries"
+
+config BR2_PACKAGE_MESA3D_GBM
+	depends on BR2_PACKAGE_UDEV
+	bool "gbm support"
+	help
+	  Add support for Graphics Buffer Manager.
+
+config BR2_PACKAGE_MESA3D_XVMC
+	bool "xvmc support"
+	help
+	  Add support for X Video Motion Compensation.
+
+config BR2_PACKAGE_MESA3D_VDPAU
+	bool "vdpau support"
+	help
+	  Add support for Video Decode and Presentation API for Unix.
+
+endmenu
+
+menu "Drivers"
+
+config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915
+	bool "Gallium i915 driver"
+	depends on BR2_i386 || BR2_x86_64
+	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
+	select BR2_PACKAGE_LIBDRM_INTEL
+	help
+	  Supports intel chips with Gallium. In most cases, the DRI i965 driver
+	  should be used as it is better maintained by Intel.
+
+config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU
+	bool "Gallium nouveau driver"
+	depends on BR2_i386 || BR2_x86_64
+	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
+	select BR2_PACKAGE_LIBDRM_NOUVEAU
+	help
+	  Supports all Nvidia GPUs.
+
+config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300
+	bool "Gallium r300 driver"
+	depends on BR2_i386 || BR2_x86_64
+	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
+	select BR2_PACKAGE_LIBDRM_RADEON
+	help
+	  Supports the R300, R400, and R500 series of ATI/AMD GPUs.
+
+config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600
+	bool "Gallium r600 driver"
+	depends on BR2_i386 || BR2_x86_64
+	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
+	select BR2_PACKAGE_LIBDRM_RADEON
+	help
+	  Supports the R600, R700, and R800 series of ATI/AMD GPUs.
+
+config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI
+	bool "Gallium radeonsi driver"
+	depends on BR2_i386 || BR2_x86_64
+	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
+	select BR2_PACKAGE_LIBDRM_RADEON
+	help
+	  Supports the Radeon HD7000/HD8000/HD9000 series of ATI/AMD GPUs.
+
+config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA
+	bool "Gallium vmware svga driver"
+	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
+	select BR2_PACKAGE_LIBDRM_VMWGFX
+	help
+	  This is a virtual GPU driver for VMWare virtual machines.
+
+config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
+	bool "Gallium swrast driver"
+	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
+	help
+	  This is a software opengl implementation using the Gallium3D
+	  infrastructure.
+
+config BR2_PACKAGE_MESA3D_DRI_DRIVERS_SWRAST
+	bool "DRI swrast driver"
+	select BR2_PACKAGE_MESA3D_DRI_DRIVER
+	help
+	  This is a software opengl implementation using the DRI infrastructure.
+
+config BR2_PACKAGE_MESA3D_DRI_DRIVERS_I965
+	bool "DRI i965 driver"
+	depends on BR2_i386 || BR2_x86_64
+	select BR2_PACKAGE_MESA3D_DRI_DRIVER
+	select BR2_PACKAGE_LIBDRM_INTEL
+	help
+	  Supports all Intel GPUs.  This version is most supported by Intel.
+
+config BR2_PACKAGE_MESA3D_DRI_DRIVERS_RADEON
+	bool "DRI radeon driver"
+	depends on BR2_i386 || BR2_x86_64
+	select BR2_PACKAGE_MESA3D_DRI_DRIVER
+	select BR2_PACKAGE_LIBDRM_RADEON
+	help
+	  Legacy Radeon driver for R100 series GPUs.
+
+endmenu
+
+# The following hidden options inform gallium or dri driver selection.
+config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
+	select BR2_PACKAGE_MESA3D_DRIVER
+	bool
+
+config BR2_PACKAGE_MESA3D_DRI_DRIVER
+	select BR2_PACKAGE_MESA3D_DRIVER
+	bool
+
+config BR2_PACKAGE_MESA3D_DRIVER
+	bool
+
+menu "API Support"
+depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER || BR2_PACKAGE_MESA3D_DRI_DRIVER
+
+config BR2_PACKAGE_MESA3D_OPENGL
+	bool "OpenGL"
+	select BR2_PACKAGE_HAS_OPENGL
+	help
+	  Use the Khronos OpenGL API.  This is a desktop computer API and is not
+	  normally implemented by embedded systems.
+
+config BR2_PACKAGE_MESA3D_EGL
+	bool "EGL"
+	select BR2_PACKAGE_MESA3D_GBM
+	select BR2_PACKAGE_HAS_OPENGL_EGL
+	help
+	  Use the Khronos EGL APIs. EGL is a window manager for OpenGL applications
+	  similar to GLX, for X, and WGL, for Windows.
+
+ config BR2_PACKAGE_MESA3D_OPENGL_ES
+	bool "OpenGL ES"
+	select BR2_PACKAGE_HAS_OPENGL_ES
+	help
+	  Use the Khronos OpenGL ES APIs.  This is commonly used on embedded
+	  systems and represents a subset of the OpenGL API.
+
+config BR2_PACKAGE_MESA3D_OPENVG
+	bool "OpenVG"
+	depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
+	select BR2_PACKAGE_HAS_OPENVG
+	select BR2_PACKAGE_MESA3D_OPENGL_EGL
+	help
+	  Use the Khronos OpenVG APIs. This is a 2D API commonly used on
+	  embedded systems.
+
+config BR2_PACKAGE_MESA3D_OPENCL
+	bool "OpenCL"
+	depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
+	select BR2_PACKAGE_HAS_OPENCL
+	help
+	  Use the Khronos OpenCL APIs. This is a GPU computation language
+	  commonly used in GPGPU computing applications.
+
+endmenu
+
+endif
+
+comment "mesa3d depends on a toolchain with C++ and largefile support"
+	depends on !BR2_LARGEFILE || !BR2_INSTALL_LIBSTDCPP
package/mesa3d/mesa3d-cross-glsl-compiler.patch new file +41 -0

41 lines not on this page · raw message

package/mesa3d/mesa3d-gbm-without-dri.patch new file +30 -0
new file mode 100644
index 0000000..2c417f4
@@ -0,0 +1,30 @@
+Fix build issue when gbm backend is built without dri support.
+
+Signed-off-by: Spenser Gilliland <[email protected]>
+
+---
+Index: mesa3d-9.1.6/src/gbm/main/backend.c
+===================================================================
+--- mesa3d-9.1.6.orig/src/gbm/main/backend.c	2012-11-24 11:57:41.000000000 -0600
++++ mesa3d-9.1.6/src/gbm/main/backend.c	2013-08-16 10:59:58.844753588 -0500
+@@ -36,7 +36,9 @@
+ 
+ #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
+ 
++#ifdef HAVE_DRI
+ extern const struct gbm_backend gbm_dri_backend;
++#endif
+ 
+ struct backend_desc {
+    const char *name;
+@@ -44,7 +46,9 @@
+ };
+ 
+ static const struct backend_desc backends[] = {
+-   { "gbm_dri.so", &gbm_dri_backend },
++#ifdef HAVE_DRI
++	{ "gbm_dri.so", &gbm_dri_backend },
++#endif
+    { "gbm_gallium_drm.so", NULL },
+ };
+ 
package/mesa3d/mesa3d-uclibc-locale.patch deleted +0 -56

56 lines not on this page · raw message

package/mesa3d/mesa3d.mk +103 -17

138 lines not on this page · raw message

package/opengl/Config.in +3 -0
index 1636807..c705446 100644
@@ -1,3 +1,6 @@
+config BR2_PACKAGE_HAS_OPENGL
+	bool
+
 config BR2_PACKAGE_HAS_OPENGL_EGL
 	bool
 
package/opengl/libegl/libegl.mk +4 -0
index c194b02..2d52fe3 100644
@@ -22,6 +22,10 @@ ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q),y)
 LIBEGL_DEPENDENCIES += gpu-viv-bin-mx6q
 endif
 
+ifeq ($(BR2_PACKAGE_MESA3D_EGL),y)
+LIBEGL_DEPENDENCIES += mesa3d
+endif
+
 ifeq ($(LIBEGL_DEPENDENCIES),)
 define LIBEGL_CONFIGURE_CMDS
 	echo "No libEGL implementation selected. Configuration error."
package/opengl/libgl/libgl.mk new file +20 -0
new file mode 100644
index 0000000..4b0d7f2
@@ -0,0 +1,20 @@
+################################################################################
+#
+# libgl
+#
+################################################################################
+
+LIBGL_SOURCE =
+
+ifeq ($(BR2_PACKAGE_MESA_OPENGL),y)
+LIBGL_DEPENDENCIES += mesa3d
+endif
+
+ifeq ($(LIBGL_DEPENDENCIES),)
+define LIBOPENGL_CONFIGURE_CMDS
+	echo "No libOpenGL implementation selected. Configuration error."
+	exit 1
+endef
+endif
+
+$(eval $(generic-package))
package/opengl/libgles/libgles.mk +4 -0
index ec157ac..8e5cef1 100644
@@ -22,6 +22,10 @@ ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q),y)
 LIBGLES_DEPENDENCIES += gpu-viv-bin-mx6q
 endif
 
+ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_ES),y)
+LIBGLES_DEPENDENCIES += mesa3d
+endif
+
 ifeq ($(LIBGLES_DEPENDENCIES),)
 define LIBGLES_CONFIGURE_CMDS
 	echo "No libGLES implementation selected. Configuration error."
package/opengl/libopenvg/libopenvg.mk +4 -0
index 3296f63..e897423 100644
@@ -10,6 +10,10 @@ ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
 LIBOPENVG_DEPENDENCIES += rpi-userland
 endif
 
+ifeq ($(BR2_PACKAGE_MESA3D_OPENVG),y)
+LIBOPENVG_DEPENDENCIES += mesa3d
+endif
+
 ifeq ($(LIBOPENVG_DEPENDENCIES),)
 define LIBOPENVG_CONFIGURE_CMDS
 	echo "No libOpenVG implementation selected. Configuration error."
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +2 -2
index 4089aab..f5a4db6 100644
@@ -99,7 +99,7 @@ else # modular
 XSERVER_XORG_SERVER_CONF_OPT += --disable-kdrive --disable-xfbdev
 endif
 
-ifeq ($(BR2_PACKAGE_MESA3D),y)
+ifeq ($(BR2_PACKAGE_MESA3D_DRIVER),y)
 XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d xproto_xf86driproto
 else
 XSERVER_XORG_SERVER_CONF_OPT += --disable-dri
@@ -172,7 +172,7 @@ ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y)
 XSERVER_XORG_SERVER_CONF_OPT += --disable-dmx
 endif
 
-ifeq ($(BR2_PACKAGE_MESA3D),y)
+ifeq ($(BR2_PACKAGE_MESA3D_DRIVER),y)
 XSERVER_XORG_SERVER_CONF_OPT += --enable-glx
 else
 XSERVER_XORG_SERVER_CONF_OPT += --disable-glx
Signature · 1 line
1.7.1
#16 lore raw

PATCH v3 8/11 libpng12: new package

In reply to Spenser Gilliland
---
 package/Config.in            |    1 +
 package/libpng12/Config.in   |    9 +++++++++
 package/libpng12/libpng12.mk |   18 ++++++++++++++++++
 3 files changed, 28 insertions(+), 0 deletions(-)
 create mode 100644 package/libpng12/Config.in
 create mode 100644 package/libpng12/libpng12.mk
package/Config.in +1 -0
index 408bc24..075bdc6 100644
@@ -509,6 +509,7 @@ source "package/libglade/Config.in"
 source "package/gdk-pixbuf/Config.in"
 source "package/libgtk2/Config.in"
 source "package/libpng/Config.in"
+source "package/libpng12/Config.in"
 source "package/libqrencode/Config.in"
 source "package/libraw/Config.in"
 source "package/librsvg/Config.in"
package/libpng12/Config.in new file +9 -0
new file mode 100644
index 0000000..8e36483
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBPNG12
+	bool "libpng12"
+	select BR2_PACKAGE_ZLIB
+	help
+	  Library for handling PNG (Portable Network Graphics)
+	  images. This installs the 1.2.x series.  Different versions of
+	  libpng have different APIs.
+
+	  http://www.libpng.org/
package/libpng12/libpng12.mk new file +18 -0
new file mode 100644
index 0000000..39094f2
@@ -0,0 +1,18 @@
+################################################################################
+#
+# libpng12
+#
+################################################################################
+
+LIBPNG12_VERSION = 1.2.50
+LIBPNG12_SERIES = 12
+LIBPNG12_SOURCE = libpng-$(LIBPNG12_VERSION).tar.bz2
+LIBPNG12_SITE = http://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG12_SERIES)/$(LIBPNG12_VERSION)
+LIBPNG12_LICENSE = libpng license
+LIBPNG12_LICENSE_FILES = LICENSE
+LIBPNG12_INSTALL_STAGING = YES
+LIBPNG12_DEPENDENCIES = host-pkgconf zlib
+LIBPNG12_CONFIG_SCRIPTS = libpng$(LIBPNG12_SERIES)-config libpng-config
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
Signature · 1 line
1.7.1
#17 lore raw

PATCH v3 9/11 libpng: ensure libpng12 is installed before libpng

In reply to Spenser Gilliland

This ensures that libpng (which is a newer version) is used when a specific version of libpng (i.e. libpng12) is not selected.

---
 package/libpng/libpng.mk |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
package/libpng/libpng.mk +4 -0
index f5bf956..033587e 100644
@@ -14,5 +14,9 @@ LIBPNG_INSTALL_STAGING = YES
 LIBPNG_DEPENDENCIES = host-pkgconf zlib
 LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config
 
+# Ensure this libpng is the last installed in the case of multiple libpng
+# installs.
+LIBPNG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBPNG12),libpng12)
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
Signature · 1 line
1.7.1
#18 lore raw

PATCH v3 10/11 glmark2: new package

In reply to Spenser Gilliland
---
 package/Config.in                                  |    1 +
 package/glmark2/Config.in                          |   17 ++++
 package/glmark2/glmark2-add-mali-support.patch     |  102 ++++++++++++++++++++
 package/glmark2/glmark2-fix-add-GLchar.patch       |   17 ++++
 .../glmark2-gl-to-glesv2-on-drm-flavor.patch       |   25 +++++
 package/glmark2/glmark2.mk                         |   70 +++++++++++++
 6 files changed, 232 insertions(+), 0 deletions(-)
 create mode 100644 package/glmark2/Config.in
 create mode 100644 package/glmark2/glmark2-add-mali-support.patch
 create mode 100644 package/glmark2/glmark2-fix-add-GLchar.patch
 create mode 100644 package/glmark2/glmark2-gl-to-glesv2-on-drm-flavor.patch
 create mode 100644 package/glmark2/glmark2.mk
package/Config.in +1 -0
index 075bdc6..cf79ea0 100644
@@ -48,6 +48,7 @@ source "package/dmalloc/Config.in"
 source "package/dropwatch/Config.in"
 source "package/duma/Config.in"
 source "package/gdb/Config.in"
+source "package/glmark2/Config.in"
 source "package/iozone/Config.in"
 source "package/kexec/Config.in"
 source "package/latencytop/Config.in"
package/glmark2/Config.in new file +17 -0
new file mode 100644
index 0000000..7349690
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_GLMARK2
+	bool "glmark2"
+	depends on BR2_PACKAGE_MESA3D
+	depends on BR2_PACKAGE_MESA3D_GBM # depends on udev cannot select
+	depends on BR2_LARGEFILE
+	depends on BR2_PACKAGE_HAS_OPENGL || \
+		(BR2_PACKAGE_HAS_OPENGL_EGL && BR2_PACKAGE_HAS_OPENGL_ES)
+	select BR2_PACKAGE_JPEG
+	select BR2_PACKAGE_LIBPNG12
+	help
+	  glmark2 is a benchmark for OpenGL (ES) 2.0. It uses only the subset of the
+	  OpenGL 2.0 API that is compatible with OpenGL ES 2.0.
+
+comment "glmark2 requires Mesa3D GBM support and largefile support in toolchain"
+	depends on (BR2_PACKAGE_HAS_OPENGL || \
+		(BR2_PACKAGE_HAS_OPENGL_EGL && BR2_PACKAGE_HAS_OPENGL_ES)) && \
+		(!BR2_LARGEFILE || !BR2_PACKAGE_MESA3D_GBM)
package/glmark2/glmark2-add-mali-support.patch new file +102 -0

102 lines not on this page · raw message

package/glmark2/glmark2-fix-add-GLchar.patch new file +17 -0
new file mode 100644
index 0000000..15653de
@@ -0,0 +1,17 @@
+Bug fix in program.cc.  There is no such type as GLchar.
+
+Signed-off-by: Spenser Gilliland <[email protected]>
+---
+Index: glmark2-2012.12/src/libmatrix/program.cc
+===================================================================
+--- glmark2-2012.12.orig/src/libmatrix/program.cc	2012-12-18 13:45:45.000000000 -0600
++++ glmark2-2012.12/src/libmatrix/program.cc	2013-08-13 20:08:27.005724911 -0500
+@@ -17,6 +17,8 @@
+ #include "gl-if.h"
+ #include "program.h"
+ 
++typedef char GLchar;
++
+ using std::string;
+ using LibMatrix::mat4;
+ using LibMatrix::mat3;
package/glmark2/glmark2-gl-to-glesv2-on-drm-flavor.patch new file +25 -0
new file mode 100644
index 0000000..5f838cc
@@ -0,0 +1,25 @@
+Bug in build script requires full opengl when only opengl es is actually
+required.
+
+Signed-off-by: Spenser Gilliland <[email protected]>
+---
+Index: glmark2-279/src/wscript_build
+===================================================================
+--- glmark2-279.orig/src/wscript_build	2013-08-19 17:36:32.000000000 -0500
++++ glmark2-279/src/wscript_build	2013-08-20 10:31:39.364629078 -0500
+@@ -23,11 +23,12 @@
+   'x11-gl' : ['x11', 'gl', 'matrix-gl'],
+   'x11-glesv2' : ['x11', 'egl', 'glesv2', 'matrix-glesv2'],
+   'drm-gl' : ['drm', 'gbm', 'egl', 'gl', 'matrix-gl'],
+-  'drm-glesv2' : ['drm', 'gbm', 'egl', 'glesv2', 'matrix-gl'],
++  'drm-glesv2' : ['drm', 'gbm', 'egl', 'glesv2', 'matrix-glesv2'],
+   'mir-gl' : ['mirclient', 'egl', 'gl', 'matrix-gl'],
+-  'mir-glesv2' : ['mirclient', 'egl', 'glesv2', 'matrix-gl'],
++  'mir-glesv2' : ['mirclient', 'egl', 'glesv2', 'matrix-glesv2'],
+   'wayland-gl' : ['wayland-client', 'wayland-egl', 'egl', 'gl', 'matrix-gl'],
+-  'wayland-glesv2' : ['wayland-client', 'wayland-egl', 'egl', 'glesv2', 'matrix-gl'],
++  'wayland-glesv2' : ['wayland-client', 'wayland-egl', 'egl', 'glesv2',
++  'matrix-glesv2'],
+   'fbdev-glesv2' : ['egl', 'glesv2', 'matrix-glesv2']
+ }
+ flavor_defines = {
package/glmark2/glmark2.mk new file +70 -0

70 lines not on this page · raw message

Signature · 1 line
1.7.1
#19 lore raw

PATCH v3 11/11 mesa3d-demos: new package

In reply to Spenser Gilliland
---
 package/Config.in                                  |    1 +
 package/mesa3d-demos/Config.in                     |    8 +
 .../mesa3d-demos/mesa3d-demos-non-mesa-impl.patch  |  244 ++++++++++++++++++++
 .../mesa3d-demos/mesa3d-demos-optional-gl.patch    |   75 ++++++
 package/mesa3d-demos/mesa3d-demos-x11-fix.patch    |   30 +++
 package/mesa3d-demos/mesa3d-demos.mk               |   63 +++++
 6 files changed, 421 insertions(+), 0 deletions(-)
 create mode 100644 package/mesa3d-demos/Config.in
 create mode 100644 package/mesa3d-demos/mesa3d-demos-non-mesa-impl.patch
 create mode 100644 package/mesa3d-demos/mesa3d-demos-optional-gl.patch
 create mode 100644 package/mesa3d-demos/mesa3d-demos-x11-fix.patch
 create mode 100644 package/mesa3d-demos/mesa3d-demos.mk
package/Config.in +1 -0
index cf79ea0..e14265b 100644
@@ -140,6 +140,7 @@ endmenu
 menu "Graphic libraries and applications (graphic/text)"
 
 comment "Graphic applications"
+source "package/mesa3d-demos/Config.in"
 source "package/gnuplot/Config.in"
 source "package/jhead/Config.in"
 source "package/rrdtool/Config.in"
package/mesa3d-demos/Config.in new file +8 -0
new file mode 100644
index 0000000..24c29e0
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_MESA3D_DEMOS
+	bool "mesa3d-demos"
+	depends on BR2_PACKAGE_HAS_OPENGL || BR2_PACKAGE_HAS_OPENGL_ES \
+		|| BR2_PACKAGE_HAS_OPENGL_EGL || BR2_PACKAGE_HAS_OPENVG
+	help
+	  OpenGL demos from the Mesa 3D project.
+
+	  http://mesa3d.org
package/mesa3d-demos/mesa3d-demos-non-mesa-impl.patch new file +244 -0

244 lines not on this page · raw message

package/mesa3d-demos/mesa3d-demos-optional-gl.patch new file +75 -0

75 lines not on this page · raw message

package/mesa3d-demos/mesa3d-demos-x11-fix.patch new file +30 -0
new file mode 100644
index 0000000..f6b3b0c
@@ -0,0 +1,30 @@
+This patch ensures that programs which depend on x11 are not build if x11
+is not available.
+
+Signed-off-by: Spenser Gilliland <[email protected]>
+---
+Index: mesa3d-demos-8.1.0/src/egl/opengles2/Makefile.am
+===================================================================
+--- mesa3d-demos-8.1.0.orig/src/egl/opengles2/Makefile.am
++++ mesa3d-demos-8.1.0/src/egl/opengles2/Makefile.am
+@@ -35,9 +35,10 @@ AM_LDFLAGS = \
+ 
+ if HAVE_EGL
+ if HAVE_GLESV2
+-bin_PROGRAMS = \
++bin_PROGRAMS = es2gears_screen
++if HAVE_X11
++bin_PROGRAMS += \
+ 	es2_info \
+-	es2gears_screen \
+ 	es2gears_x11 \
+ 	es2tri
+ if HAVE_WAYLAND
+@@ -45,6 +46,7 @@ bin_PROGRAMS += es2gears_wayland
+ endif
+ endif
+ endif
++endif
+ 
+ es2_info_LDADD = $(X11_LIBS)
+ es2tri_LDADD = $(X11_LIBS)
package/mesa3d-demos/mesa3d-demos.mk new file +63 -0

63 lines not on this page · raw message

Signature · 1 line
1.7.1
#20 lore raw

v3 cover glmark2 and Mesa updates

In reply to Spenser Gilliland

Spenser Gilliland <[email protected]> wrote
in news:1380237714-2470-1-git-send-email-spenser at gillilanding.com:

Quoted 3 lines

this patch series adds glmark2 and mesa3d-demos along with supporting updates for mesa3d and libdrm. Additionally, a udev bug fix for EABIhf toolchains is included.

Hi,

during the preparation of sending a patch for bumping the version of mesa3d to 10.0.1, based on current buildroot git, I came across your uncommitted patchset. I would like to ask if you still want to work on it and whether the buildroot maintainers are willing to accept it or not.

Depending on the answers I would like to contribute to buildroot so it will carry mesa3d 10.0.1.

Regards, Bernd

#21 lore raw

v3 cover glmark2 and Mesa updates

Bernd,

Quoted 4 lines

during the preparation of sending a patch for bumping the version of mesa3d to 10.0.1, based on current buildroot git, I came across your uncommitted patchset. I would like to ask if you still want to work on it and whether the buildroot maintainers are willing to accept it or not.

I'm still interested in moving this patch set forward but I've been severely lacking in time. I'd be happy for you to take a crack at it and I'll rebase on top of your work.

Quoted 2 lines

Depending on the answers I would like to contribute to buildroot so it will carry mesa3d 10.0.1.

Great.

Quoted 1 line

Regards, Bernd

Thanks,
Spenser

Signature · 3 lines
Spenser Gilliland
Computer Engineer
Doctoral Candidate