From: Peter Michael Green Date: Thu, 31 Jul 2025 16:22:27 +0000 (+0000) Subject: Manual merge of version 24.0.7-1+rpi1 and 25.0.7-2 to produce 25.0.7-2+rpi1 X-Git-Tag: archive/raspbian/25.0.7-2+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6cb55dc33f78031669d974d5d9eb4677d9f91f10;p=mesa.git Manual merge of version 24.0.7-1+rpi1 and 25.0.7-2 to produce 25.0.7-2+rpi1 --- 6cb55dc33f78031669d974d5d9eb4677d9f91f10 diff --cc debian/changelog index 86fe4fc18,8d4932010..e5a7b6a63 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,424 +1,432 @@@ - mesa (24.0.7-1+rpi1) trixie-staging; urgency=medium ++mesa (25.0.7-2+rpi1) trixie-staging; urgency=medium + ++ [changes brought forward from 24.0.7-1+rpi1 by Peter Michael Green at Fri, 24 May 2024 10:55:59 +0000] + * Try to disable valgrind. + * Move valgrind from build-depends to build-conflicts. + - -- Peter Michael Green Fri, 24 May 2024 10:55:59 +0000 ++ -- Peter Michael Green Thu, 31 Jul 2025 16:08:46 +0000 ++ + mesa (25.0.7-2) unstable; urgency=medium + + * patches: Revert a commit to fix mobian vm's. (Closes: #1107895) + + -- Timo Aaltonen Tue, 17 Jun 2025 12:07:43 +0300 + + mesa (25.0.7-1) unstable; urgency=medium + + * control: Bump rustc dependency to match upstream. + * control: Bump wayland-protocols build-dep. + * control: Bump directx-headers build-dep. + * control: Bump spirv-tools build dep for Intel shader compiler. + * New upstream release. (Closes: #1105831) + * rules: Drop obsolete removals. + * patches: Drop a fix for lp2101817, since 25.0.6 carries a separate + fix for that. + * Revert a bad commit which broke Intel Haswell. (LP: #2113508) + + -- Timo Aaltonen Wed, 11 Jun 2025 17:14:37 +0300 + + mesa (25.0.5-2) unstable; urgency=medium + + [ Johannes Schauer Marin Rodrigues ] + * cherry-pick patch from upstream: etnaviv-add-support-for-texelfetch.patch + (Closes: #1104029) + + -- Timo Aaltonen Mon, 19 May 2025 13:49:49 +0300 + + mesa (25.0.5-1) unstable; urgency=medium + + [ Simon McVittie ] + * Share a single JSON manifest per Vulkan driver between all architectures + (Closes: #980148) + + [ Timo Aaltonen ] + * New upstream release. + + -- Timo Aaltonen Fri, 02 May 2025 08:32:56 +0300 + + mesa (25.0.4-1) unstable; urgency=medium + + * New upstream release. + * patches: Drop upstreamed gfxstream patches. + + -- Timo Aaltonen Tue, 22 Apr 2025 13:10:18 +0300 + + mesa (25.0.3-1) unstable; urgency=medium + + * New upstream release. + * patches: Further fixes for spam caused by gfxstream. + + -- Timo Aaltonen Thu, 03 Apr 2025 13:47:45 +0300 + + mesa (25.0.2-1) unstable; urgency=medium + + * New upstream release. + * patches: Fix spam from gfxstream. (Closes: #1100360) + * rules: Update gentarball target to use xz and the current tree. + + -- Timo Aaltonen Thu, 20 Mar 2025 16:52:21 +0200 + + mesa (25.0.1-2) unstable; urgency=medium + + * rules: Build gfxstream only on 64bit. (Closes: #1099704) + + -- Timo Aaltonen Fri, 07 Mar 2025 08:52:20 +0200 + + mesa (25.0.1-1) unstable; urgency=medium + + [ Timo Aaltonen ] + * New upstream release. + * control: Drop python3 dependency from mesa-vulkan-drivers. (Closes: + #1061658) + + [ Gurchetan Singh ] + * rules: enable gfxstream + + -- Timo Aaltonen Thu, 06 Mar 2025 13:07:00 +0200 + + mesa (25.0.0-1) unstable; urgency=medium + + * New upstream release. + * control: Make mesa-va-drivers depend on the same version of mesa- + libgallium. (Closes: #1094190) + * rules: Enable panvk, it's production quality now. (Closes: #1095969) + + -- Timo Aaltonen Sun, 23 Feb 2025 11:22:33 +0200 + + mesa (25.0.0~rc3-1) experimental; urgency=medium + + * New upstream release candidate. + + -- Timo Aaltonen Thu, 13 Feb 2025 13:06:35 +0200 + + mesa (25.0.0~rc2-1) experimental; urgency=medium + + * New upstream release candidate. + + -- Timo Aaltonen Fri, 07 Feb 2025 19:30:14 +0200 + + mesa (25.0.0~rc1-2) experimental; urgency=medium + + * Merge from unstable. + + -- Timo Aaltonen Mon, 03 Feb 2025 12:41:43 +0200 + + mesa (25.0.0~rc1-1) experimental; urgency=medium + + * New upstream release candidate. + * control: Remove libglapi-mesa, provided by mesa-libgallium now. + + -- Timo Aaltonen Fri, 31 Jan 2025 09:54:17 +0200 + + mesa (24.3.4-3) unstable; urgency=medium + + [ Dmitry Shachnev ] + * Revert "Build with gcc-12 and -O1 on ppc64el". + * Add a patch to disable ppc64el assembly code. (Closes: #1092890) + + [ Emilio Pozuelo Monfort ] + * Release to sid. + + -- Emilio Pozuelo Monfort Mon, 03 Feb 2025 08:40:16 +0100 + + mesa (24.3.4-2) unstable; urgency=medium + + * Build with gcc-12 and -O1 on ppc64el to workaround segfaults + on driswSwapBuffers. Thanks Dmitry Shachnev for debugging and + finding a working compiler and optimization level. + Closes: #1092890. + * Drop quilt usage, not needed with source format 3.0. + + -- Emilio Pozuelo Monfort Sun, 26 Jan 2025 11:39:48 +0100 + + mesa (24.3.4-1) unstable; urgency=medium + + * New upstream release. + * control: Make libgl1-mesa-dri depend on the same version of libgbm1. + + -- Timo Aaltonen Thu, 23 Jan 2025 19:48:02 +0200 + + mesa (24.3.3-1) unstable; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Wed, 08 Jan 2025 13:11:38 +0200 + + mesa (24.3.0-1) experimental; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Fri, 22 Nov 2024 13:43:07 +0200 + + mesa (24.3.0~rc2-1) experimental; urgency=medium + + * New upstream release candidate. + + -- Timo Aaltonen Thu, 14 Nov 2024 17:09:15 +0200 + + mesa (24.3.0~rc1-1) experimental; urgency=medium + + * New upstream release candidate. + * patches: Refreshed. + * rules: Drop obsoleted config options. + * libglx-mesa0.symbols: Updated. + * libgbm1: Add dri_gbm.so. + + -- Timo Aaltonen Tue, 12 Nov 2024 15:17:38 +0200 + + mesa (24.2.8-1) unstable; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Thu, 28 Nov 2024 13:59:57 +0200 + + mesa (24.2.7-1) unstable; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Thu, 14 Nov 2024 14:08:39 +0200 + + mesa (24.2.6-1) unstable; urgency=medium + + [ Timo Aaltonen ] + * New upstream release. + * fix-armhf-build.diff: Dropped, upstream. + + [ Fabio Pedretti ] + * control: lower librust-syn-dev dependency version + + -- Timo Aaltonen Tue, 05 Nov 2024 09:59:12 +0200 + + mesa (24.2.4-1) unstable; urgency=medium + + * New upstream release. + * clc-find-opencl-headers.diff: Dropped, upstream. + + -- Timo Aaltonen Thu, 03 Oct 2024 22:18:55 +0300 + + mesa (24.2.3-1) unstable; urgency=medium + + * New upstream release. + * patches: Fix build on armel/armhf with llvm-19. + + -- Timo Aaltonen Fri, 20 Sep 2024 21:57:00 +0300 + + mesa (24.2.2-1+exp1) experimental; urgency=medium + + * rules: Migrate to llvm-19. + * clc-find-opencl-headers.diff: Fix finding the opencl headers with + llvm-19. + + -- Timo Aaltonen Tue, 17 Sep 2024 14:43:27 +0300 + + mesa (24.2.2-1) unstable; urgency=medium + + * New upstream release. + * patches: dril fixes dropped, upstream. + + -- Timo Aaltonen Fri, 06 Sep 2024 07:13:53 +0300 + + mesa (24.2.1-4) unstable; urgency=medium + + * patches: Add patches to fix autopkgtest regressions in dril. + * rules: Enable softpipe everywhere again. (Closes: #1080475) + + -- Timo Aaltonen Thu, 05 Sep 2024 11:49:34 +0300 + + mesa (24.2.1-3) unstable; urgency=medium + + * rules: Set MESON_PACKAGE_CACHE_DIR only for archs where nvk is + built, fixes armel build. + + -- Timo Aaltonen Thu, 29 Aug 2024 10:54:30 +0300 + + mesa (24.2.1-2) unstable; urgency=medium + + [ WANG Xuerui ] + * rules: disable TLSDESC for loong64 for now + + [ Fabio Pedretti ] + * removed unused lua5.4 dependency + + [ Timo Aaltonen ] + * Add upstream metadata, drop old git url from d/watch. + * New upstream release. + * control: Bump librust-syn-dev build-dep. + + -- Timo Aaltonen Thu, 29 Aug 2024 09:42:42 +0300 + + mesa (24.2.0-2) experimental; urgency=medium + + * control, rules: Drop armel, mips64el, loong64 from NVK_ARCHS (FTBFS). + * rules: ORCJIT is enabled by default now, so don't force draw-use- + llvm=false on riscv64. + * rules: Fix m68k build, and rework setting buildflags. (Closes: + #1067207) + * rules: Really drop ppc64el from optimization workaround, drop sh3 as + it's an obsolete arch, and for sh4 limit it to just setting a single + flag. + + -- Timo Aaltonen Thu, 15 Aug 2024 09:14:51 +0300 + + mesa (24.2.0-1) experimental; urgency=medium + + * New upstream release. + * rules: Build llvmpipe only where llvm is enabled. + * rules: Build softpipe or llvmpipe depending on the arch, not both. + + -- Timo Aaltonen Wed, 14 Aug 2024 22:13:47 +0300 + + mesa (24.2.0~rc4-1) experimental; urgency=medium + + * New upstream release candidate. + * control: Add python3-yaml to build-depends. + * control: Move libclc-NN dependency to LLVM_ARCHS. + + -- Timo Aaltonen Wed, 07 Aug 2024 16:34:17 +0300 + + mesa (24.2.0~rc3-2) experimental; urgency=medium + + * Add ldconfig trigger for mesa-drm-shim. + * control: Bump libdrm-dev build-dep. + + -- Timo Aaltonen Mon, 05 Aug 2024 09:38:13 +0300 + + mesa (24.2.0~rc3-1) experimental; urgency=medium + + [ Timo Aaltonen ] + * New upstream release candidate. + * control: Migrate to pkgconf. + * Add some lintian-overrides. + * control: Fix drm-shim description. + * control, rules: Bump llvm to 18. (Closes: #1072901) + + [ Simon McVittie ] + * d/rules: Replace deprecated swrast with softpipe and llvmpipe + * d/rules: Replace deprecated glvnd=true with glvnd=enabled + * libglx-mesa0.symbols: Update for new symbols + * Add a new private shared library package for libgallium.so + + -- Timo Aaltonen Fri, 02 Aug 2024 11:53:58 +0300 + + mesa (24.1.6-1) unstable; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Wed, 14 Aug 2024 22:04:49 +0300 + + mesa (24.1.5-3) unstable; urgency=medium + + * control: Mark NVK build-deps accordingly. + * rules: Drop --wrap-mode=default, leftover from previous testing. + (Closes: #1077729) + + -- Timo Aaltonen Fri, 02 Aug 2024 17:45:45 +0300 + + mesa (24.1.5-2) unstable; urgency=medium + + [ Adrian Bunk ] + * control, rules: mips64el has latest LLVM already for some time + + [ Timo Aaltonen ] + * rules: Fix FTBFS by only cleaning some nvk test binaries if they + actually get built. + * rules: Add a new NVK_ARCHS which is a subset of RUSTICL_ARCHS, strip + powerpc, ppc64el and s390x from it. + * control: Add lua5.4 to build-depends for arm* in order to work + around FTBFS caused by setting MESON_PACKAGE_CACHE_DIR for nvk. + (Closes: #1077729) + + -- Timo Aaltonen Fri, 02 Aug 2024 11:25:02 +0300 + + mesa (24.1.5-1) unstable; urgency=medium + + * New upstream release. + * control, rules: Enable NVK, bump rustc build-dependency. (Closes: + #1075858) + * control: Add rustfmt to build-depends. + * rules: Update clean target. + + -- Timo Aaltonen Thu, 01 Aug 2024 10:16:13 +0300 + + mesa (24.1.3-2) unstable; urgency=medium + + [ Christopher Obbard ] + * mesa-teflon-delegate: Fix library installation path + + -- Timo Aaltonen Fri, 05 Jul 2024 15:53:39 +0300 + + mesa (24.1.3-1) unstable; urgency=medium + + [ Christopher Obbard ] + * Package TensorFlow Lite delegate as libteflon (Closes: #1070788) + + [ Timo Aaltonen ] + * New upstream release. + - dri: Go back to hard-coded list of RGBA formats (Closes: #1072971) + * mesa-common-dev.docs: Updated. + + -- Timo Aaltonen Thu, 04 Jul 2024 12:49:04 +0300 + + mesa (24.1.2-1) unstable; urgency=medium + + * New upstream release. + * control: Bump build-deps on directx-headers-dev, libvdpau-dev, + wayland-protocols. + + -- Timo Aaltonen Thu, 27 Jun 2024 15:23:32 +0300 + + mesa (24.1.1-2) unstable; urgency=medium + + * rules, control: Revert back to llvm 17. (Closes: #1072941) + + -- Timo Aaltonen Mon, 10 Jun 2024 19:59:35 +0300 + + mesa (24.1.1-1) unstable; urgency=medium + + * New upstream release. + * control: Bump build-depends on meson for rusticl. + * rules, control: Bump llvm to 18. (Closes: #1072901) + + -- Timo Aaltonen Mon, 10 Jun 2024 14:39:17 +0300 + + mesa (24.1.0-2) unstable; urgency=medium + + * Upload to unstable. + * control: Add python3-pycparser to build-depends for armhf, arm64. + (Closes: #1071222) + + -- Timo Aaltonen Fri, 31 May 2024 15:40:01 +0300 + + mesa (24.1.0-1) experimental; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Thu, 23 May 2024 13:08:02 +0300 + + mesa (24.1.0~rc3-1) experimental; urgency=medium + + * New upstream release candidate. + + -- Timo Aaltonen Fri, 10 May 2024 10:30:26 +0300 + + mesa (24.1.0~rc2-1) experimental; urgency=medium + + * New upstream release candidate. + + -- Timo Aaltonen Sat, 04 May 2024 19:00:30 +0300 + + mesa (24.1.0~rc1-1) experimental; urgency=medium + + * New upstream release candidate. + + -- Timo Aaltonen Thu, 25 Apr 2024 09:02:09 +0300 + + mesa (24.0.8-1) unstable; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Thu, 23 May 2024 12:57:58 +0300 mesa (24.0.7-1) unstable; urgency=medium diff --cc debian/control index b219efdd2,62831c7d3..45100bbbc --- a/debian/control +++ b/debian/control @@@ -41,23 -46,26 +46,27 @@@ Build-Depends python3-setuptools, flex, bison, - libelf-dev [amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libelf-dev [amd64 arm64 armel armhf i386 loong64 mips64el 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], - wayland-protocols (>= 1.24), + llvm-19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclang-19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclang-cpp19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclc-19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclc-19 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + wayland-protocols (>= 1.38), zlib1g-dev, libglvnd-core-dev (>= 1.3.2), - 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], - valgrind [amd64 arm64 armhf i386 mips64el powerpc ppc64 ppc64el s390x], + rustc (>= 1.78) [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], + rustfmt [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], + bindgen (>= 0.66.1~) [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], + cbindgen [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], + llvm-spirv-19 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32], + libllvmspirvlib-19-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + librust-paste-dev [amd64 arm64 armhf i386 ppc64 riscv64 x32], + librust-syn-dev (>= 2.0.48) [amd64 arm64 armhf i386 ppc64 riscv64 x32], +Build-Conflicts: - valgrind [amd64 arm64 i386 mips64el powerpc ppc64 ppc64el s390x], ++ valgrind [amd64 arm64 armhf mips64el powerpc ppc64 ppc64el s390x], 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 diff --cc debian/control.in index 35207db0d,4ec4bbcdd..ae5a70422 --- a/debian/control.in +++ b/debian/control.in @@@ -48,16 -53,19 +53,20 @@@ Build-Depends libclang-@LLVM_VERSION@-dev [@LLVM_ARCHS@], libclang-cpp@LLVM_VERSION@-dev [@LLVM_ARCHS@], libclc-@LLVM_VERSION@-dev [@LLVM_ARCHS@], - wayland-protocols (>= 1.24), + libclc-@LLVM_VERSION@ [@LLVM_ARCHS@], + wayland-protocols (>= 1.38), zlib1g-dev, libglvnd-core-dev (>= 1.3.2), - rustc [@RUSTICL_ARCHS@], - valgrind [@VALGRIND_ARCHS@], + rustc (>= 1.78) [@RUSTICL_ARCHS@], + rustfmt [@RUSTICL_ARCHS@], bindgen (>= 0.66.1~) [@RUSTICL_ARCHS@], + cbindgen [@RUSTICL_ARCHS@], llvm-spirv-@LLVM_VERSION@ [@RUSTICL_ARCHS@], - libclc-@LLVM_VERSION@ [@RUSTICL_ARCHS@], libllvmspirvlib-@LLVM_VERSION@-dev [@LLVM_ARCHS@], + librust-paste-dev [@NVK_ARCHS@], + librust-syn-dev (>= 2.0.48) [@NVK_ARCHS@], +Build-Conflicts: + valgrind [@VALGRIND_ARCHS@], 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 diff --cc debian/rules index f38f7cb54,ea0b6747e..c88b9967b --- a/debian/rules +++ b/debian/rules @@@ -38,13 -47,14 +47,14 @@@ GALLIUM_DRIVERS = softpip VULKAN_DRIVERS = VULKAN_LAYERS = - confflags_DRI3 = -Ddri3=disabled confflags_OSMESA = -Dosmesa=true confflags_SSE2 = -Dsse2=true + confflags_TEFLON = -Dteflon=false - LLVM_ARCHS = amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x sparc64 x32 - RUSTICL_ARCHS = amd64 arm64 armel armhf i386 loong64 powerpc ppc64 ppc64el riscv64 s390x x32 - VALGRIND_ARCHS = amd64 arm64 i386 mips64el powerpc ppc64 ppc64el s390x + LLVM_ARCHS = amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32 + RUSTICL_ARCHS = amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32 + NVK_ARCHS = amd64 arm64 armhf i386 ppc64 riscv64 x32 -VALGRIND_ARCHS = amd64 arm64 armhf i386 mips64el powerpc ppc64 ppc64el s390x ++VALGRIND_ARCHS = amd64 arm64 mips64el powerpc ppc64 ppc64el s390x WINE_ARCHS = amd64 arm64 armel armhf i386 # hurd doesn't do direct rendering