Merge version 1.9.25+dfsg2-13+rpi1 and 1.9.25+dfsg3-1 to produce 1.9.25+dfsg3-1+rpi1

diff --cc debian/changelog
index 49187b863b8e866b5c1875c873c9e6556e31fe18,f12c02cb593c61bb076040f72fc0d4268267fa57..c3cce15da28ba8e16c2f2ab0f49ac4971338d90d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,19 @@@
- filament (1.9.25+dfsg2-13+rpi1) trixie-staging; urgency=medium
++filament (1.9.25+dfsg3-1+rpi1) trixie-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 17 Feb 2024 14:25:58 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 20 Jun 2024 21:23:17 +0000
++
+ filament (1.9.25+dfsg3-1) unstable; urgency=medium
+ 
+   * New upstream version 1.9.25+dfsg3
+   * Work around broken glslang in Debian (Closes: #1063143)
+   * Bump Standards-Version to 4.7.0
+   * Force non-executable stack
+ 
+  -- Timo Röhling <roehling@debian.org>  Fri, 17 May 2024 18:12:19 +0200
  
  filament (1.9.25+dfsg2-13) unstable; urgency=medium
  

diff --cc debian/control
index e39d08e803f77ec8e01c47068bc10cdcbae7a7aa,53a42da60b0e66b0054c0c0ca0ca4ba933d7f2b2..f7b0d8a5491f642abac32304bdb4ab784f62d27b
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -2,30 -2,28 +2,28 @@@ Source: filamen
  Section: libs
  Priority: optional
  Maintainer: Timo Röhling <roehling@debian.org>
- Build-Depends: debhelper-compat (= 13),
+ Build-Depends:
+  debhelper-compat (= 13),
 - clang:native,
 +    clang-11,
-     cmake,
-     glslang-dev (>= 11.12.0),
-     libfilament-tools <cross>,
-     libassimp-dev,
-     libastcenc-dev,
-     libbenchmark-dev,
-     libdraco-dev,
-     libepoxy-dev,
-     libgtest-dev,
-     libimgui-dev,
-     libjsmn-dev,
-     libmeshoptimizer-dev,
-     libpng-dev,
-     libsdl2-dev,
-     libstb-dev,
-     libtinyexr-dev,
-     libspirv-cross-c-shared-dev (>= 2021.01.15-5~),
-     robin-map-dev,
-     spirv-tools,
-     zlib1g-dev,
+  cmake,
+  libfilament-tools <cross>,
+  libassimp-dev,
+  libastcenc-dev,
+  libbenchmark-dev,
+  libdraco-dev,
+  libepoxy-dev,
+  libgtest-dev,
+  libimgui-dev,
+  libjsmn-dev,
+  libmeshoptimizer-dev,
+  libpng-dev,
+  libsdl2-dev,
+  libstb-dev,
+  libtinyexr-dev,
+  robin-map-dev,
+  zlib1g-dev,
  Homepage: https://github.com/google/filament
- Standards-Version: 4.6.2
+ Standards-Version: 4.7.0
  Rules-Requires-Root: no
  Vcs-Git: https://salsa.debian.org/roehling/filament.git
  Vcs-Browser: https://salsa.debian.org/roehling/filament

diff --cc debian/patches/series
index 11f99145b86541411454e13f6d8d9af8b54b4a9f,fd812d792d9b86b9a4b8e3ba571ac5cb35f1bf0d..3d1bf2dcf02c826aee264bc7f58340037da9b244
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -17,6 -17,6 +17,7 @@@
  0019-Fix-build-with-gcc-13.patch
  0020-Do-not-overwrite-debianized-ImportExecutables.patch
  0021-Fix-build-with-imgui-1.90.patch
+ 0020-Fix-shebang-to-use-Python-3.patch
+ 0021-Do-not-build-spirv-with-Werror.patch
+ 0022-Fixups-for-spirv.patch
 +auto-1.9.25+dfsg2-12+rpi1-4642f2afe8fe9adb140d2d29c4f5097b1dc46765-1696086414

diff --cc debian/rules
Simple merge