diff mbox

[1/1] package/mesa3d-demos: X11 support depends on HAS_LIBGL

Message ID 1415478110-22543-1-git-send-email-bernd.kuhls@t-online.de
State Changes Requested
Headers show

Commit Message

Bernd Kuhls Nov. 8, 2014, 8:21 p.m. UTC
Fixes
http://autobuild.buildroot.net/results/8f2/8f292f1151089d20f33c599320941cb5435c0199/
http://autobuild.buildroot.net/results/f3d/f3db50d0c5c74fecafd6b4bdd89f97e8e566d820/
http://autobuild.buildroot.net/results/ac0/ac0f22bf87e2b48bd2191de88999404d1c55de9b/
http://autobuild.buildroot.net/results/da8/da87a3e81b19ad038661f5653b544f4c8cfd389d/
http://autobuild.buildroot.net/results/d51/d51d22754a37f790d2de5a4836237b8eea417124/
http://autobuild.buildroot.net/results/347/347b2f79111548ae00f40879c1b5f3c4c1c7091e/
http://autobuild.buildroot.net/results/aef/aef73a3bc770c3784025642f6a2c276944117112/
http://autobuild.buildroot.net/results/901/90152f1cfa09ad4d37700b340204f8b75850c582/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/mesa3d-demos/mesa3d-demos.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Peter Korsgaard Nov. 8, 2014, 9:09 p.m. UTC | #1
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Fixes
 > http://autobuild.buildroot.net/results/8f2/8f292f1151089d20f33c599320941cb5435c0199/
 > http://autobuild.buildroot.net/results/f3d/f3db50d0c5c74fecafd6b4bdd89f97e8e566d820/
 > http://autobuild.buildroot.net/results/ac0/ac0f22bf87e2b48bd2191de88999404d1c55de9b/
 > http://autobuild.buildroot.net/results/da8/da87a3e81b19ad038661f5653b544f4c8cfd389d/
 > http://autobuild.buildroot.net/results/d51/d51d22754a37f790d2de5a4836237b8eea417124/
 > http://autobuild.buildroot.net/results/347/347b2f79111548ae00f40879c1b5f3c4c1c7091e/
 > http://autobuild.buildroot.net/results/aef/aef73a3bc770c3784025642f6a2c276944117112/
 > http://autobuild.buildroot.net/results/901/90152f1cfa09ad4d37700b340204f8b75850c582/

 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 > ---
 >  package/mesa3d-demos/mesa3d-demos.mk |    4 ++--
 >  1 file changed, 2 insertions(+), 2 deletions(-)

 > diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk
 > index 9b60dc9..07ec3e8 100644
 > --- a/package/mesa3d-demos/mesa3d-demos.mk
 > +++ b/package/mesa3d-demos/mesa3d-demos.mk
 > @@ -13,9 +13,9 @@ MESA3D_DEMOS_LICENSE = MIT
 
 >  ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
 >  MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu
 > -MESA3D_DEMOS_CONF_OPTS += --enable-gl
 > +MESA3D_DEMOS_CONF_OPTS += --enable-gl --enable-x11
 >  else
 > -MESA3D_DEMOS_CONF_OPTS += --disable-gl
 > +MESA3D_DEMOS_CONF_OPTS += --disable-gl --disable-x11

Hmm, that looks a bit backwards. It is the x11 support that needs opengl
support, not the other way around.

From a quick look at configure.ac, the X11 stuff needs libX11 and
libXext, so I think something like this makes more sense:

Config.in:

select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7

mesa32-demos.mk:

ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy)
MESA3D_DEMOS_DEPENDENCIES += xlib_libX11 xlib_libXext
MESA3D_DEMOS_CONF_OPT += --enable-x11
else
MESA3D_DEMOS_CONF_OPT += --disable-x11
endif

Care to send a patch doing that?
diff mbox

Patch

diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk
index 9b60dc9..07ec3e8 100644
--- a/package/mesa3d-demos/mesa3d-demos.mk
+++ b/package/mesa3d-demos/mesa3d-demos.mk
@@ -13,9 +13,9 @@  MESA3D_DEMOS_LICENSE = MIT
 
 ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
 MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu
-MESA3D_DEMOS_CONF_OPTS += --enable-gl
+MESA3D_DEMOS_CONF_OPTS += --enable-gl --enable-x11
 else
-MESA3D_DEMOS_CONF_OPTS += --disable-gl
+MESA3D_DEMOS_CONF_OPTS += --disable-gl --disable-x11
 endif
 
 ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y)