From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 17 Nov 2022 22:47:53 +0000 (+0000)
Subject: Merge version 1.9.25+dfsg2-6+rpi1 and 1.9.25+dfsg2-8 to produce 1.9.25+dfsg2-8+rpi1
X-Git-Tag: archive/raspbian/1.9.25+dfsg2-8+rpi1~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=60ff638096eb709b153e65289d95113fec8299c7;p=filament.git

Merge version 1.9.25+dfsg2-6+rpi1 and 1.9.25+dfsg2-8 to produce 1.9.25+dfsg2-8+rpi1
---

60ff638096eb709b153e65289d95113fec8299c7
diff --cc debian/changelog
index 91a1cb6,84d1e4c..c368bd7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,16 +1,27 @@@
- filament (1.9.25+dfsg2-6+rpi1) bookworm-staging; urgency=medium
++filament (1.9.25+dfsg2-8+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
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 17 Nov 2022 22:47:53 +0000
++
+ filament (1.9.25+dfsg2-8) unstable; urgency=medium
+ 
+   * Fix compatibility with glslang-dev >= 11.12.0
+   * Bump Standards-Version to 4.6.1
+ 
+  -- Timo Röhling <roehling@debian.org>  Sat, 12 Nov 2022 13:20:14 +0100
+ 
+ filament (1.9.25+dfsg2-7) unstable; urgency=medium
+ 
+   * Stop using the deprecated DRACO_LIBRARIES variable
+   * Switch from GLEW to libepoxy
+ 
+  -- Timo Röhling <roehling@debian.org>  Thu, 03 Nov 2022 00:09:28 +0100
  
  filament (1.9.25+dfsg2-6) unstable; urgency=medium
  
diff --cc debian/control
index 3f6df8a,d6fee02..9228594
--- a/debian/control
+++ b/debian/control
@@@ -3,9 -3,9 +3,9 @@@ Section: lib
  Priority: optional
  Maintainer: Timo Röhling <roehling@debian.org>
  Build-Depends: debhelper-compat (= 13),
 -    clang,
 +    clang-11,
      cmake,
-     glslang-dev,
+     glslang-dev (>= 11.12.0),
      libassimp-dev,
      libastcenc-dev,
      libbenchmark-dev,
@@@ -24,10 -23,8 +23,10 @@@
      robin-map-dev,
      spirv-tools,
      zlib1g-dev,
 +Build-Conflicts:
 +    pkgconf
  Homepage: https://github.com/google/filament
- Standards-Version: 4.6.0
+ Standards-Version: 4.6.1
  Rules-Requires-Root: no
  Vcs-Git: https://salsa.debian.org/roehling/filament.git
  Vcs-Browser: https://salsa.debian.org/roehling/filament