diff -u mesa-20.2.3/debian/changelog mesa-20.2.3/debian/changelog --- mesa-20.2.3/debian/changelog +++ mesa-20.2.3/debian/changelog @@ -1,3 +1,11 @@ +mesa (20.2.3-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 Tue, 01 Dec 2020 21:37:44 +0000 + mesa (20.2.3-1) unstable; urgency=medium * New upstream release. diff -u mesa-20.2.3/debian/control mesa-20.2.3/debian/control --- mesa-20.2.3/debian/control +++ mesa-20.2.3/debian/control @@ -49,7 +49,9 @@ wayland-protocols (>= 1.9), zlib1g-dev, 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], +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 -u mesa-20.2.3/debian/rules mesa-20.2.3/debian/rules --- mesa-20.2.3/debian/rules +++ mesa-20.2.3/debian/rules @@ -80,7 +80,7 @@ # 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=enabled endif endif