Arch: Un-bitrot

Author: Sonicadvance1

Configs/Arch.json

@@ -118,8 +118,7 @@
     "Scripts/Arch/cross_x86",
     "Scripts/Arch/mega_install_packages.sh",
     "Scripts/Arch/build_install_mesa.sh",
-    "Scripts/Arch/break_chroot.sh",
-    "Scripts/Arch/unbreak_chroot.sh"
+    "Scripts/chroot.py"
   ],
 
   "CopyFiles_Stage1_CMT": [
@@ -132,8 +131,7 @@
     ["cross_x86", "root/"],
     ["mega_install_packages.sh", "root/"],
     ["build_install_mesa.sh", "root/"],
-    ["break_chroot.sh", "/"],
-    ["unbreak_chroot.sh", "/"]
+    ["chroot.py", "/"]
   ],
 
   "Commands_Stage1_0_CMT": [
@@ -188,6 +186,7 @@
     "pacman-key --populate",
     "sed -i 's/#Server = https:\\/\\/geo.mirror.pkgbuild.com\\/$repo\\/os\\/$arch\/Server = https:\\/\\/geo.mirror.pkgbuild.com\\/$repo\\/os\\/$arch\/' /etc/pacman.d/mirrorlist",
     "sed -i 's/CheckSpace/#CheckSpace/' /etc/pacman.conf",
+    "sed -i 's/#ParallelDownloads = 5/ParallelDownloads = 20/' /etc/pacman.conf",
     "pacman --noconfirm -Syu",
     "pacman --noconfirm -S perl",
     "perl -0777 -pi -e 's/#\\[multilib\\]\\n#Include\/\\[multilib\\]\\nInclude\/igs' /etc/pacman.conf",
@@ -208,7 +207,7 @@
     "find /sbin/ /bin/ /usr/bin/ -perm /2000 -delete",
     "pacman --noconfirm -R rust-bindgen sudo clang gcc rust",
     "pacman --noconfirm -Scc",
-    "sh ./break_chroot.sh"
+    "chmod +r /usr/lib/dbus-daemon-launch-helper"
   ],
 
   "Commands_Stage2_CMT": [
@@ -218,6 +217,10 @@
 
   "Commands_Stage2": [
     "export ROOTFS=./RootFS",
+    "reset",
+    "echo 'Breaking'",
+    "python3 $ROOTFS/chroot.py break",
+    "echo 'Did it'",
     "umount $ROOTFS/proc/",
     "umount -R $ROOTFS/sys/",
     "umount -R $ROOTFS/dev/pts/",

Scripts/Arch/build_install_mesa.sh

@@ -10,6 +10,8 @@ pacman --noconfirm -S \
   libpciaccess lib32-libpciaccess \
   glslang \
   python-mako \
+  python-yaml \
+  python-ply \
   libglvnd lib32-libglvnd \
   byacc flex bison \
   wayland-protocols \
@@ -29,10 +31,10 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 cd /root
 
 # Clone meson
-git clone --depth=1 --branch 1.3.1 https://github.com/mesonbuild/meson.git
+git clone --depth=1 --branch 1.5.1 https://github.com/mesonbuild/meson.git
 
 # Build and install DRM
-git clone --depth=1 --branch libdrm-2.4.119 https://gitlab.freedesktop.org/mesa/drm.git
+git clone --depth=1 --branch libdrm-2.4.122 https://gitlab.freedesktop.org/mesa/drm.git
 cd drm
 
 mkdir Build
@@ -69,16 +71,13 @@ ninja install
 cd /root
 
 # Build and install mesa
-git clone --depth=1 --branch mesa-24.1.0 https://gitlab.freedesktop.org/mesa/mesa.git
+git clone --depth=1 --branch mesa-24.3.3 https://gitlab.freedesktop.org/mesa/mesa.git
 cd mesa
 mkdir Build
 mkdir Build_x86
 
-# Update asahi
-sed -i 's/native : true/native : not meson.can_run_host_binaries()/g' src/asahi/clc/meson.build
-
-export GALLIUM_DRIVERS="r300,r600,radeonsi,nouveau,virgl,svga,swrast,iris,kmsro,v3d,vc4,freedreno,etnaviv,tegra,lima,panfrost,zink,asahi,d3d12"
-export VULKAN_DRIVERS="amd,broadcom,freedreno,panfrost,swrast,virtio,nouveau"
+export GALLIUM_DRIVERS="r300,r600,radeonsi,nouveau,virgl,svga,swrast,v3d,vc4,freedreno,etnaviv,tegra,lima,panfrost,zink,d3d12,asahi,iris"
+export VULKAN_DRIVERS="amd,broadcom,freedreno,panfrost,swrast,virtio,nouveau,intel,asahi"
 
 # Needed for rusticl
 rustup target add i686-unknown-linux-gnu
@@ -92,7 +91,7 @@ cd Build
   -Dgallium-drivers=$GALLIUM_DRIVERS \
   -Dvulkan-drivers=$VULKAN_DRIVERS \
   -Dplatforms=x11,wayland \
-  -Dfreedreno-kmds=msm,virtio \
+  -Dfreedreno-kmds=msm,virtio,kgsl \
   -Dglvnd=enabled \
   -Dc_args="-mfpmath=sse -msse -msse2 -mstackrealign" \
   -Dcpp_args="-mfpmath=sse -msse -msse2 -mstackrealign" \
@@ -106,15 +105,16 @@ cd Build_x86
 
 # Asahi and Iris disabled because {asahi,intel}_clc fail to link to the correct libclang-cpp
 # Same issue with rusticl
-export GALLIUM_DRIVERS="r300,r600,radeonsi,nouveau,virgl,svga,swrast,kmsro,v3d,vc4,freedreno,etnaviv,tegra,lima,panfrost,zink,d3d12"
+export GALLIUM_DRIVERS="r300,r600,radeonsi,nouveau,virgl,svga,swrast,v3d,vc4,freedreno,etnaviv,tegra,lima,panfrost,zink,d3d12"
+export VULKAN_DRIVERS="amd,broadcom,freedreno,panfrost,swrast,virtio"
 /root/meson/meson.py setup -Dprefix=/usr -Dlibdir=/usr/lib32 \
   -Dbuildtype=release \
   -Db_ndebug=true \
   -Dgallium-rusticl=false -Dopencl-spirv=false -Dshader-cache=enabled -Dllvm=enabled \
   -Dgallium-drivers=$GALLIUM_DRIVERS \
   -Dvulkan-drivers=$VULKAN_DRIVERS \
   -Dplatforms=x11,wayland \
-  -Dfreedreno-kmds=msm,virtio \
+  -Dfreedreno-kmds=msm,virtio,kgsl \
   -Dglvnd=enabled \
   -Dc_args="-m32 -mfpmath=sse -msse -msse2 -mstackrealign" \
   -Dcpp_args="-m32 -mfpmath=sse -msse -msse2 -mstackrealign" \