summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2014-06-07 14:31:10 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-06-08 15:02:41 +0200
commitbd10d26439a2304e4e94bf28df70c01f362e5d0b (patch)
treee43e06832bffbf4fae08bd9b69cad8489fdb8063
parentacf15e042f02d2da71a7a7da4801df51eb50cf35 (diff)
downloadbuildroot-bd10d26439a2304e4e94bf28df70c01f362e5d0b.tar.gz
buildroot-bd10d26439a2304e4e94bf28df70c01f362e5d0b.zip
mesa3d: Bump version to 10.2.1, fix xa build
Building xa requires at least one non swrast gallium driver, needed since: http://cgit.freedesktop.org/mesa/mesa/commit/configure.ac?h=10.2&id=e283e966660fdf037be6353dc96b7f63b8aa315a Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/mesa3d/mesa3d.mk12
1 files changed, 8 insertions, 4 deletions
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index fa17177b0f..1a61af8489 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -4,7 +4,7 @@
#
################################################################################
-MESA3D_VERSION = 10.0.4
+MESA3D_VERSION = 10.2.1
MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.bz2
MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
MESA3D_LICENSE = MIT, SGI, Khronos
@@ -35,9 +35,13 @@ MESA3D_DEPENDENCIES += \
xlib_libXdamage \
xlib_libXfixes \
libxcb
-MESA3D_CONF_OPT += \
- --enable-glx \
- --enable-xa
+MESA3D_CONF_OPT += --enable-glx
+# quote from mesa3d configure "Building xa requires at least one non swrast gallium driver."
+ifneq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU)$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA),)
+MESA3D_CONF_OPT += --enable-xa
+else
+MESA3D_CONF_OPT += --disable-xa
+endif
else
MESA3D_CONF_OPT += \
--disable-glx \
OpenPOWER on IntegriCloud