diff -u mesa-22.2.0~rc2/debian/changelog mesa-22.2.0~rc2/debian/changelog --- mesa-22.2.0~rc2/debian/changelog +++ mesa-22.2.0~rc2/debian/changelog @@ -1,3 +1,11 @@ +mesa (22.2.0~rc2-1+rpi1) bookworm-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 Sun, 28 Aug 2022 05:06:24 +0000 + mesa (22.2.0~rc2-1) unstable; urgency=medium * New upstream release candidate. (Closes: #1016801) diff -u mesa-22.2.0~rc2/debian/control mesa-22.2.0~rc2/debian/control --- mesa-22.2.0~rc2/debian/control +++ mesa-22.2.0~rc2/debian/control @@ -50,7 +50,9 @@ wayland-protocols (>= 1.9), zlib1g-dev, 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 -u mesa-22.2.0~rc2/debian/rules mesa-22.2.0~rc2/debian/rules --- mesa-22.2.0~rc2/debian/rules +++ mesa-22.2.0~rc2/debian/rules @@ -94,7 +94,7 @@ # 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