Merge version 20.2.6-1+rpi1 and 20.3.2-1 to produce 20.3.2-1+rpi1

diff --cc debian/changelog
index 05461aa30dd716d6547c01004be3cb9e977ba906,8c351d9bbb07547fc09c0d0139666b9c942f1f1e..f2cb97806e0d752eb863f31ed8850239e09c1fc5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,51 +1,59 @@@
- mesa (20.2.6-1+rpi1) bullseye-staging; urgency=medium
++mesa (20.3.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, 23 Dec 2020 12:28:07 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 10 Jan 2021 06:43:53 +0000
++
+ mesa (20.3.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * rules: Enable lavapipe (vulkan swrast) where llvm and vulkan is
+     enabled.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Sun, 03 Jan 2021 20:30:50 +0200
+ 
+ mesa (20.3.1-1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 18 Dec 2020 10:23:30 +0200
+ 
+ mesa (20.3.0-2) experimental; urgency=medium
+ 
+   * rules: Fix the name of the broadcom vulkan driver.
+   * control, rules: Drop llvm support from kfreebsd, as llvm isn't built
+     there.
+   * rules: Enable gallium swrast (softpipe) and OSMesa everywhere, as
+     they're not actually tied to llvm being available.
+   * rules: Move common settings for !hurd to the top.
+   * rules: Use a better method to build the arrays of drivers, thanks
+     Witold Baryluk! (Closes: #972736)
+   * rules: Clarify the status of wayland support on non-linux ports.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Thu, 10 Dec 2020 14:21:30 +0200
+ 
+ mesa (20.3.0-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * rules: Enable v3dv on armhf/arm64, and zink where vulkan is
+     available. (Closes: #975679)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Mon, 07 Dec 2020 16:39:42 +0200
+ 
+ mesa (20.3.0~rc2-1) experimental; urgency=medium
+ 
+   * New upstream release candidate.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 20 Nov 2020 17:00:27 +0200
+ 
+ mesa (20.3.0~rc1-1) experimental; urgency=medium
+ 
+   * New upstream release candidate.
+   * control: Add libxcb-shm0-dev to build-depends.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 11 Nov 2020 18:29:42 +0200
  
  mesa (20.2.6-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
index cec722e915b3318b3b07fd02a0bb475e2fc90ae3,3dd584e72bd166be63eaf273baa0e572dcdd9bc1..6b90c01597184a0ea8f6b96b846409e1250fcabf
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -71,16 -76,18 +76,18 @@@ els
        endif
  
        ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32))
-               GALLIUM_DRIVERS += ,svga,zink
+               GALLIUM_DRIVERS += svga
                # svga needs xa state tracker
                confflags_GALLIUM += -Dgallium-xa=enabled
-               VULKAN_DRIVERS += ,intel
+               VULKAN_DRIVERS += intel
        endif
  
-       # Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
+       # Non-Linux ports lack epoll, so wayland isn't ready yet:
+       # https://gitlab.freedesktop.org/wayland/wayland/-/issues/72
+       # hurd also lacks *_CLOEXEC
        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=enabled
        endif
    endif