summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2013-12-17 13:18:57 +0000
committerJon TURNEY <jon.turney@dronecode.org.uk>2014-03-14 21:17:09 +0000
commitf0d1fe04a3f376f2b0c4802b4f7a29e42f7abb56 (patch)
tree8b29a65b208b8c0b72c8aea4526939d2be0092cf
parent7876da0c663f2b5848c9a924843fbc65b2621bc6 (diff)
libGL configuration update
-rw-r--r--jhbuildrc11
1 files changed, 4 insertions, 7 deletions
diff --git a/jhbuildrc b/jhbuildrc
index 9c79316..73b135c 100644
--- a/jhbuildrc
+++ b/jhbuildrc
@@ -100,6 +100,10 @@ module_autogenargs['xkeyboard-config'] = autogenargs + ' --with-xkb-rules-symlin
# libXfont must be built static due to weak linkage nonsense
module_autogenargs['libXfont'] = autogenargs + ' --disable-shared --disable-fc'
+# want to test xlib based libGL
+#module_autogenargs['libGL'] = autogenargs + ' --with-gallium-drivers=swrast --disable-dri -enable-osmesa --enable-xlib-glx'
+# and also indirect-only libGL with swrast
+module_autogenargs['libGL'] = autogenargs + ' --with-gallium-drivers=swrast --disable-driglx-direct --disable-dri3'
# workaround a bug in fontconfig configury
#module_autogenargs['fontconfig'] = autogenargs + ' --with-libiconv=/usr'
@@ -108,13 +112,6 @@ 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)
-module_autogenargs['libGL-indirect-only'] = autogenargs + ' --prefix=/jhbuild/install/libGL-indirect-only --libdir=/jhbuild/install/libGL-indirect-only/lib --with-driver=dri --disable-driglx-direct --disable-egl --with-gallium-drivers='
-# also build libGL indirect only with shared-glapi (--with-driver=dri --disable-driglx-direct --enable-shared-glapi)
-module_autogenargs['libGL-indirect-only-shared-glapi'] = autogenargs + ' --with-driver=dri --disable-driglx-direct --disable-egl --enable-shared-glapi --with-gallium-drivers='
-
# pixman tests fail otherwise, I'm assuming this is a toolchain bug...
module_autogenargs['pixman'] = autogenargs + ' --disable-openmp'