summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2019-04-16 19:18:34 +0100
committerJon Turney <jon.turney@dronecode.org.uk>2019-04-16 19:18:34 +0100
commit22a37f0a8efd737207d9e3dbc34b1d3590c94bfd (patch)
treed1bd5cc039ba3bcb89c1b5818af2521033fa09a4
parentd2c9f989575f32e01e21b561770572479c081fd0 (diff)
Update for mesonic mesa
-rw-r--r--jhbuildrc.include6
1 files changed, 2 insertions, 4 deletions
diff --git a/jhbuildrc.include b/jhbuildrc.include
index 1e6e468..ed16f5b 100644
--- a/jhbuildrc.include
+++ b/jhbuildrc.include
@@ -223,6 +223,7 @@ if cross_target:
# MinGW targets need to compile with WINVER of at least XP for getaddrinfo(), freeaddrinfo()
#autogenargs += ' --enable-ipv6'
#os.environ['CFLAGS'] += ' -DWINVER=0x0501'
+mesonargs = ''
#
# per module ./configure options
@@ -242,10 +243,7 @@ module_autogenargs['fontconfig'] = autogenargs + ' --enable-libxml2'
module_autogenargs['libXfont'] = autogenargs + ' --disable-static'
-# build xlib-based libGL
-#module_autogenargs['mesa-mesa'] = autogenargs + ' --with-gallium-drivers=swrast --disable-dri --enable-osmesa --enable-xlib-glx'
-# build libGL which supports both direct swrast and indirect
-module_autogenargs['mesa-mesa'] = autogenargs + ' --disable-xa --with-gallium-drivers=swrast --disable-dri3 --enable-egl --enable-osmesa --enable-shared --disable-static --enable-driglx-direct --enable-autotools'
+module_mesonargs['mesa-mesa'] = mesonargs + ' -Degl=false'
# xf86-video-dummy config check needs fixing to default to auto, not yes
module_autogenargs['xf86-video-dummy'] = autogenargs + ' --disable-dga'