From e241c2e6e0a899b2979426d5434e33be93f9e589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ernst=20Sj=C3=B6strand?= Date: Sat, 13 May 2023 01:01:57 +0200 Subject: [PATCH] mesa-git: enable rusticl for kinetic and lunar Fixes #14 --- mesa-git/debian/control | 5 ++++- mesa-git/debian/mesa-opencl-icd.install | 4 ++-- mesa-git/debian/rules | 10 ++++++++++ mesa-git/settings.sh | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/mesa-git/debian/control b/mesa-git/debian/control index e2f4022..83437bb 100644 --- a/mesa-git/debian/control +++ b/mesa-git/debian/control @@ -2,7 +2,6 @@ Source: mesa Section: graphics Priority: optional Maintainer: Ernst Sjöstrand -Uploaders: Andreas Boll Standards-Version: 4.1.4 Build-Depends: debhelper (>= 11), @@ -53,6 +52,10 @@ Build-Depends: zlib1g-dev, libglvnd-core-dev (>= 1.3.2), valgrind [amd64 arm64 armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x], +# Bindgen is not available on focal and there's no 32-bit build, so only build rusticl on amd64 >= jammy + libllvmspirvlib-15-dev [amd64] | libllvmspirvlib-14-dev [amd64] | bash-doc, + bindgen [amd64] | bash-doc, + rustc [amd64] | bash-doc, 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-git/debian/mesa-opencl-icd.install b/mesa-git/debian/mesa-opencl-icd.install index 0784638..a4381cf 100644 --- a/mesa-git/debian/mesa-opencl-icd.install +++ b/mesa-git/debian/mesa-opencl-icd.install @@ -1,3 +1,3 @@ -etc/OpenCL/vendors/mesa.icd +etc/OpenCL/vendors/*.icd usr/lib/*/gallium-pipe/*.so -usr/lib/*/libMesaOpenCL* +usr/lib/*/lib*OpenCL* diff --git a/mesa-git/debian/rules b/mesa-git/debian/rules index 952a766..87b0a64 100755 --- a/mesa-git/debian/rules +++ b/mesa-git/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) @@ -126,6 +129,13 @@ else confflags_GALLIUM += -Dllvm=enabled confflags_GALLIUM += -Dgallium-opencl=icd + # Rusticl! + ifeq (,$(filter $(DEB_DISTRIBUTION),bionic focal jammy)) + ifeq ($(DEB_HOST_ARCH),amd64) + confflags_GALLIUM += -Dgallium-rusticl=true + endif + endif + # nine makes sense only on archs that build wine ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 powerpc)) confflags_GALLIUM += -Dgallium-nine=true diff --git a/mesa-git/settings.sh b/mesa-git/settings.sh index aa5df45..0ee69dd 100644 --- a/mesa-git/settings.sh +++ b/mesa-git/settings.sh @@ -2,5 +2,5 @@ PACKAGE_NAME=mesa GIT="https://gitlab.freedesktop.org/mesa/mesa.git" GITBRANCH="staging/23.1" DISTROS="focal jammy kinetic lunar" -INC=1 +INC=2 PPA=mesarc