diff --git a/mesa-aco/debian/control b/mesa-aco/debian/control index e2f4022..063a2eb 100644 --- a/mesa-aco/debian/control +++ b/mesa-aco/debian/control @@ -49,10 +49,13 @@ Build-Depends: libclang-15-dev | libclang-14-dev | libclang-13-dev | libclang-12-dev, libclang-cpp15-dev | libclang-cpp14-dev | libclang-cpp13-dev | libclang-cpp12-dev, libclc-15-dev | libclc-14-dev | libclc-13-dev | libclc-12-dev, + libllvmspirvlib-15-dev | libllvmspirvlib-14-dev | libllvmspirvlib-13-dev | libllvmspirvlib-12-dev, wayland-protocols (>= 1.24), zlib1g-dev, libglvnd-core-dev (>= 1.3.2), valgrind [amd64 arm64 armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x], + bindgen | build-essential, + rustc, Vcs-Git: https://salsa.debian.org/xorg-team/lib/mesa.git Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa Homepage: https://mesa3d.org/ diff --git a/mesa-aco/debian/mesa-opencl-icd.install b/mesa-aco/debian/mesa-opencl-icd.install index 0784638..27fd935 100644 --- a/mesa-aco/debian/mesa-opencl-icd.install +++ b/mesa-aco/debian/mesa-opencl-icd.install @@ -1,3 +1,5 @@ etc/OpenCL/vendors/mesa.icd +etc/OpenCL/vendors/rusticl.icd usr/lib/*/gallium-pipe/*.so usr/lib/*/libMesaOpenCL* +usr/lib/*/libRusticlOpenCL* diff --git a/mesa-aco/debian/rules b/mesa-aco/debian/rules index 952a766..2af3da8 100755 --- a/mesa-aco/debian/rules +++ b/mesa-aco/debian/rules @@ -12,6 +12,9 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +dpkg_late_eval ?= $(or $(value DPKG_CACHE_$(1)),$(eval DPKG_CACHE_$(1) := $(shell $(2)))$(value DPKG_CACHE_$(1))) +DEB_DISTRIBUTION = $(call dpkg_late_eval,DEB_DISTRIBUTION,dpkg-parsechangelog -SDistribution) + # for finding the correct llvm-config when meson doesn't know about it yet export PATH:=/usr/lib/llvm-15/bin/:/usr/lib/llvm-14/bin/:/usr/lib/llvm-13/bin/:/usr/lib/llvm-12/bin/:/usr/lib/llvm-11/bin/:$(PATH) @@ -125,6 +128,9 @@ else GALLIUM_DRIVERS += radeonsi confflags_GALLIUM += -Dllvm=enabled confflags_GALLIUM += -Dgallium-opencl=icd + ifneq ($(DEB_DISTRIBUTION),focal) + confflags_GALLIUM += -Dgallium-rusticl=true + endif # nine makes sense only on archs that build wine ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 powerpc))