Try fixing mesa-git again
Some checks failed
PikaOS Package Build & Release (amd64-v3 on debian) / build (push) Successful in 12m44s
PikaOS Package Build & Release (i386) / build (push) Failing after 17s

This commit is contained in:
Ward from fusion-voyager-3 2024-09-17 19:21:31 +03:00
parent c2188c0003
commit ff4e963f21
5 changed files with 12 additions and 4 deletions

View File

@ -1 +1 @@
12
13

View File

@ -1 +1 @@
11
13

2
debian/control vendored
View File

@ -65,7 +65,7 @@ Build-Depends:
bindgen (>= 0.66.1~) [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
cbindgen [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
llvm-spirv-18 [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
libllvmspirvlib-18-dev [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
libllvmspirvlib-18-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
librust-paste-dev [amd64 arm64 armhf ppc64 riscv64 x32],
librust-syn-dev [amd64 arm64 armhf ppc64 riscv64 x32],
Rules-Requires-Root: no

2
debian/rules vendored
View File

@ -54,7 +54,7 @@ confflags_OSMESA = -Dosmesa=true
confflags_SSE2 = -Dsse2=true
confflags_TEFLON = -Dteflon=false
LLVM_ARCHS = amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
LLVM_ARCHS = amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
RUSTICL_ARCHS = amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32
NVK_ARCHS = amd64 arm64 armhf ppc64 riscv64 x32
VALGRIND_ARCHS = amd64 arm64 armhf i386 mips64el powerpc ppc64 ppc64el s390x

View File

@ -8,6 +8,14 @@ echo "$PIKA_BUILD_ARCH" > pika-build-arch
VERSION="24.4"
# TEMP I386 SPECFIC FIX
if [[ "$PIKA_BUILD_ARCH" == "i386" ]]
then
wget http://ftp.us.debian.org/debian/pool/main/s/spirv-llvm-translator-18/libllvmspirvlib-18-dev_18.1.4-1_i386.deb -O ./32bit-spirv.deb
apt install -y ./32bit-spirv.deb
fi
#
# Clone Upstream
git clone https://gitlab.freedesktop.org/mesa/mesa mesa-git
cp -rvf ./debian ./mesa-git/