diff -u libdrm-2.4.95/debian/changelog libdrm-2.4.95/debian/changelog
--- libdrm-2.4.95/debian/changelog
+++ libdrm-2.4.95/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.95-1+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 2.4.74-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 28 Jun 2017 21:14:42 +0000]
+  * Move valgrind to build-conflicts, the old version in raspbian breaks the build.
+
+ -- Raspbian forward porter <root@raspbian.org>  Mon, 15 Oct 2018 23:12:49 +0000
+
 libdrm (2.4.95-1) unstable; urgency=medium
 
   [ Timo Aaltonen ]
diff -u libdrm-2.4.95/debian/control libdrm-2.4.95/debian/control
--- libdrm-2.4.95/debian/control
+++ libdrm-2.4.95/debian/control
@@ -13,8 +13,9 @@
  xutils-dev (>= 1:7.6+2),
  libudev-dev [linux-any],
  libpciaccess-dev,
- valgrind [amd64 armhf i386 mips mipsel powerpc s390x],
  libbsd-dev [kfreebsd-any],
+Build-conflicts:
+ Valgrind
 Standards-Version: 4.1.4
 Section: libs
 Vcs-Git: https://salsa.debian.org/xorg-team/lib/libdrm