diff -Nru filament-1.9.25+dfsg2/debian/changelog filament-1.9.25+dfsg2/debian/changelog
--- filament-1.9.25+dfsg2/debian/changelog	2022-02-13 00:07:53.000000000 +0000
+++ filament-1.9.25+dfsg2/debian/changelog	2022-02-27 15:24:21.000000000 +0000
@@ -1,3 +1,10 @@
+filament (1.9.25+dfsg2-4+rpi1) bookworm-staging; urgency=medium
+
+  * Build with clang 11 to hopefully avoid armv7 contamination.
+  * Fix clean target.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 27 Feb 2022 15:24:21 +0000
+
 filament (1.9.25+dfsg2-4) unstable; urgency=medium
 
   * Ensure proper alignment of resgen _OFFSET and _SIZE variables
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-09 09:56:20.000000000 +0000
+++ filament-1.9.25+dfsg2/debian/control	2022-02-27 15:24:21.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,
diff -Nru filament-1.9.25+dfsg2/debian/rules filament-1.9.25+dfsg2/debian/rules
--- filament-1.9.25+dfsg2/debian/rules	2022-02-12 23:58:22.000000000 +0000
+++ filament-1.9.25+dfsg2/debian/rules	2022-02-27 15:24:21.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,3 +35,6 @@
 		-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