diff --git a/debian/control b/debian/control index 2390f05b782..98e343ee9ae 100644 --- a/debian/control +++ b/debian/control @@ -6,12 +6,12 @@ Uploaders: Andreas Boll Standards-Version: 4.1.4 Build-Depends: debhelper-compat (= 13), - directx-headers-dev (>= 1.610.0) [linux-amd64 linux-arm64], + directx-headers-dev (>= 1.606.0) [linux-amd64 linux-arm64], glslang-tools [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - meson (>= 1.3.1), + meson (>= 1.0.1), quilt (>= 0.63-8.2~), pkg-config, - libdrm-dev (>= 2.4.119), + libdrm-dev (>= 2.4.114), libx11-dev, libxxf86vm-dev, libexpat1-dev, @@ -44,19 +44,19 @@ Build-Depends: libelf-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], libwayland-dev (>= 1.15.0) [linux-any], libwayland-egl-backend-dev (>= 1.15.0) [linux-any], - llvm-17-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - libclang-17-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - libclang-cpp17-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], - libclc-17-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + llvm-16-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclang-16-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclang-cpp16-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclc-16-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], wayland-protocols (>= 1.24), zlib1g-dev, libglvnd-core-dev (>= 1.3.2), valgrind [amd64 arm64 armhf i386 mips64el powerpc ppc64 ppc64el s390x], rustc [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x x32], - bindgen (>= 0.66.1~) [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x x32], - llvm-spirv-17 [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x x32], - libclc-17 [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x x32], - libllvmspirvlib-17-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + bindgen (>= 0.60.1~) [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x x32], + llvm-spirv-14 [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x x32], + libclc-16 [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x x32], + libllvmspirvlib-14-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/xorg-team/lib/mesa.git Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa @@ -381,7 +381,7 @@ Section: libs Architecture: amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32 Pre-Depends: ${misc:Pre-Depends} Depends: - libclc-17, + libclc-16, ocl-icd-libopencl1 | libopencl1, ${shlibs:Depends}, ${misc:Depends}, diff --git a/debian/rules b/debian/rules index 9c65873ab23..75bd51f13a8 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) # for finding the correct llvm-config when meson doesn't know about it yet -LLVM_VERSION = 17 +LLVM_VERSION = 16 export PATH:=/usr/lib/llvm-$(LLVM_VERSION)/bin/:$(PATH) export DEB_BUILD_MAINT_OPTIONS=optimize=-lto @@ -96,11 +96,6 @@ else confflags_VALGRIND += -Dvalgrind=enabled endif - # WSL supports only amd64 and arm64 - ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64)) - GALLIUM_DRIVERS += d3d12 - endif - # LLVM is required for building r300g, radeonsi and llvmpipe drivers. # It's also required for building OpenCL support. ifneq (,$(filter $(DEB_HOST_ARCH), $(LLVM_ARCHS)))