Skip to content

Commit 18d47df

Browse files
committed
Update Ubuntu 22.04
1 parent 8ea4a5f commit 18d47df

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

RootFS_links.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,15 @@
101101
"Ubuntu 22.04 (EroFS)": {
102102
"DistroMatch": "ubuntu",
103103
"DistroVersion": "22.04",
104-
"URL": "https://rootfs.fex-emu.gg/Ubuntu_22_04/2024-05-27/Ubuntu_22_04.ero",
105-
"Hash": "ff74a1c4da907bb5",
104+
"URL": "https://rootfs.fex-emu.gg/Ubuntu_22_04/2025-01-08/Ubuntu_22_04.ero",
105+
"Hash": "b02ee3a21ec0624e",
106106
"Type": "erofs"
107107
},
108108
"Ubuntu 22.04 (SquashFS)": {
109109
"DistroMatch": "ubuntu",
110110
"DistroVersion": "22.04",
111-
"URL": "https://rootfs.fex-emu.gg/Ubuntu_22_04/2024-05-27/Ubuntu_22_04.sqsh",
112-
"Hash": "e3a49a375d10dc59",
111+
"URL": "https://rootfs.fex-emu.gg/Ubuntu_22_04/2025-01-08/Ubuntu_22_04.sqsh",
112+
"Hash": "73c9269e4c4ca172",
113113
"Type": "squashfs"
114114
},
115115
"Ubuntu 20.04 (EroFS)": {

Scripts/Ubuntu_22_04/build_install_mesa.sh

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ export CC=clang-15
6464
export CXX=clang++-15
6565

6666
# Clone meson
67-
git clone --depth=1 --branch 1.3.1 https://github.com/mesonbuild/meson.git
67+
git clone --depth=1 --branch 1.5.1 https://github.com/mesonbuild/meson.git
6868

6969
# Build and install DRM
70-
git clone --depth=1 --branch libdrm-2.4.119 https://gitlab.freedesktop.org/mesa/drm.git
70+
git clone --depth=1 --branch libdrm-2.4.122 https://gitlab.freedesktop.org/mesa/drm.git
7171
cd drm
7272

7373
mkdir Build
@@ -104,15 +104,13 @@ ninja install
104104
cd /root
105105

106106
# Build and install mesa
107-
git clone --depth=1 --branch mesa-24.1.0 https://gitlab.freedesktop.org/mesa/mesa.git
107+
git clone --depth=1 --branch mesa-24.3.3 https://gitlab.freedesktop.org/mesa/mesa.git
108108
cd mesa
109109
mkdir Build
110110
mkdir Build_x86
111111

112-
# Update asahi
113-
sed -i 's/native : true/native : not meson.can_run_host_binaries()/g' src/asahi/clc/meson.build
114-
115-
export GALLIUM_DRIVERS="r300,r600,radeonsi,nouveau,virgl,svga,swrast,iris,kmsro,v3d,vc4,freedreno,etnaviv,tegra,lima,panfrost,zink,asahi,d3d12"
112+
# Iris, anv, and Asahi disabled because it fails to find opencl-c-base.h for some reason.
113+
export GALLIUM_DRIVERS="r300,r600,radeonsi,nouveau,virgl,svga,swrast,v3d,vc4,freedreno,etnaviv,tegra,lima,panfrost,zink,d3d12"
116114
export VULKAN_DRIVERS="amd,broadcom,freedreno,panfrost,swrast,virtio,nouveau"
117115

118116
cd Build
@@ -137,9 +135,9 @@ cd Build_x86
137135

138136
apt-get install -y spirv-tools:i386 glslang-tools:i386
139137

140-
# Iris and Asahi use libclc. 32-bit doesn't exist on Ubuntu 22.04.
141-
# Rusticl disabled for the same reason
142-
export GALLIUM_DRIVERS="r300,r600,radeonsi,nouveau,virgl,svga,swrast,kmsro,v3d,vc4,freedreno,etnaviv,tegra,lima,panfrost,zink,d3d12"
138+
# Rusticl disabled because of libclang conflict.
139+
# Same with NVK
140+
export VULKAN_DRIVERS="amd,broadcom,freedreno,panfrost,swrast,virtio"
143141
/root/meson/meson.py setup -Dprefix=/usr -Dlibdir=/usr/lib/i386-linux-gnu \
144142
-Dbuildtype=release \
145143
-Db_ndebug=true \

0 commit comments

Comments
 (0)