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..d71fd98d7c1 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 @@ -57,35 +57,15 @@ else # hurd also lacks *_CLOEXEC EGL_PLATFORMS += wayland - GALLIUM_DRIVERS += nouveau r300 r600 virgl confflags_DIRECT_RENDERING = -Dglx-direct=true confflags_DRI3 = -Ddri3=enabled confflags_GBM = -Dgbm=enabled confflags_GALLIUM += -Dgallium-extra-hud=true - confflags_GALLIUM += -Dgallium-vdpau=enabled confflags_GALLIUM += -Dlmsensors=enabled - # Freedreno requires arm in addition - ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU))) - GALLIUM_DRIVERS += freedreno - endif - # etnaviv, tegra, vc4 and v3d kernel support are only available on armhf and arm64 ifneq (,$(filter $(DEB_HOST_ARCH), armhf arm64)) - GALLIUM_DRIVERS += etnaviv panfrost svga tegra vc4 v3d - VULKAN_DRIVERS += broadcom freedreno - endif - - ifneq (,$(filter $(DEB_HOST_ARCH), armhf arm64 loong64 riscv64)) - GALLIUM_DRIVERS += lima - endif - - # Build intel drivers on archs where libdrm-intel is installed - ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32)) - GALLIUM_DRIVERS += crocus i915 iris svga - VULKAN_DRIVERS += intel intel_hasvk - # svga needs xa state tracker - confflags_GALLIUM += -Dgallium-xa=enabled + GALLIUM_DRIVERS += etnaviv endif ifneq (,$(filter $(DEB_HOST_ARCH), amd64)) @@ -96,15 +76,9 @@ 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))) - GALLIUM_DRIVERS += radeonsi zink # Only enable amd on riscv64, swrast needs CPU JIT support which doesn't work properly yet ifneq (,$(filter $(DEB_HOST_ARCH), riscv64)) @@ -128,16 +102,11 @@ else confflags_GALLIUM += -Dgallium-rusticl=true endif - # nine makes sense only on archs that build wine - ifneq (,$(filter $(DEB_HOST_ARCH), $(WINE_ARCHS))) - confflags_GALLIUM += -Dgallium-nine=true - endif else confflags_GALLIUM += -Dllvm=disabled endif ifeq (,$(filter pkg.mesa.nolibva,$(DEB_BUILD_PROFILES))) - confflags_GALLIUM += -Dgallium-va=enabled confflags_GALLIUM += -Dvideo-codecs="all" endif endif @@ -235,20 +204,6 @@ override_dh_install: mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so \ debian/libgl1-mesa-dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/ - ifneq ($(DEB_HOST_ARCH_OS), hurd) - # Copy the hardlinked vdpau drivers correctly. - install -m755 -d debian/mesa-vdpau-drivers/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/ - mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/libvdpau*.so* \ - debian/mesa-vdpau-drivers/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/ - - ifeq (,$(filter pkg.mesa.nolibva,$(DEB_BUILD_PROFILES))) - # Copy the hardlinked va drivers correctly. - install -m755 -d debian/mesa-va-drivers/usr/lib/${DEB_HOST_MULTIARCH}/dri/ - mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_drv_video.so \ - debian/mesa-va-drivers/usr/lib/${DEB_HOST_MULTIARCH}/dri/ - endif - endif - ifneq (,$(filter $(DEB_HOST_ARCH), $(RUSTICL_ARCHS))) install -m755 -d debian/mesa-opencl-icd/etc/OpenCL/vendors mv debian/tmp/etc/OpenCL/vendors/rusticl.icd \