From: Peter Michael Green Date: Wed, 18 Nov 2020 20:40:42 +0000 (+0000) Subject: Manual merge of version 20.1.9-1+rpi1 and 20.2.2-1 to produce 20.2.2-1+rpi1 X-Git-Tag: archive/raspbian/20.2.2-1+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3960833fe5f4261eabc064473f57707eb7712ff6;p=mesa.git Manual merge of version 20.1.9-1+rpi1 and 20.2.2-1 to produce 20.2.2-1+rpi1 --- 3960833fe5f4261eabc064473f57707eb7712ff6 diff --cc debian/changelog index c1c9becab,b494047c3..03a83a4b0 --- a/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 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 Wed, 07 Oct 2020 19:52:05 +0000 ++ -- Peter Michael Green 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 Tue, 10 Nov 2020 22:38:16 +0200 + + mesa (20.2.1-1) unstable; urgency=medium + + * New upstream release. + + -- Timo Aaltonen 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 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 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 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 Fri, 14 Aug 2020 18:30:42 +0300 mesa (20.1.9-1) unstable; urgency=medium diff --cc debian/control index ffdfc2705,7a46b7ff8..171873898 --- a/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 a75077eb5,1e575cf73..cec722e91 --- a/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