summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2019-04-16 20:46:15 +0100
committerJon Turney <jon.turney@dronecode.org.uk>2019-04-16 20:46:15 +0100
commit5ebb54550168d7e04f9f1339a1add3a046db2a21 (patch)
tree5c8a8d7219ccfc0625a2e247c0859226642ca1e8
parent426e41c976f046cf078ecc57822d3571fc722a46 (diff)
Update xserver configuration
Drop removed options Add --disable-glamor
-rw-r--r--jhbuildrc.include3
1 files changed, 1 insertions, 2 deletions
diff --git a/jhbuildrc.include b/jhbuildrc.include
index 48f1deb..8157668 100644
--- a/jhbuildrc.include
+++ b/jhbuildrc.include
@@ -234,10 +234,9 @@ mesonargs = ''
if 'mingw' in os.environ['HOST']:
module_autogenargs['xserver'] = autogenargs + ' --disable-glx'
else:
- module_autogenargs['xserver'] = autogenargs + ' --enable-xvfb --enable-xnest --enable-dmx --enable-kdrive --enable-xephyr --enable-xfake --disable-xfbdev --enable-xorg --enable-xwin --disable-glx-tls --enable-xf86bigfont'
+ module_autogenargs['xserver'] = autogenargs + ' --enable-xvfb --enable-xnest --enable-dmx --enable-kdrive --enable-xephyr --enable-xorg --enable-xwin --enable-xf86bigfont --disable-glamor'
module_autogenargs['xserver'] = module_autogenargs['xserver'] + ' --enable-debug'
module_autogenargs['xserver'] = module_autogenargs['xserver'] + ' --with-builderstring="Tag: `cd ' + checkoutroot + '/xorg/xserver ; git describe | tr -d \\n`"'
-#module_autogenargs['xserver'] = module_autogenargs['xserver'] + ' CFLAGS="-Wno-error=implicit-function-declaration ' + os.environ['CFLAGS'] + '"'
module_autogenargs['xkeyboard-config'] = autogenargs + ' --with-xkb-rules-symlink=xorg'