More updates

1 files changed, 12 insertions, 4 deletions

diff --git a/jhbuildrc b/jhbuildrc
index e1394c2..9c79316 100644
--- a/jhbuildrc
+++ b/jhbuildrc
@@ -12,7 +12,7 @@ else:
 # skip building all drivers apart from xf86-video-dummy and xf86-video-nested
 skip = [ 'appplewmproto', 'libAppleWM',
 	 'videoproto', 'xf86dgaproto', 'xf86driproto', 'xf86vidmodeproto', 'dri2proto',
-	 'libXv', 'libXvMC', 'libXxf86dga', 'libXxf86dga', 'libXxf86vm',
+	 'libXv', 'libXvMC', 'libXxf86dga', 'libXxf86dga', 'libXxf86vm', 'libxshmfence',
 	 'libxkbui', 'libdrm', 'libpciaccess',
 	 'xvinfo', 'xdriinfo', 'xgamma',
 	 'xf86-input-acecad',
@@ -75,6 +75,7 @@ os.environ['PKG_CONFIG_PATH'] = os.path.join(prefix, 'lib', 'pkgconfig') + ':' +
 os.environ['CC'] = 'ccache gcc'
 os.environ['CXX'] = 'ccache g++'
 os.environ['INSTALL'] = '/usr/local/bin/install-check'
+os.environ['CFLAGS'] = '-g -O0 -fdiagnostics-show-option'
 os.environ['AUTOMAKE'] = 'automake --force-missing --copy'
 #os.environ['V'] = '1'
 
@@ -88,18 +89,25 @@ os.environ['JHBUILD_PREFIX'] = prefix
 
 autogenargs = '--cache-file=/jhbuild/configure-cache'
 
-module_autogenargs['xserver'] = autogenargs + ' --enable-windowswm --enable-xf86bigfont'
-module_autogenargs['xserver'] = module_autogenargs['xserver'] + ' --enable-xvfb --enable-xnest --enable-dmx --enable-kdrive --enable-xephyr --enable-xfake --disable-xfbdev --enable-xorg --enable-xwin'
+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'
+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`"'
+# we can only build the Xwin DDX when rootless is enabled, as it turns on horrible ROOTLESS hacks in DIX
+#  --enable-dmx --enable-xephyr --enable-xfake
 
 module_autogenargs['xkeyboard-config'] = autogenargs + ' --with-xkb-rules-symlink=xorg'
 
 # libXfont must be built static due to weak linkage nonsense
-module_autogenargs['libXfont'] = autogenargs + ' --disable-shared'
+module_autogenargs['libXfont'] = autogenargs + ' --disable-shared --disable-fc'
 
 # workaround a bug in fontconfig configury
 #module_autogenargs['fontconfig'] = autogenargs + ' --with-libiconv=/usr'
 
+#
+module_autogenargs['xf86-video-dummy'] = autogenargs + ' --disable-dga'
+
+#
+module_autogenargs['harfbuzz'] = autogenargs + ' ac_cv_header_usp10_h=no ac_cv_header_windows_h=no ac_cv_func__setmode=no'
 # build libGL (--with-driver=xlib)
 module_autogenargs['libGL'] = autogenargs + ' --with-driver=xlib --with-gallium-drivers=swrast --disable-egl'
 # also build libGL indirect only (--with-driver=dri --disable-driglx-direct)