diff -Nru libdrm-2.4.107/debian/changelog libdrm-2.4.107/debian/changelog
--- libdrm-2.4.107/debian/changelog	2021-09-27 17:10:39.000000000 +0000
+++ libdrm-2.4.107/debian/changelog	2021-10-11 16:12:32.000000000 +0000
@@ -1,3 +1,10 @@
+libdrm (2.4.107-8+rpi1) bookworm-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, 11 Oct 2021 16:12:32 +0000
+
 libdrm (2.4.107-8) unstable; urgency=medium
 
   * rules: Forcibly disable valgrind.
diff -Nru libdrm-2.4.107/debian/control libdrm-2.4.107/debian/control
--- libdrm-2.4.107/debian/control	2021-09-27 11:35:26.000000000 +0000
+++ libdrm-2.4.107/debian/control	2021-10-11 16:12:32.000000000 +0000
@@ -15,6 +15,8 @@
  libpciaccess-dev,
  python3-docutils,
 # valgrind [amd64 armhf i386 mips mipsel powerpc s390x],
+Build-conflicts:
+ Valgrind
 Standards-Version: 4.5.0
 Section: libs
 Vcs-Git: https://salsa.debian.org/xorg-team/lib/libdrm