From 7b75569dc9f999b2c034b948107bfd19dffab810 Mon Sep 17 00:00:00 2001
From: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat, 2 Mar 2013 18:04:27 +0000
Subject: Tinderbox changes

- Mesa can now install itself without help
- Use quiet_mode, needed for updated jhbuild to be silent
- Various configure adjustments
---
 cronscript                |  8 ++------
 jhbuildrc                 | 11 +++++++++--
 jhbuildrc.i686-pc-mingw32 |  3 +--
 xorg.modules              | 10 +++++++---
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/cronscript b/cronscript
index fc96415..630bd88 100755
--- a/cronscript
+++ b/cronscript
@@ -14,18 +14,14 @@ T1=$(date +%s)
 # jhbuild for cygwin
 jhbuild -f jhbuildrc autobuild -c -a --report-url="http://jturney-byron:ZpeyPFuK@tinderbox.x.org/builds/rpc"
 
-# mesa is terrible, cannot installl what it builds, so help it out here as there's nowhere better to do this
-cp /jhbuild/checkout/mesa/mesa/lib/gallium/*.dll /jhbuild/install/bin/
-cp --no-dereference /jhbuild/checkout/mesa/mesa/lib/gallium/*.dll.a /jhbuild/install/lib/
-# likewise mesa-glut
+# mesa-glut is terrible, cannot install what it builds, so help it out here as there's nowhere better to do this
 cp /jhbuild/checkout/mesa/glut/lib/*.dll /jhbuild/install/bin/
 cp --no-dereference /jhbuild/checkout/mesa/glut/lib/*.dll.a /jhbuild/install/lib/
 
 # jhbuild for mingw, if we have time
 T2=$(date +%s)
 DT="$(expr $T2 - $T1)"
-echo "cygwin build took $DT seconds"
 
-if [ $DT -lt 14400 ] ; then
+if [ $DT -lt 21600 ] ; then
 jhbuild -f jhbuildrc.mingw autobuild -c -a --report-url="http://jturney-allegra:TBK1zMob@tinderbox.freedesktop.org/builds/rpc"
 fi
diff --git a/jhbuildrc b/jhbuildrc
index e7440ce..02a3774 100644
--- a/jhbuildrc
+++ b/jhbuildrc
@@ -60,6 +60,7 @@ skip = [ 'appplewmproto', 'libAppleWM',
 build_policy = 'updated-deps'
 if 'TINDERBOX' in os.environ:
 	nopoison = True
+	quiet_mode = True
 
 # All source modules will be here after the checkout
 checkoutroot = '/jhbuild/checkout'
@@ -105,10 +106,16 @@ module_autogenargs['libXfont'] = autogenargs + ' --disable-shared --disable-fc'
 # and also indirect-only libGL with swrast
 module_autogenargs['libGL'] = autogenargs + ' --with-gallium-drivers=swrast --disable-driglx-direct --disable-dri3'
 
-#
+
+# pixman tests fail otherwise, I'm assuming this is a toolchain bug...
+#module_autogenargs['pixman'] = autogenargs + ' --disable-openmp'
+# pixman tests run slower when OpenMP is allowed to use multiple threads...
+os.environ['OMP_NUM_THREADS'] = '1'
+
+# xf86-video-dummy config check needs fixing to default to auto, not yes
 module_autogenargs['xf86-video-dummy'] = autogenargs + ' --disable-dga'
 
-#
+# harfbuzz currently needs help to configure correctly
 module_autogenargs['harfbuzz'] = autogenargs + ' ac_cv_header_usp10_h=no ac_cv_header_windows_h=no ac_cv_func__setmode=no'
 
 # do not start xvfb for any testmodules
diff --git a/jhbuildrc.i686-pc-mingw32 b/jhbuildrc.i686-pc-mingw32
index cf11468..4147210 100644
--- a/jhbuildrc.i686-pc-mingw32
+++ b/jhbuildrc.i686-pc-mingw32
@@ -23,7 +23,6 @@ skip = [ 'appplewmproto', 'libAppleWM',
 # some modules are provided with xming, so can be ported with some work...
 
 build_policy = 'updated-deps'
-nopoison = True
 
 
 os.environ['BUILD'] = 'i686-pc-cygwin'
@@ -66,7 +65,7 @@ module_autogenargs['xserver'] = autogenargs + ' -disable-glx'
 module_autogenargs['xserver'] = module_autogenargs['xserver'] + ' --with-builderstring="Tag: `cd ' + checkoutroot + '/xorg/xserver ; git describe | tr -d \\n`"'
 
 module_autogenargs['xkeyboard-config'] = autogenargs + ' --with-xkb-rules-symlink=xorg'
-module_autogenargs['fontconfig'] = autogenargs + ' --enable-libxml2 --with-arch=le32d8'
+module_autogenargs['fontconfig'] = autogenargs + ' --enable-libxml2'
 
 # must put pthread into LIBS when building pthread-stubs, as weak cleverness won't work...
 os.environ['LIBS'] = '-lpthread'
diff --git a/xorg.modules b/xorg.modules
index 20c28a1..0e25e01 100755
--- a/xorg.modules
+++ b/xorg.modules
@@ -34,7 +34,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="GLEW" skip-autogen="true" supports-non-srcdir-builds="no" check-target="false" makeargs="LDFLAGS.EXTRA=-L$GLEW_DEST/lib">
+  <autotools id="GLEW" skip-autogen="true" supports-non-srcdir-builds="no" check-target="false" makeargs="LDFLAGS.EXTRA=-L$GLEW_DEST/lib" makeinstallargs="install GLEW_DEST=/jhbuild/install/_jhbuild/root-GLEW/jhbuild/install/">
     <branch repo="GLEW" module="glew"/>
   </autotools>
 
@@ -50,11 +50,15 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libGL-xlib" supports-non-srcdir-builds="no" check-target="false" skip-autogen="never">
-    <branch repo="git.freedesktop.org" module="mesa/mesa" checkoutdir="mesa/mesa-xlib"/>
+  <autotools id="libGL-dri">
+    <branch repo="git.freedesktop.org" module="mesa/mesa" checkoutdir="mesa/mesa-dri"/>
     <dependencies>
+      <dep package="xf86driproto"/>
+      <dep package="dri2proto"/>
       <dep package="glproto"/>
+      <dep package="libXxf86vm"/>
       <dep package="libXdamage"/>
+      <dep package="libdrm"/>
       <dep package="libX11"/>
       <dep package="libXext"/>
       <dep package="libXi"/>
-- 
cgit v1.2.3