From: Peter Michael Green Date: Thu, 1 Jun 2023 22:15:19 +0000 (+0000) Subject: Manual merge of version 22.2.0-1+rpi1 and 22.3.6-1+deb12u1 to produce 22.3.6-1+deb12u... X-Git-Tag: archive/raspbian/22.3.6-1+deb12u1+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=198282640ea0eb01ae9b6402cc3e9e637a5a9fe2;p=mesa.git Manual merge of version 22.2.0-1+rpi1 and 22.3.6-1+deb12u1 to produce 22.3.6-1+deb12u1+rpi1 --- d9c36438bd59f3ddc8686c858e83a9df1fe50062 diff --cc debian/changelog index 24d1d0e24,45359a1b9..6af7dd4c3 --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,150 +1,158 @@@ - mesa (22.2.0-1+rpi1) bookworm-staging; urgency=medium ++mesa (22.3.6-1+deb12u1+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 20.1.2-1+rpi1 by Peter Michael Green at Thu, 02 Jul 2020 00:56:02 +0000] + * Don't build with valgrind on armhf, the old version in Raspbian + is not compatible. + - -- Raspbian forward porter Mon, 26 Sep 2022 04:18:02 +0000 ++ -- Peter Michael Green Thu, 01 Jun 2023 22:14:02 +0000 ++ + mesa (22.3.6-1+deb12u1) testing-proposed-updates; urgency=medium + + * Upload to testing. + + -- Timo Aaltonen Wed, 22 Mar 2023 12:18:17 +0200 + + mesa (22.3.6-1) unstable; urgency=medium + + * New upstream release. (Closes: #1029731) + + -- Timo Aaltonen Sun, 26 Feb 2023 11:19:29 +0200 + + mesa (22.3.5-1) unstable; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Thu, 09 Feb 2023 20:43:32 +0200 + + mesa (22.3.4-1) unstable; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Sat, 28 Jan 2023 12:37:15 +0200 + + mesa (22.3.3-1) unstable; urgency=medium + + * New upstream release. (LP: #1988859) + + -- Timo Aaltonen Fri, 13 Jan 2023 10:23:37 +0200 + + mesa (22.3.2-1) unstable; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Tue, 03 Jan 2023 14:53:02 +0200 + + mesa (22.3.1-1) unstable; urgency=medium + + * New upstream release. + * patches: Drop upstreamed patches. + * control: Use Rules-Requires-Root: no. + + -- Timo Aaltonen Thu, 15 Dec 2022 13:21:21 +0200 + + mesa (22.3.0-3) unstable; urgency=medium + + * control: Enable i915 gallium driver. (Closes: #1013311) + * rules: Enable intel_hasvk. (Closes: #1025864) + + -- Timo Aaltonen Sun, 11 Dec 2022 19:14:28 +0200 + + mesa (22.3.0-2) unstable; urgency=medium + + * patches: Import two upstream commits to fix crashes when libd3d12.so + can't be found. (Closes: #1025312) + + -- Timo Aaltonen Mon, 05 Dec 2022 16:34:36 +0200 + + mesa (22.3.0-1) unstable; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Thu, 01 Dec 2022 12:07:06 +0200 + + mesa (22.3.0~rc4-1) experimental; urgency=medium + + * New upstream release candidate. + + -- Timo Aaltonen Tue, 29 Nov 2022 10:19:44 +0200 + + mesa (22.3.0~rc3-1) experimental; urgency=medium + + * New upstream release candidate. + * fix-symbols.diff: Dropped, upstream. + * rules: Limit anv ray-tracing support to amd64. + + -- Timo Aaltonen Fri, 18 Nov 2022 13:00:20 +0200 + + mesa (22.2.4-1) unstable; urgency=medium + + * New upstream release. + * rules: Enable building lima drivers on riscv64. (LP: #1995137) + * rules: Disable building llvmpipe on riscv64. (Closes: #1004039) + * patches: Refreshed. + + -- Timo Aaltonen Fri, 18 Nov 2022 12:03:09 +0200 + + mesa (22.3.0~rc1-3) experimental; urgency=medium + + * control, rules: Enable intel vulkan raytracing support, add + python3-ply and libclc-15 to build-depends. + * rules: Fix rusticl logic. + * rules: Add some variables for architecture lists. + * rules: Drop the check for where vulkan loader exists, it's the same + list of archs now as for llvm. + * rules: Drop a duplicate check for llvm archs. + * rules, control.in: Add a template file for d/control, which makes + maintaining the llvm version and some arch lists easier. + * rules: Remove unused libgrl.a from the intel raytracing build. + + -- Timo Aaltonen Wed, 09 Nov 2022 13:37:20 +0200 + + mesa (22.3.0~rc1-2) experimental; urgency=medium + + * rules: Update list of archs without rustc. + * libegl1-mesa-dev.install: Updated. + * fix-symbols.diff: Fix a typo in glx symbols. + * libglx-mesa0.symbols: Updated. + + -- Timo Aaltonen Tue, 08 Nov 2022 15:47:05 +0200 + + mesa (22.3.0~rc1-1) experimental; urgency=medium + + [ Timo Aaltonen ] + * New upstream release candidate. + * rules: Drop removed gallium-xvmc flag. + + [ Christopher Obbard ] + * Package rusticl, include in mesa-opencl-icd. + + -- Timo Aaltonen Tue, 08 Nov 2022 13:32:45 +0200 + + mesa (22.2.3-1) unstable; urgency=medium + + * New upstream release. (Closes: #1022730) + + -- Timo Aaltonen Tue, 08 Nov 2022 12:17:23 +0200 + + mesa (22.2.2-1) unstable; urgency=medium + + * control: Bump build-depends on wayland-protocols. (Closes: #1021666) + * New upstream release. + + -- Timo Aaltonen Fri, 21 Oct 2022 10:17:18 +0300 + + mesa (22.2.1-1) unstable; urgency=medium + + [ Zhang Boyang ] + * control, rules: Re-enable LLVM support on riscv64. (LP: #1980386) + + [ Timo Aaltonen ] + * control: Bump build-dep on directx-headers-dev. + * New upstream release. + * control, rules: Migrate to llvm-15. + * control: Add riscv64 to mesa-vulkan-drivers archs. + + -- Timo Aaltonen Wed, 12 Oct 2022 11:48:24 +0300 mesa (22.2.0-1) unstable; urgency=medium diff --cc debian/control index 8abb2ddd8,252129585..57278976a --- a/debian/control +++ b/debian/control @@@ -40,19 -41,23 +41,25 @@@ Build-Depends python3-setuptools, flex, bison, - libelf-dev [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64], + libelf-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], libwayland-dev (>= 1.15.0) [linux-any], libwayland-egl-backend-dev (>= 1.15.0) [linux-any], - llvm-14-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64], - libclang-14-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64], - libclang-cpp14-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64], - libclc-14-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64], - wayland-protocols (>= 1.9), + llvm-15-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclang-15-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclang-cpp15-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32], + libclc-15-dev [amd64 arm64 armel armhf i386 mips64el mipsel 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 mipsel powerpc ppc64 ppc64el s390x], + valgrind [amd64 arm64 i386 mips64el mipsel powerpc ppc64 ppc64el s390x], + rustc [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x], + bindgen [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x], + llvm-spirv-15 [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x], + libclc-15 [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x], + libllvmspirvlib-15-dev [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x], + Rules-Requires-Root: no +Build-Conflicts: + valgrind [armhf] 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 --cc debian/rules index 99204aa40,c98560941..e3aa7e52b --- a/debian/rules +++ b/debian/rules @@@ -47,6 -48,11 +48,11 @@@ confflags_DRI3 = -Ddri3=disable confflags_OSMESA = -Dosmesa=true confflags_SSE2 = -Dsse2=true + LLVM_ARCHS = amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32 + RUSTICL_ARCHS = amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x -VALGRIND_ARCHS = amd64 arm64 armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x ++VALGRIND_ARCHS = amd64 arm64 i386 mips64el mipsel powerpc ppc64 ppc64el s390x + WINE_ARCHS = amd64 arm64 armel armhf i386 powerpc + # hurd doesn't do direct rendering ifeq ($(DEB_HOST_ARCH_OS), hurd) confflags_DIRECT_RENDERING = -Dglx-direct=false