More stuff

4 files changed, 56 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index 4428c0a..3a7bff7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,6 @@ configure-cache*
 checkout/
 build*/
 install*/
+keep/
+runnable-mingw/
 collected-patches/
diff --git a/jhbuildrc.i686-pc-mingw32 b/jhbuildrc.i686-pc-mingw32
index 4147210..255638d 100644
--- a/jhbuildrc.i686-pc-mingw32
+++ b/jhbuildrc.i686-pc-mingw32
@@ -9,7 +9,7 @@ modules = [ 'xwin', 'xorg' ]
 # skip building stuff which isn't appropriate for target
 skip = [ 'appplewmproto', 'libAppleWM',
 	 'videoproto', 'xf86dgaproto', 'xf86driproto', 'xf86vidmodeproto', 'dri2proto',
-	 'libXv', 'libXvMC', 'libXxf86dga', 'libXxf86dga', 'libXxf86vm',
+	 'libXv', 'libXvMC', 'libXxf86dga', 'libXxf86dga', 'libXxf86vm', 'libxcwm',
 	 'libxkbui', 'libdrm', 'libpciaccess',
 	 'xvinfo', 'xdriinfo', 'xgamma',
 	 'xorg-drivers',
@@ -78,4 +78,7 @@ makecheck = False
 
 # AC_FUNC_STRNLEN guesses 'yes' when cross-compiling
 os.environ['ac_cv_func_strnlen_working'] = 'no'
-
+# AC_SEARCH_LIBS can't find sqrtf() beacuse of stdcall linkage
+#os.environ['ac_cv_search_sqrtf'] = 'none required'
+# AC_CHECK_FUNC can't find strncasecmp() because of stdcall linkage
+os.environ['ac_cv_func_strncasecmp'] = 'yes'
diff --git a/jhbuildrc.x86_64-pc-cygwin b/jhbuildrc.x86_64-pc-cygwin
index c6b4f6b..a2701eb 100644
--- a/jhbuildrc.x86_64-pc-cygwin
+++ b/jhbuildrc.x86_64-pc-cygwin
@@ -84,7 +84,9 @@ os.environ['CC'] = 'ccache x86_64-pc-cygwin-gcc'
 os.environ['CXX'] = 'ccache x86_64-pc-cygwin-g++'
 os.environ['CC_FOR_BUILD'] = 'ccache gcc'
 
+#configuration
 os.environ['ACLOCAL'] = 'aclocal -I ' + os.path.join(prefix, 'share', 'aclocal')
+# should search in /usr/share/pkgconfig ???
 os.environ['PKG_CONFIG_PATH'] = os.path.join(prefix, 'lib', 'pkgconfig') + ':' + os.path.join(prefix, 'share', 'pkgconfig')
 # do not search in the host pkgconfig libdir
 os.environ['PKG_CONFIG_LIBDIR'] = '/usr/x86_64-pc-cygwin/sys-root/usr/lib/pkgconfig'
@@ -93,21 +95,24 @@ os.environ['CFLAGS'] = '-g -O0 -fdiagnostics-show-option'
 os.environ['JHBUILD_CHECKOUTROOT'] = checkoutroot
 os.environ['JHBUILD_BUILDROOT'] = buildroot
 os.environ['JHBUILD_PREFIX'] = prefix
+# don't use host icu_config
+os.environ['ICU_CONFIG'] = 'no'
+# don't use host llvm_config
+os.environ['LLVM_CONFIG'] = 'no'
 
 autogenargs = '--cache-file=' + os.path.join('/jhbuild', os.environ['HOST'], 'configure-cache')
 autogenargs += ' --build='+os.environ['BUILD']
 autogenargs += ' --host='+os.environ['HOST']
 
-module_autogenargs['xserver'] = autogenargs + ' --disable-unit-tests' + ' --enable-xvfb --enable-xnest --enable-dmx --enable-kdrive --enable-xephyr --enable-xfake --disable-xfbdev --enable-xorg --enable-xwin'
+module_autogenargs['xserver'] = autogenargs + ' --disable-unit-tests' + ' --disable-xvfb --disable-xnest --disable-dmx --enable-kdrive --disable-xephyr --disable-xfake --disable-xfbdev --disable-xorg --enable-xwin --disable-glx --enable-windowswm=auto'
+module_autogenargs['xserver'] = module_autogenargs['xserver'] + ' --with-khronos-spec-dir=/usr/share/opengl/spec'
 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'
 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'
+module_autogenargs['libGL'] = autogenargs + ' --with-gallium-drivers=swrast --disable-dri -enable-osmesa --enable-xlib-glx ac_cv_path_LLVM_CONFIG=no'
 
 module_autogenargs['xf86-video-dummy'] = autogenargs + ' --disable-dga'
 
diff --git a/xorg.modules b/xorg.modules
index d61849c..3ac0814 100755
--- a/xorg.modules
+++ b/xorg.modules
@@ -38,6 +38,23 @@
     <branch repo="sourceforge" module="glew/code" checkoutdir="glew"/>
   </autotools>
 
+  <autotools id="xcb-test">
+    <branch repo="jturney" module="xcb-test" checkoutdir="tests/xcb-test"/>
+    <dependencies>
+      <dep package="xcb"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="cairo">
+    <branch repo="cairo" module="cairo" checkoutdir="cario"/>
+  </autotools>
+
+  <cmake id="piglit" cmakeargs="-DOPENGL_gl_LIBRARY=/usr/lib/libGL.dll.a -DOPENGL_glu_LIBRARY=/usr/lib/libGLU.dll.a">
+  <!-- we need to provide paths to libGL, libGLU, otherwise cmake decides to use the w32api ones -->
+  <!-- really this should point to the libs we have built, but we don't have libdir here -->
+    <branch repo="git.freedesktop.org" module="piglit" checkoutdir="piglit"/>
+  </cmake>
+
   <autotools id="libGL-indirect-only" supports-non-srcdir-builds="no" check-target="false" skip-autogen="never">
     <branch repo="git.freedesktop.org" module="mesa/mesa" checkoutdir="mesa/mesa-indirect-only"/>
     <dependencies>
@@ -50,8 +67,9 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libGL-dri">
-    <branch repo="git.freedesktop.org" module="mesa/mesa" checkoutdir="mesa/mesa-dri"/>
+
+  <autotools id="libGL-indirect-only">
+    <branch repo="git.freedesktop.org" module="mesa/mesa" checkoutdir="mesa/mesa-indirect-only"/>
     <dependencies>
       <dep package="xf86driproto"/>
       <dep package="dri2proto"/>
@@ -89,4 +107,24 @@
     </dependencies>
   </metamodule>
 
+  <autotools id="xrestop">
+    <branch repo="git.freedesktop.org" module="xorg/app/xrestop" checkoutdir="xorg/app/xrestop"/>
+  </autotools>
+
+  <autotools id="libxkbcommon">
+    <branch repo="git.freedesktop.org" module="xorg/lib/libxkbcommon" checkoutdir="xorg/lib/libxkbcommon"/>
+  </autotools>
+
+  <autotools id="xfontsel">
+    <branch repo="git.freedesktop.org" module="xorg/app/xfontsel" checkoutdir="xorg/app/xfontsel"/>
+  </autotools>
+
+  <autotools id="xrx">
+    <branch repo="git.freedesktop.org" module="xorg/app/xrx" checkoutdir="xorg/app/xrx"/>
+  </autotools>
+
+  <autotools id="xcb-demo">
+    <branch repo="git.freedesktop.org" module="xcb/demo" checkoutdir="xcb/demo"/>
+  </autotools>
+
 </moduleset>