Update for re-organized xorg.modules

3 files changed, 88 insertions, 58 deletions

diff --git a/jhbuildrc b/jhbuildrc
index 02a3774..dadce03 100644
--- a/jhbuildrc
+++ b/jhbuildrc
@@ -4,24 +4,30 @@
 
 moduleset = '/jhbuild/xorg.modules'
 if 'TINDERBOX' in os.environ:
-	modules = [ 'xwin', 'xorg', 'extras', 'tests' ]
+	modules = [ 'xwin', 'The X Window System', 'extras', 'tests' ]
 else:
-	modules = [ 'xwin', 'xorg' ]
+	modules = [ 'xwin', 'The X Window System' ]
 
 # skip building stuff which isn't appropriate for Windows target
 # 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', 'libxshmfence',
-	 'libxkbui', 'libdrm', 'libpciaccess',
-	 'xvinfo', 'xdriinfo', 'xgamma',
+	 'videoproto', 'xf86dgaproto', 'xf86driproto', 'xf86vidmodeproto', 'dri2proto', 'dri3proto',
+	 'libXv', 'libXvMC', 'libXxf86dga', 'libXxf86dga', 'libXxf86vm', 'libxshmfence', 'libxkbui',
+	 'libevdev', 'libpciaccess',
+	 'mesa-drm',
+	 'app-xdriinfo', 'app-xgamma', 'app-xfs', 'app-xvidtune', 'app-xvinfo',
+	 'glamor',
 	 'xf86-input-acecad',
 	 'xf86-input-aiptek',
 	 'xf86-input-evdev',
 	 'xf86-input-joystick',
 	 'xf86-input-keyboard',
 	 'xf86-input-mouse',
+	 'xf86-input-synaptics',
+	 'xf86-input-vmmouse',
 	 'xf86-input-void',
+	 'xf86-video-apm',
+	 'xf86-video-ark',
 	 'xf86-video-ast',
 	 'xf86-video-ati',
 	 'xf86-video-chips',
