From: Raspbian automatic forward porter Date: Sat, 17 Feb 2024 14:25:58 +0000 (+0000) Subject: Merge version 1.9.25+dfsg2-12+rpi1 and 1.9.25+dfsg2-13 to produce 1.9.25+dfsg2-13... X-Git-Tag: archive/raspbian/1.9.25+dfsg2-13+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=91bf014158b74b77a59ff30f0e5da2a481caf39c;p=filament.git Merge version 1.9.25+dfsg2-12+rpi1 and 1.9.25+dfsg2-13 to produce 1.9.25+dfsg2-13+rpi1 --- 91bf014158b74b77a59ff30f0e5da2a481caf39c diff --cc debian/changelog index 772dbad,aaf6bbe..49187b8 --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,8 +1,16 @@@ - filament (1.9.25+dfsg2-12+rpi1) trixie-staging; urgency=medium ++filament (1.9.25+dfsg2-13+rpi1) trixie-staging; urgency=medium + + [changes brought forward from 1.9.25+dfsg2-4+rpi1 by Peter Michael Green at Sun, 27 Feb 2022 15:24:21 +0000] + * Build with clang 11 to hopefully avoid armv7 contamination. + * Fix clean target. + - -- Peter Michael Green Sat, 30 Sep 2023 14:20:52 +0000 ++ -- Raspbian forward porter Sat, 17 Feb 2024 14:25:58 +0000 ++ + filament (1.9.25+dfsg2-13) unstable; urgency=medium + + * Fix build with imgui 1.90 (Closes: #1061621) + + -- Timo Röhling Sun, 28 Jan 2024 15:11:07 +0100 filament (1.9.25+dfsg2-12) unstable; urgency=medium diff --cc debian/patches/series index 86671e1,b887976..11f9914 --- a/debian/patches/series +++ b/debian/patches/series @@@ -18,4 -18,4 +18,5 @@@ 0018-Fix-compatibility-with-spirv-cross-SDK-1.3.236.patch 0019-Fix-build-with-gcc-13.patch 0020-Do-not-overwrite-debianized-ImportExecutables.patch + 0021-Fix-build-with-imgui-1.90.patch +auto-1.9.25+dfsg2-12+rpi1-4642f2afe8fe9adb140d2d29c4f5097b1dc46765-1696086414