build.sh: use gitlab, not anongit

Wellllllllcooooomee to the wooorld of tomoorooooow!

Also, this way we no longer fail on libxcvt which didn't get a
membership card to the exclusive anongit club.

A bunch of repos are in different paths or prefixes now, so adjust that
as necessary.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

1 files changed, 18 insertions, 18 deletions

diff --git a/build.sh b/build.sh
index fcf357d..e0e7e4a 100755
--- a/build.sh
+++ b/build.sh
@@ -135,7 +135,7 @@
 #               Each module/components is invoked with --localstatedir
 #   QUIET       Do not print messages saying which checks are being made
 #               Each module/components is invoked with --quite
-#   GITROOT     Source code repository path [git://anongit.freedesktop.org/git]
+#   GITROOT     Source code repository path [https://gitlab.freedesktop.org/]
 #               Optional when using --clone to update source code before building
 #   GITCLONEOPTS Options passed to git clone.
 #               Optional when using --clone to update source code before building
@@ -522,7 +522,7 @@ clone() {
         BASEDIR=""
         ;;
     "libinput")
-	BASEDIR="wayland/"
+	BASEDIR=""
 	;;
     *)
         BASEDIR="xorg/"
@@ -530,7 +530,7 @@ clone() {
     esac
 
     DIR="$module${component:+/}$component"
-    GITROOT=${GITROOT:="git://anongit.freedesktop.org/git"}
+    GITROOT=${GITROOT:="https://gitlab.freedesktop.org/"}
 
     if [ ! -d "$DIR" ]; then
         git clone $GITCLONEOPTS "$GITROOT/$BASEDIR$DIR" "$DIR"
@@ -1035,18 +1035,18 @@ build_all_modules() {
     build doc xorg-sgml-doctools
     build doc xorg-docs
     build proto xorgproto
-    build xcb proto
+    build proto xcbproto
     build lib libxcvt
     build lib libxtrans
     build lib libXau
     build lib libXdmcp
-    build xcb pthread-stubs
-    build xcb libxcb
-    build xcb util
-    build xcb util-image
-    build xcb util-keysyms
-    build xcb util-renderutil
-    build xcb util-wm
+    build lib pthread-stubs
+    build lib libxcb
+    build lib libxcb-util
+    build lib libxcb-image
+    build lib libxcb-keysyms
+    build lib libxcb-render-util
+    build lib libxcb-wm
     build lib libX11
     build lib libXext
     case $HOST_OS in
@@ -1087,12 +1087,12 @@ build_all_modules() {
     build lib libXxf86dga
     build lib libXxf86vm
     build lib libpciaccess
-    build pixman ""
+    build pixman pixman
     build mesa drm
     build mesa mesa
     build data bitmaps
     build app appres
-    build app bdftopcf
+    build util bdftopcf
     build app beforelight
     build app bitmap
     build app editres
@@ -1107,7 +1107,7 @@ build_all_modules() {
     build app mkfontscale
     build app oclock
     build app rgb
-    build app rendercheck
+    build test rendercheck
     build app rstart
     build app scripts
     build app sessreg
@@ -1116,7 +1116,7 @@ build_all_modules() {
     build app smproxy
     build app twm
     build app viewres
-    build app x11perf
+    build test x11perf
     build app xauth
     build app xbacklight
     build app xbiff
@@ -1179,8 +1179,8 @@ build_all_modules() {
     build xserver ""
     case $HOST_OS in
 	Linux)
-	    build libevdev ""
-	    build libinput ""
+	    build libevdev libevdev
+	    build libinput libinput
 	    ;;
     esac
     case $HOST_OS in
@@ -1318,7 +1318,7 @@ build_all_modules() {
     build util gccmakedep
     build util lndir
     build util makedepend
-    build xkeyboard-config ""
+    build xkeyboard-config xkeyboard-config
     return 0
 }