@@ -30,16 +36,21 @@ skip = [ 'appplewmproto', 'libAppleWM',
 	 'xf86-video-geode',
 	 'xf86-video-glint',
 	 'xf86-video-i128',
+	 'xf86-video-i740',
 	 'xf86-video-intel',
 	 'xf86-video-mach64',
 	 'xf86-video-mga',
+	 'xf86-video-modesetting',
 	 'xf86-video-neomagic',
 	 'xf86-video-nouveau',
 	 'xf86-video-nv',
 	 'xf86-video-openchrome',
 	 'xf86-video-r128',
 	 'xf86-video-rendition',
+	 'xf86-video-s3',
+	 'xf86-video-s3virge',
 	 'xf86-video-savage',
+	 'xf86-video-siliconmotion',
 	 'xf86-video-sis',
 	 'xf86-video-sisusb',
 	 'xf86-video-suncg14',
@@ -52,8 +63,10 @@ skip = [ 'appplewmproto', 'libAppleWM',
 	 'xf86-video-tga',
 	 'xf86-video-trident',
 	 'xf86-video-tseng',
+	 'xf86-video-v4l',
 	 'xf86-video-vesa',
 	 'xf86-video-vmware',
+	 'xf86-video-wsfb',
 	 'xf86-video-voodoo',
 	 'xf86-video-xgixp' ]
 
@@ -79,6 +92,7 @@ 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'
+#os.environ['LDFLAGS'] = '-Wl,-Map=mapfile'
 
 #
 os.environ['GLEW_DEST'] = prefix
@@ -101,11 +115,11 @@ 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'
 
+# build xlib-based libGL
+#module_autogenargs['mesa-mesa'] = autogenargs + ' --with-gallium-drivers=swrast --disable-dri --enable-osmesa --enable-xlib-glx'
+# build indirect-dri only libGL
+module_autogenargs['mesa-mesa'] = 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'
diff --git a/jhbuildrc.x86_64-pc-cygwin b/jhbuildrc.x86_64-pc-cygwin
index c0423c3..c6b4f6b 100644
--- a/jhbuildrc.x86_64-pc-cygwin
+++ b/jhbuildrc.x86_64-pc-cygwin
@@ -3,63 +3,79 @@
 #
 
 moduleset = '/jhbuild/xorg.modules'
-modules = [ 'xwin', 'xorg' ]
+if 'TINDERBOX' in os.environ:
+	modules = [ 'xwin', 'The X Window System', 'extras', 'tests' ]
+else:
+	modules = [ 'xwin', 'The X Window System' ]
 
 # skip building stuff which isn't appropriate for Windows target
 # all drivers apart from xf86-video-dummy and xf86-video-nested
 skip = [ 'appplewmproto', 'libAppleWM',
-	 'videoproto', 'xf86dgaproto', 'xf86driproto', 'xf86vidmodeproto', 'dri2proto',
-	 'libXv', 'libXvMC', 'libXxf86dga', 'libXxf86dga', 'libXxf86vm',
-	 'libxkbui', 'libdrm', 'libpciaccess',
-	 'xvinfo', 'xdriinfo', 'xgamma',
-         'xf86-input-acecad',
-         'xf86-input-aiptek',
-         'xf86-input-evdev',
-         'xf86-input-joystick',
-         'xf86-input-keyboard',
-         'xf86-input-mouse',
-         'xf86-input-void',
-         'xf86-video-ast',
-         'xf86-video-ati',
-         'xf86-video-chips',
-         'xf86-video-cirrus',
-         'xf86-video-fbdev',
-         'xf86-video-geode',
-         'xf86-video-glint',
-         'xf86-video-i128',
-         'xf86-video-intel',
-         'xf86-video-mach64',
-         'xf86-video-mga',
-         'xf86-video-neomagic',
-         'xf86-video-nouveau',
-         'xf86-video-nv',
-         'xf86-video-openchrome',
-         'xf86-video-r128',
-         'xf86-video-rendition',
-         'xf86-video-savage',
-         'xf86-video-sis',
-         'xf86-video-sisusb',
-         'xf86-video-suncg14',
-         'xf86-video-suncg3',
-         'xf86-video-suncg6',
-         'xf86-video-sunffb',
-         'xf86-video-sunleo',
-         'xf86-video-suntcx',
-         'xf86-video-tdfx',
-         'xf86-video-tga',
-         'xf86-video-trident',
-         'xf86-video-tseng',
-         'xf86-video-vesa',
-         'xf86-video-vmware',
-         'xf86-video-voodoo',
-         'xf86-video-xgixp' ]
+	 'videoproto', 'xf86dgaproto', 'xf86driproto', 'xf86vidmodeproto', 'dri2proto', 'dri3proto',
+	 'libXv', 'libXvMC', 'libXxf86dga', 'libXxf86dga', 'libXxf86vm', 'libxshmfence', 'libxkbui',
+	 'libevdev', 'libpciaccess',
+	 'mesa-drm',
+	 'app-xdriinfo', 'app-xgamma', 'app-xfs', 'app-xvidtune', 'app-xvinfo',
+	 'glamor',
+	 'xf86-input-acecad',
+	 'xf86-input-aiptek',
+	 'xf86-input-evdev',
+	 'xf86-input-joystick',
+	 'xf86-input-keyboard',
+	 'xf86-input-mouse',
+	 'xf86-input-synaptics',
+	 'xf86-input-vmmouse',
+	 'xf86-input-void',
+	 'xf86-video-apm',
+	 'xf86-video-ark',
+	 'xf86-video-ast',
+	 'xf86-video-ati',
+	 'xf86-video-chips',
+	 'xf86-video-cirrus',
+	 'xf86-video-fbdev',
+	 'xf86-video-geode',
+	 'xf86-video-glint',
+	 'xf86-video-i128',
+	 'xf86-video-i740',
+	 'xf86-video-intel',
+	 'xf86-video-mach64',
+	 'xf86-video-mga',
+	 'xf86-video-modesetting',
+	 'xf86-video-neomagic',
+	 'xf86-video-nouveau',
+	 'xf86-video-nv',
+	 'xf86-video-openchrome',
+	 'xf86-video-r128',
+	 'xf86-video-rendition',
+	 'xf86-video-s3',
+	 'xf86-video-s3virge',
+	 'xf86-video-savage',
+	 'xf86-video-siliconmotion',
+	 'xf86-video-sis',
+	 'xf86-video-sisusb',
+	 'xf86-video-suncg14',
+	 'xf86-video-suncg3',
+	 'xf86-video-suncg6',
+	 'xf86-video-sunffb',
+	 'xf86-video-sunleo',
+	 'xf86-video-suntcx',
+	 'xf86-video-tdfx',
+	 'xf86-video-tga',
+	 'xf86-video-trident',
+	 'xf86-video-tseng',
+	 'xf86-video-v4l',
+	 'xf86-video-vesa',
+	 'xf86-video-vmware',
+	 'xf86-video-wsfb',
+	 'xf86-video-voodoo',
+	 'xf86-video-xgixp' ]
 
 build_policy = 'updated-deps'
 
 os.environ['BUILD'] = 'i686-pc-cygwin'
 os.environ['HOST'] = 'x86_64-pc-cygwin'
 
-# source checkou, build and install directories
+# source checkout, build and install directories
 checkoutroot = '/jhbuild/checkout'
 buildroot = os.path.join('/jhbuild', os.environ['HOST'], 'build')
 prefix = os.path.join('/jhbuild', os.environ['HOST'], 'install')
diff --git a/xorg.modules b/xorg.modules
index fbe1873..d61849c 100755
--- a/xorg.modules
+++ b/xorg.modules
@@ -69,7 +69,7 @@
   <metamodule id="xwin">
     <dependencies>
       <dep package="libWindowsWM"/>
-      <dep package="xorg"/>
+      <dep package="The X Window System"/>
       <dep package="mesa-demos"/>
     </dependencies>
   </metamodule>