Message ID | 1450030352-31812-1-git-send-email-bernd.kuhls@t-online.de |
---|---|
State | Changes Requested |
Headers | show |
Bernd, On Sun, 13 Dec 2015 19:12:32 +0100, Bernd Kuhls wrote: > The only files enabled by glesv1 support are in src/egl/opengles1/ > > Quoting src/egl/opengles1/Makefile.am: > > Most of the files present in this directory contain I don't see this sentence in src/egl/opengles1/Makefile.am, and this sentence is not complete, so I don't understand. Was there a copy and paste error here ? > 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. Also remove a copy- > and-paste artifact from 0001-demos-optional-gl.patch. The 0001-demos-optional-gl.patch should probably be part of a separate patch. Also, would you have some time to submit this patch upstream ? Thanks, Thomas
diff --git a/package/mesa3d-demos/0001-demos-optional-gl.patch b/package/mesa3d-demos/0001-demos-optional-gl.patch index 0415bbc..6470e9d 100644 --- a/package/mesa3d-demos/0001-demos-optional-gl.patch +++ b/package/mesa3d-demos/0001-demos-optional-gl.patch @@ -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 diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index 016095b..cfc5406 100644 --- a/package/mesa3d-demos/mesa3d-demos.mk +++ b/package/mesa3d-demos/mesa3d-demos.mk @@ -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)
The only files enabled by glesv1 support are in src/egl/opengles1/ Quoting src/egl/opengles1/Makefile.am: Most of the files present in this directory contain 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. Also remove a copy- and-paste artifact from 0001-demos-optional-gl.patch. Fixes http://autobuild.buildroot.net/results/b3e/b3ed3ee174a3ddce84bf64039eac39d4e6e75b71/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/mesa3d-demos/0001-demos-optional-gl.patch | 3 --- package/mesa3d-demos/mesa3d-demos.mk | 6 ++++-- 2 files changed, 4 insertions(+), 5 deletions(-)