package/mesa3d-demos: Fix build error

PATCH New Bernd Kuhls 2 participants 2 messages Nov 20, 2014

Share & tools

Bernd Kuhls

author

2014-11-20 20:04 UTC #0 lore raw

PATCH v2 1/1 package/mesa3d-demos: Fix build error

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

---
v2: Updated patch according to comments from Peter

    http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/99050

 package/mesa3d-demos/Config.in       |    2 ++
 package/mesa3d-demos/mesa3d-demos.mk |    8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

package/mesa3d-demos/Config.in +2 -0

index e2b2e05..d63c47b 100644
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_MESA3D_DEMOS
 	bool "mesa3d-demos"
+	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
 	depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \
 		|| BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG
 	help

package/mesa3d-demos/mesa3d-demos.mk +4 -4

index 9b60dc9..2db7f56 100644
@@ -11,11 +11,11 @@ MESA3D_DEMOS_AUTORECONF = YES
 MESA3D_DEMOS_DEPENDENCIES = host-pkgconf
 MESA3D_DEMOS_LICENSE = MIT
 
-ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
-MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu
-MESA3D_DEMOS_CONF_OPTS += --enable-gl
+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
 else
-MESA3D_DEMOS_CONF_OPTS += --disable-gl
+MESA3D_DEMOS_CONF_OPTS += --disable-gl --disable-x11
 endif
 
 ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y)

Signature · 1 line

1.7.10.4

Peter Korsgaard

2014-11-20 22:12 UTC #1 lore raw

PATCH v2 1/1 package/mesa3d-demos: Fix build error

Quoted 12 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bernd" == Bernd Kuhls <[email protected]> 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/

Quoted 4 lines

Signed-off-by Bernd Kuhls <[email protected]>
---
v2: Updated patch according to comments from Peter
    http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/99050

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard