--- xorgbase-260308.old/util/modular/build.sh
+++ xorgbase-260308/util/modular/build.sh
@@ -539,7 +539,9 @@
     GITROOT=${GITROOT:="https://gitlab.freedesktop.org/"}
 
     if [ ! -d "$DIR" ]; then
-        git clone $GITCLONEOPTS "$GITROOT/$BASEDIR$DIR" "$DIR"
+        echo git clone $GITCLONEOPTS "$GITROOT/$BASEDIR$DIR" "$DIR"
+             git clone $GITCLONEOPTS "$GITROOT/$BASEDIR$DIR" "$DIR"
+        exit 1
         if [ $? -ne 0 ]; then
             echo "Failed to clone $module${component:+/}$component. Ignoring."
             clonefailed_components="$clonefailed_components $module${component:+/}$component"
@@ -695,6 +697,13 @@
 	fi
     fi
 
+    if [ $use_meson != 0 ] &&
+       [ -r ${DIR_CONFIG}/builddir/build.ninja ]; then
+        echo   ${DIR_CONFIG}/builddir/build.ninja exists
+    else
+        rm -fr ${DIR_CONFIG}/builddir
+    fi
+
     # If the builddir already exists, just run ninja, not meson
     if [ $use_meson != 0 ] && [ -e ${DIR_CONFIG}/builddir ]; then
 	:
@@ -758,7 +767,7 @@
     fi
 
 
-    $BUILDCMD
+    $BUILDCMD || exit 1
     if [ $? -ne 0 ]; then
 	# Rerun with Automake silent rules disabled to see failing gcc statement
 	if [ X"$RETRY_VERBOSE" != X ]; then
@@ -847,7 +856,10 @@
 	fi
     fi
 
+    process $module "$component" "$confopts" || \
+    process $module "$component" "$confopts" || \
     process $module "$component" "$confopts"
+
     process_rtn=$?
     if [ X"$BUILT_MODULES_FILE" != X ]; then
 	if [ $process_rtn -ne 0 ]; then
@@ -1042,8 +1054,16 @@
     build util macros
     build font util
     build doc xorg-sgml-doctools
-    build doc xorg-docs
+#   build doc xorg-docs
+
+    # Work-around for an odd bug: xorgproto doesn't install all
+    # of the ".pc" files produced
+    #    
+    PCFDIR=$PRODTREE/xorg/lib/pkgconfig
+    mkdir -p $PCFDIR
     build proto xorgproto
+    cp -p proto/xorgproto/*.pc $PCFDIR/
+
     build proto xcbproto
     build lib libxcvt
     build lib libxtrans
@@ -1077,6 +1097,12 @@
     build lib libXrender
     build lib libXdamage
     build lib libXcursor
+
+    TEMPX=$PRODTREE/xorg/lib
+    build lib liboldXfont
+    ln -nsf liboldXfont.so.1 $TEMPX/libXfont.so.1
+    ln -nsf libXfont.so.1    $TEMPX/libXfont.so
+
     build lib libXfont
     build lib libXft
     build lib libXi
@@ -1098,8 +1124,16 @@
     build lib libXxf86vm
     build lib libpciaccess
     build pixman pixman
+    build lib libglvnd
+
+    CFSAVE=$MESON_CONFFLAGS
+    MESON_CONFFLAGS="$CONFMESADRM"
     build mesa drm
+    MESON_CONFFLAGS="$CONFMESA"
     build mesa mesa
+    MESON_CONFFLAGS=$CFSAVE
+    CFSAVE=
+
     build data bitmaps
     build app appres
     build util bdftopcf
@@ -1117,7 +1151,7 @@
     build app mkfontscale
     build app oclock
     build app rgb
-    build test rendercheck
+#   build test rendercheck
     build app rstart
     build app scripts
     build app sessreg
@@ -1186,18 +1220,25 @@
     build app xwd
     build app xwininfo
     build app xwud
+    build lib libepoxy
+
+    CFSAVE=$CONFFLAGS
+    CONFFLAGS="$CONFFLAGS $CONFXSERVER"
     build xserver ""
+    CONFFLAGS=$CFSAVE
+    CFSAVE=
+
     case $HOST_OS in
 	Linux)
-	    build libevdev libevdev
-	    build libinput libinput
+#	    build libevdev libevdev  # Built externally
+#	    build libinput libinput  # Ditto
 	    ;;
     esac
     case $HOST_OS in
 	Linux)
 	    build driver xf86-input-evdev
 	    build driver xf86-input-joystick
-	    build driver xf86-input-libinput
+#	    build driver xf86-input-libinput  # Built externally
 	    ;;
 	FreeBSD | NetBSD | OpenBSD | Dragonfly | GNU/kFreeBSD)
 	    build driver xf86-input-joystick
@@ -1212,7 +1253,7 @@
         Darwin)
 	    ;;
 	*)
-	    build driver xf86-input-keyboard
+#	    build driver xf86-input-keyboard
 	    build driver xf86-input-mouse
 	    build driver xf86-input-synaptics
 	    build driver xf86-input-void
@@ -1230,13 +1271,13 @@
 		    ;;
 		Linux)
 		    build driver xf86-video-sisusb
-		    build driver xf86-video-sunffb
-		    build driver xf86-video-v4l
-		    build driver xf86-video-xgixp
+#		    build driver xf86-video-sunffb
+#		    build driver xf86-video-v4l
+#		    build driver xf86-video-xgixp
 		    case $HOST_CPU in
 			i*86)
 	                    # AMD Geode CPU. Driver contains 32 bit assembler code
-			    build driver xf86-video-geode
+#			    build driver xf86-video-geode
 			    ;;
 		    esac
 		    ;;
@@ -1251,37 +1292,37 @@
 		    ;;
 		i*86 | amd64 | x86_64 | i86pc)
 	            build driver xf86-video-i740
-	            build driver xf86-video-intel
+	            # build driver xf86-video-intel
 		    ;;
 	    esac
 	    build driver xf86-video-amdgpu
-	    build driver xf86-video-apm
-	    build driver xf86-video-ark
+#	    build driver xf86-video-apm
+#	    build driver xf86-video-ark
 	    build driver xf86-video-ast
 	    build driver xf86-video-ati
 	    build driver xf86-video-chips
 	    build driver xf86-video-cirrus
 	    build driver xf86-video-dummy
-	    build driver xf86-video-fbdev
-	    build driver xf86-video-glint
+#	    build driver xf86-video-fbdev
+#	    build driver xf86-video-glint
 	    build driver xf86-video-i128
-	    build driver xf86-video-mach64
+#	    build driver xf86-video-mach64
 	    build driver xf86-video-mga
 	    build driver xf86-video-neomagic
-	    build driver xf86-video-nested
-	    build driver xf86-video-nv
-	    build driver xf86-video-rendition
+#	    build driver xf86-video-nested
+#	    build driver xf86-video-nv
+#	    build driver xf86-video-rendition
 	    build driver xf86-video-r128
-	    build driver xf86-video-s3
-	    build driver xf86-video-s3virge
-	    build driver xf86-video-savage
-	    build driver xf86-video-siliconmotion
+#	    build driver xf86-video-s3
+#	    build driver xf86-video-s3virge
+#	    build driver xf86-video-savage
+#	    build driver xf86-video-siliconmotion
 	    build driver xf86-video-sis
 	    build driver xf86-video-tdfx
-	    build driver xf86-video-tga
-	    build driver xf86-video-trident
-	    build driver xf86-video-tseng
-	    build driver xf86-video-vesa
+#	    build driver xf86-video-tga
+#	    build driver xf86-video-trident
+#	    build driver xf86-video-tseng
+#	    build driver xf86-video-vesa
 	    build driver xf86-video-vmware
 	    build driver xf86-video-voodoo
 	    ;;
@@ -1619,4 +1660,3 @@
     done
     echo ""
 fi
-