diff -Nru filament-1.9.25+dfsg2/debian/changelog filament-1.9.25+dfsg2/debian/changelog
--- filament-1.9.25+dfsg2/debian/changelog	2022-07-27 20:13:33.000000000 +0000
+++ filament-1.9.25+dfsg2/debian/changelog	2022-08-07 04:37:36.000000000 +0000
@@ -1,3 +1,14 @@
+filament (1.9.25+dfsg2-6+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 1.9.25+dfsg2-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 27 Feb 2022 15:24:21 +0000]
+  * Build with clang 11 to hopefully avoid armv7 contamination.
+  * Fix clean target.
+
+  [changes introduced in 1.9.25+dfsg2-6 by Peter Michael Green]
+  * Add build-conflicts on pkgconf (Workaround: #1016922)
+
+ -- Peter Michael Greem <plugwash@raspbian.org>  Sun, 07 Aug 2022 04:37:36 +0000
+
 filament (1.9.25+dfsg2-6) unstable; urgency=medium
 
   * Workaround for armel clang compiler bug.
diff -Nru filament-1.9.25+dfsg2/debian/control filament-1.9.25+dfsg2/debian/control
--- filament-1.9.25+dfsg2/debian/control	2022-02-22 08:30:01.000000000 +0000
+++ filament-1.9.25+dfsg2/debian/control	2022-08-07 04:37:36.000000000 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Timo Röhling <roehling@debian.org>
 Build-Depends: debhelper-compat (= 13),
-    clang,
+    clang-11,
     cmake,
     glslang-dev,
     libassimp-dev,
@@ -24,6 +24,8 @@
     robin-map-dev,
     spirv-tools,
     zlib1g-dev,
+Build-Conflicts:
+    pkgconf
 Homepage: https://github.com/google/filament
 Standards-Version: 4.6.0
 Rules-Requires-Root: no
diff -Nru filament-1.9.25+dfsg2/debian/rules filament-1.9.25+dfsg2/debian/rules
--- filament-1.9.25+dfsg2/debian/rules	2022-07-27 20:12:57.000000000 +0000
+++ filament-1.9.25+dfsg2/debian/rules	2022-08-07 04:37:36.000000000 +0000
@@ -24,7 +24,7 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ \
+		-DCMAKE_C_COMPILER=clang-11 -DCMAKE_CXX_COMPILER=clang++-11 \
 		-DFILAMENT_SKIP_SAMPLES=ON \
 		-DFILAMENT_ENABLE_JAVA=OFF \
 		-DUSE_STATIC_LIBCXX=OFF \
@@ -35,5 +35,9 @@
 		-DFILAMENT_INCLUDEDIR=include/filament-$(FILAMENT_SOVERSION) \
 		-DFILAMENT_CMAKEDIR=lib/$(DEB_HOST_MULTIARCH)/cmake/filament-$(FILAMENT_SOVERSION)
 
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f ImportExecutables-None.cmake
+
 override_dh_dwz:
 	dh_dwz || true