gfx-packages/mesa-git
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix weird distro check
Some checks failed
PikaOS Package Build & Release (Canary) (amd64-v3) / build (push) Failing after 10m40s
Details

Browse Source
This commit is contained in:
Ward from fusion-voyager-3 2024-07-29 22:45:04 +03:00
parent d0889bfa96
commit 211dea2b75
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/release-canary-v3 vendored
View File

@ -1 +1 @@
2 3

21
debian/rules vendored
View File

@ -73,7 +73,7 @@ else
# Freedreno requires arm in addition # Freedreno requires arm in addition
ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU))) ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU)))
GALLIUM_DRIVERS += freedreno GALLIUM_DRIVERS += freedreno
# XXX: broken # broken
# GALLIUM_DRIVERS += asahi # GALLIUM_DRIVERS += asahi
endif endif
@ -140,12 +140,8 @@ else
# Build rusticl for archs where rustc is available # Build rusticl for archs where rustc is available
ifneq (,$(filter $(DEB_HOST_ARCH), $(RUSTICL_ARCHS))) ifneq (,$(filter $(DEB_HOST_ARCH), $(RUSTICL_ARCHS)))
ifneq ($(DEB_DISTRIBUTION), xxx)
confflags_GALLIUM += -Dgallium-rusticl=false
else
confflags_GALLIUM += -Dgallium-rusticl=true confflags_GALLIUM += -Dgallium-rusticl=true
endif endif
endif
# nine makes sense only on archs that build wine # nine makes sense only on archs that build wine
ifneq (,$(filter $(DEB_HOST_ARCH), $(WINE_ARCHS))) ifneq (,$(filter $(DEB_HOST_ARCH), $(WINE_ARCHS)))
@ -201,7 +197,6 @@ confflags += \
$(confflags_SSE2) \ $(confflags_SSE2) \
$(confflags_VALGRIND) $(confflags_VALGRIND)
override_dh_clean: regen_control override_dh_clean: regen_control
sed -i 's/-.*//' VERSION sed -i 's/-.*//' VERSION
rm -rf .pc rm -rf .pc
@ -241,6 +236,7 @@ override_dh_installchangelogs:
override_dh_install: override_dh_install:
# purge .la files # purge .la files
find debian/tmp/ -name '*.la' -exec rm '{}' ';' find debian/tmp/ -name '*.la' -exec rm '{}' ';'
# nvk:
find debian/tmp/usr/bin -name 'mme_*_sim_hw_test' -exec rm '{}' ';' find debian/tmp/usr/bin -name 'mme_*_sim_hw_test' -exec rm '{}' ';'
# Get rid of some files which aren't installed. Do not # Get rid of some files which aren't installed. Do not
@ -270,24 +266,24 @@ override_dh_install:
endif endif
endif endif
ifneq (,$(filter $(DEB_HOST_ARCH), $(RUSTICL_ARCHS))) ifneq (,$(filter $(DEB_HOST_ARCH), $(RUSTICL_ARCHS)))
install -m755 -d debian/mesa-opencl-icd-git/etc/OpenCL/vendors install -m755 -d debian/mesa-opencl-icd-git/etc/OpenCL/vendors
mv debian/tmp/etc/OpenCL/vendors/rusticl.icd \ mv debian/tmp/etc/OpenCL/vendors/rusticl.icd \
debian/mesa-opencl-icd-git/etc/OpenCL/vendors debian/mesa-opencl-icd-git/etc/OpenCL/vendors
install -m755 -d debian/mesa-opencl-icd-git/usr/lib/${DEB_HOST_MULTIARCH}/ install -m755 -d debian/mesa-opencl-icd-git/usr/lib/${DEB_HOST_MULTIARCH}/
mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libRusticlOpenCL* \ mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libRusticlOpenCL* \
debian/mesa-opencl-icd-git/usr/lib/${DEB_HOST_MULTIARCH}/ debian/mesa-opencl-icd-git/usr/lib/${DEB_HOST_MULTIARCH}/
endif endif
# Copy spirv2dxil and its dependencies on architectures that support WSL/Dozen (dzn) # Copy spirv2dxil and its dependencies on architectures that support WSL/Dozen (dzn)
ifneq (,$(filter $(DEB_HOST_ARCH), $(WSL_ARCHS))) ifneq (,$(filter $(DEB_HOST_ARCH), $(WSL_ARCHS)))
install -m755 -d debian/mesa-vulkan-drivers-git/usr/bin install -m755 -d debian/mesa-vulkan-drivers-git/usr/bin
mv debian/tmp/usr/bin/spirv2dxil \ mv debian/tmp/usr/bin/spirv2dxil \
debian/mesa-vulkan-drivers-git/usr/bin debian/mesa-vulkan-drivers-git/usr/bin
install -m755 -d debian/mesa-vulkan-drivers-git/usr/lib/${DEB_HOST_MULTIARCH}/ install -m755 -d debian/mesa-vulkan-drivers-git/usr/lib/${DEB_HOST_MULTIARCH}/
mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libspirv_to_dxil.* \ mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libspirv_to_dxil.* \
debian/mesa-vulkan-drivers-git/usr/lib/${DEB_HOST_MULTIARCH}/ debian/mesa-vulkan-drivers-git/usr/lib/${DEB_HOST_MULTIARCH}/
endif endif
dh_install -a dh_install -a
@ -298,9 +294,6 @@ override_dh_install:
install -m 755 debian/local/script debian/$$p/usr/share/bug/$$p; \ install -m 755 debian/local/script debian/$$p/usr/share/bug/$$p; \
done done
override_dh_missing:
dh_missing --fail-missing
override_dh_makeshlibs: override_dh_makeshlibs:
dh_makeshlibs -a -- -c0 dh_makeshlibs -a -- -c0