Merge version 21.2.6-1+rpi1 and 21.3.7-1 to produce 21.3.7-1+rpi1

diff --cc debian/changelog
index 51ea5fc101831a71c91b53989ef6b225acae6d9e,c82e61e4c8f2ec94149096842449a1c6a499b2fb..ca1ff9785e37efd0cf12e66645ae93c9215c0932
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,57 +1,65 @@@
- mesa (21.2.6-1+rpi1) bookworm-staging; urgency=medium
++mesa (21.3.7-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 20.1.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> 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 <root@raspbian.org>  Thu, 02 Dec 2021 17:23:37 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 08 Mar 2022 20:25:31 +0000
++
+ mesa (21.3.7-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * rules: Disable sse2 on i386. (Closes: #1002872)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 02 Mar 2022 12:42:09 +0200
+ 
+ mesa (21.3.5-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * iris-inter-context-busy-tracking.diff: Fix a regression causing
+     flickering and corruption on Intel. (Closes: #1003987)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 28 Jan 2022 15:49:51 +0200
+ 
+ mesa (21.3.4-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * control: Switch to libglvnd-core-dev build-dep. (Closes: #1003264)
+   * freedreno-afuc-Disable-the-disassembler-on-32-bit-bu.diff: Dropped,
+     upstream.
+   * Build with llvm-13 again.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 13 Jan 2022 14:35:37 +0200
+ 
+ mesa (21.3.3-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * rules: Enable turnip, freedreno vulkan driver.
+   * freedreno-afuc-Disable-the-disassembler-on-32-bit-bu.diff: Fix ftbfs
+     on armhf.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 04 Jan 2022 10:30:13 +0200
+ 
+ mesa (21.3.0-1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 25 Nov 2021 16:35:02 +0200
+ 
+ mesa (21.3.0~rc5-1) experimental; urgency=medium
+ 
+   * New upstream prerelease.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 17 Nov 2021 10:42:29 +0200
+ 
+ mesa (21.3.0~rc1-1) experimental; urgency=medium
+ 
+   * New upstream prerelease.
+   * fix-python-shebang.diff: Dropped, upstream.
+   * libgbm1.symbols: Updated.
+   * rules: Enable crocus gallium driver. (LP: #1947200)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 20 Oct 2021 11:40:14 +0300
  
  mesa (21.2.6-1) unstable; urgency=medium
  

diff --cc debian/control
index e88e4011a4bb3807a27c284dcfc9341516ed1c26,8b64f20ecf70b82466e76b206ac56a78900320ef..32f04416aa4862ce32026e2d282e2b0fcd93e936
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -43,16 -43,14 +43,16 @@@ Build-Depends
   libelf-dev [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64],
   libwayland-dev (>= 1.15.0) [linux-any],
   libwayland-egl-backend-dev (>= 1.15.0) [linux-any],
-  llvm-12-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
-  libclang-12-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
-  libclang-cpp12-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
-  libclc-12-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
+  llvm-13-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
+  libclang-13-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
+  libclang-cpp13-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
+  libclc-13-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
   wayland-protocols (>= 1.9),
   zlib1g-dev,
-  libglvnd-dev (>= 1.3.2),
+  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],
 +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
Simple merge