Manual merge of version 20.1.9-1+rpi1 and 20.2.2-1 to produce 20.2.2-1+rpi1

diff --cc debian/changelog
index c1c9becabb89d1718844926a8936c8b74f22ab9b,b494047c3c070cfcd6783fab2c5bfad602d11632..03a83a4b08cbf85ac76f165e940ad2a7e3fab0aa
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,47 +1,55 @@@
- mesa (20.1.9-1+rpi1) bullseye-staging; urgency=medium
++mesa (20.2.2-1+rpi1) bullseye-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>  Wed, 07 Oct 2020 19:52:05 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Wed, 18 Nov 2020 20:39:49 +0000
++
+ mesa (20.2.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * control: Enable libdrm-dev for Hurd. (Closes: #973673)
+   * rules: Rework EGL_PLATFORMS to match current upstream defaults.
+   * rules: Fix warnings from deprecated options. (Closes: #973675)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 10 Nov 2020 22:38:16 +0200
+ 
+ mesa (20.2.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 15 Oct 2020 12:38:36 +0300
+ 
+ mesa (20.2.0-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * control: Add libclang-cpp11-dev to build-depends. (Closes: #954849)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Tue, 29 Sep 2020 11:07:13 +0300
+ 
+ mesa (20.2.0~rc4-2) experimental; urgency=medium
+ 
+   * Migrate to llvm/clang-11.
+   * path_max.diff: Updated. (Closes: #969040)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 17 Sep 2020 12:07:08 +0300
+ 
+ mesa (20.2.0~rc4-1) experimental; urgency=medium
+ 
+   * New upstream prerelease.
+   * rules: Move radv rule up to fix build on non-intel archs.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 04 Sep 2020 19:32:58 +0300
+ 
+ mesa (20.2.0~rc2-1) experimental; urgency=medium
+ 
+   * New upstream release candidate.
+   * rules: Get rid of trailing commas in *_DRIVERS options.
+   * control: Bump libglvnd build-dep.
+   * Update mesa-common-dev.docs.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 14 Aug 2020 18:30:42 +0300
  
  mesa (20.1.9-1) unstable; urgency=medium
  

diff --cc debian/control
index ffdfc27052d842d8fc233b6e52b2ba30778ab507,7a46b7ff805efc2571a7c30085d63fe1752bb538..171873898959843aa770c7739d31be35e7cfc986
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -42,14 -42,14 +42,14 @@@ Build-Depends
   libelf-dev [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
   libwayland-dev (>= 1.15.0) [linux-any],
   libwayland-egl-backend-dev (>= 1.15.0) [linux-any],
-  llvm-10-dev (>= 1:10.0.0-4~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
-  libclang-10-dev (>= 1:10.0.0-4~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
-  libclang-cpp10-dev (>= 1:10.0.0-4~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
-  libclc-dev (>= 0.2.0+git20190827-5~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
+  llvm-11-dev (>= 1:11.0.0~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
+  libclang-11-dev (>= 1:11.0.0~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
+  libclang-cpp11-dev (>= 1:11.0.0~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
+  libclc-dev (>= 0.2.0+git20190827-7~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
   wayland-protocols (>= 1.9),
   zlib1g-dev,
-  libglvnd-dev (>= 1.3.0),
+  libglvnd-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],
  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 a75077eb524ed9fa6213a1b4f375aace7e6cc280,1e575cf7380ce82419436e7db7c307431cbe5017..cec722e915b3318b3b07fd02a0bb475e2fc90ae3
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -70,8 -80,8 +80,8 @@@ els
        # Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
        EGL_PLATFORMS += ,wayland
  
 -      ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x))
 +      ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 i386 mips64el mipsel powerpc ppc64 ppc64el s390x))
-               confflags_VALGRIND += -Dvalgrind=true
+               confflags_VALGRIND += -Dvalgrind=enabled
        endif
    endif