Skip to contentSkip to conversation

package/mesa3d-demos: Disable glesv1 support

PATCH New Bernd Kuhls 2 participants 3 messages Dec 14, 2015 – Dec 15, 2015

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH v2 1/2 package/mesa3d-demos: Disable glesv1 support

The only files enabled by glesv1 support are in src/egl/opengles1/

Quoting src/egl/opengles1/Makefile.am:

"# These programs aren't intended to be included with the normal distro." "# They're not too interesting but they're good for testing."

Most of the files present in this directory contain

"#include <X11/Xlib.h>"

which breaks a wayland-only build because the build system does not take care of the x11 dependency here. Since these files are "not too interesting" anyway we just disable glesv1 support.

Fixes
http://autobuild.buildroot.net/results/b3e/b3ed3ee174a3ddce84bf64039eac39d4e6e75b71/

Signed-off-by Bernd Kuhls <[email protected]>

---
v2: fixed patch description, git does not like "#" in comments ;) (Thomas)
split 0001-demos-optional-gl.patch into seperate patch

 package/mesa3d-demos/mesa3d-demos.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
package/mesa3d-demos/mesa3d-demos.mk +4 -2
index 016095b..cfc5406 100644
@@ -11,6 +11,8 @@ MESA3D_DEMOS_AUTORECONF = YES
 MESA3D_DEMOS_DEPENDENCIES = host-pkgconf
 MESA3D_DEMOS_LICENSE = MIT
 
+MESA3D_DEMOS_CONF_OPTS += --disable-gles1
+
 ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy)
 MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu xlib_libX11 xlib_libXext
 MESA3D_DEMOS_CONF_OPTS += --enable-gl --enable-x11

@@ -27,9 +29,9 @@ endif
 
 ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
 MESA3D_DEMOS_DEPENDENCIES += libgles
-MESA3D_DEMOS_CONF_OPTS += --enable-gles1 --enable-gles2
+MESA3D_DEMOS_CONF_OPTS += --enable-gles2
 else
-MESA3D_DEMOS_CONF_OPTS += --disable-gles1 --disable-gles2
+MESA3D_DEMOS_CONF_OPTS += --disable-gles2
 endif
 
 ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y)
Signature · 1 line
2.6.2
author
#1 lore raw

PATCH v2 2/2 package/mesa3d-demos: remove copy-and-paste artifact from 0001-demos-optional-gl.patch

Signed-off-by Bernd Kuhls <[email protected]>

---
v2: split patch from previous patch regarding glesv1 (Thomas)

 package/mesa3d-demos/0001-demos-optional-gl.patch | 3 ---
 1 file changed, 3 deletions(-)
package/mesa3d-demos/0001-demos-optional-gl.patch +0 -3
index 0415bbc..6470e9d 100644
@@ -72,6 +72,3 @@ Index: mesa3d-demos-8.1.0/src/util/Makefile.am
  
  if HAVE_GLUT
  AM_CFLAGS += \
-diff -uNr mesa-demos-8.3.0.org/configure.ac mesa-demos-8.3.0/configure.ac
---- mesa-demos-8.3.0.org/configure.ac	2015-12-09 22:06:44.000000000 +0100
-+++ mesa-demos-8.3.0/configure.ac	2015-12-12 17:06:10.484295811 +0100
Signature · 1 line
2.6.2
#2 lore raw

PATCH v2 1/2 package/mesa3d-demos: Disable glesv1 support

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 15 lines · Bernd Kuhls

The only files enabled by glesv1 support are in src/egl/opengles1/

Quoting src/egl/opengles1/Makefile.am:

"# These programs aren't intended to be included with the normal distro." "# They're not too interesting but they're good for testing."

Most of the files present in this directory contain

"#include <X11/Xlib.h>"

which breaks a wayland-only build because the build system does not take care of the x11 dependency here. Since these files are "not too interesting" anyway we just disable glesv1 support.

Quoted 7 lines

Fixes
http://autobuild.buildroot.net/results/b3e/b3ed3ee174a3ddce84bf64039eac39d4e6e75b71/

Signed-off-by Bernd Kuhls <[email protected]>

---
v2: fixed patch description, git does not like "#" in comments ;) (Thomas)
split 0001-demos-optional-gl.patch into seperate patch

Both applied. For the first patch, I had to adapt it slightly, since it didn't apply directly on top of master.

Thanks!

Thomas

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