Switch to new build system

Author: Laky-64

.gitignore

@@ -1 +1,3 @@
 .idea
+.buildkit
+artifacts

build.sh

@@ -1,34 +1,31 @@
-# shellcheck disable=SC1090
-source <(curl -s https://raw.githubusercontent.com/pytgcalls/build-toolkit/refs/heads/master/build-toolkit.sh)
+source /dev/stdin <<< "$(curl -s https://raw.githubusercontent.com/pytgcalls/build-toolkit/refs/heads/master/build-toolkit.sh)"
 
-UTIL_MACROS_VERSION=$(get_version "util-macros")
-XTRANS_VERSION=$(get_version "Xtrans")
-XI_VERSION=$(get_version "Xi")
-XORGPROTO_VERSION=$(get_version "xorgproto")
-XCBPROTO_VERSION=$(get_version "xcb")
+import libraries.properties
 
-build_and_install "${FREEDESKTOP_GIT}xorg/util/macros.git" "util-macros-$UTIL_MACROS_VERSION" autogen
-build_and_install "${FREEDESKTOP_GIT}xorg/lib/libxtrans.git" "xtrans-$XTRANS_VERSION" autogen
-build_and_install "${FREEDESKTOP_GIT}xorg/proto/xorgproto.git" "xorgproto-$XORGPROTO_VERSION" autogen
-build_and_install "${FREEDESKTOP_GIT}xorg/proto/xcbproto.git" "xcb-proto-$XCBPROTO_VERSION" autogen
-build_and_install "${FREEDESKTOP_GIT}xorg/lib/libXi.git" "libXi-$XI_VERSION" autogen-static --prefix=/usr
+build_and_install "macros" configure
+build_and_install "libXtrans" configure
+build_and_install "xorgproto" configure
+build_and_install "libXfixes" configure-static
+build_and_install "libXi" configure-static
+build_and_install "xcbproto" configure
 
-run mkdir -p artifacts/lib
-run mkdir -p artifacts/include
+build_and_install "libXau" configure-static
+build_and_install "libXcb" configure-static
+build_and_install "libX11" configure-static
+build_and_install "libXcomposite" configure-static
+build_and_install "libXdamage" configure-static
+build_and_install "libXext" configure-static
+build_and_install "libXrender" configure-static
+build_and_install "libXrandr" configure-static
+build_and_install "libXtst" configure-static
 
-while IFS='=' read -r lib version; do
-  echo "Processing lib${lib}..."
-  if [[ -n "$lib" && ! "$lib" =~ ^# ]]; then
-    if [[ "$lib" == "Xi" || "$lib" == "Xtrans" || "$lib" == "xorgproto" || "$lib" == "util-macros" ]]; then
-      continue
-    fi
-    echo "Cloning lib${lib}..."
-    build_and_install "${FREEDESKTOP_GIT}xorg/lib/lib${lib}.git" "lib${lib}-$version" autogen-static --prefix="$(pwd)/lib${lib}/build"
-    echo "Copying lib${lib} to artifacts/lib..."
-    run cp -r lib"${lib}"/build/lib/*.a artifacts/lib/
-    for dir in "lib${lib}"/build/include/*/; do
-      run cp -r "$dir" artifacts/include/
-    done
-  fi
-done < "$LIBRARIES_FILE"
-echo "All libraries successfully built"
+copy_libs "libXau" "artifacts"
+copy_libs "libXcb" "artifacts"
+copy_libs "libX11" "artifacts"
+copy_libs "libXcomposite" "artifacts"
+copy_libs "libXdamage" "artifacts"
+copy_libs "libXext" "artifacts"
+copy_libs "libXfixes" "artifacts"
+copy_libs "libXrender" "artifacts"
+copy_libs "libXrandr" "artifacts"
+copy_libs "libXtst" "artifacts"

libraries.properties

@@ -1,15 +1,16 @@
 # https://gitlab.com/freedesktop-sdk/mirrors/freedesktop/xorg/lib/
-Xtst=1.2.5
-X11=1.8.12
-Xext=1.3.6
-Xrender=0.9.12
-Xrandr=1.5.4
-Xfixes=6.0.1
-Xcomposite=0.4.6
-Xdamage=1.1.6
-Xtrans=1.6.0
-util-macros=1.20.2
-Xi=1.8.2
-xorgproto=2024.1
-xcb=1.17.0
-Xau=1.0.12
+gitlab.com/freedesktop-sdk/mirrors/freedesktop/xorg/lib/libXi=1.8.2
+gitlab.com/freedesktop-sdk/mirrors/freedesktop/xorg/lib/libXcb=1.17.0
+gitlab.com/freedesktop-sdk/mirrors/freedesktop/xorg/lib/libX11=1.8.12
+gitlab.com/freedesktop-sdk/mirrors/freedesktop/xorg/lib/libXau=1.0.12
+gitlab.com/freedesktop-sdk/mirrors/freedesktop/xorg/lib/libXext=1.3.6
+gitlab.com/freedesktop-sdk/mirrors/freedesktop/xorg/lib/libXtst=1.2.5
+gitlab.com/freedesktop-sdk/mirrors/freedesktop/xorg/lib/libXrandr=1.5.4
+gitlab.com/freedesktop-sdk/mirrors/freedesktop/xorg/lib/libXfixes=6.0.1
+gitlab.com/freedesktop-sdk/mirrors/freedesktop/xorg/lib/libXtrans=1.6.0
+gitlab.com/freedesktop-sdk/mirrors/freedesktop/xorg/lib/libXdamage=1.1.6
+gitlab.com/freedesktop-sdk/mirrors/freedesktop/xorg/lib/libXrender=0.9.12
+gitlab.com/freedesktop-sdk/mirrors/freedesktop/xorg/lib/libXcomposite=0.4.6
+gitlab.com/freedesktop-sdk/mirrors/freedesktop/xorg/util/macros=1.20.2
+gitlab.com/freedesktop-sdk/mirrors/freedesktop/xorg/proto/xcbproto=$libXcb
+gitlab.com/freedesktop-sdk/mirrors/freedesktop/xorg/proto/xorgproto=2024.1