From: Timo Röhling <roehling@debian.org>
Date: Mon, 7 Feb 2022 09:12:38 +0000 (+0100)
Subject: Work around M_PIf name collision with glibc 2.34
X-Git-Tag: archive/raspbian/1.9.25+dfsg3-1+rpi1^2~70
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=028dc657071fee6be16464bdce04b3fbe0499dc0;p=filament.git

Work around M_PIf name collision with glibc 2.34
---

diff --git a/debian/patches/0013-Define-M_PIf-only-if-it-is-not-already-defined-in-ma.patch b/debian/patches/0013-Define-M_PIf-only-if-it-is-not-already-defined-in-ma.patch
new file mode 100644
index 0000000..554a285
--- /dev/null
+++ b/debian/patches/0013-Define-M_PIf-only-if-it-is-not-already-defined-in-ma.patch
@@ -0,0 +1,22 @@
+From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
+Date: Mon, 7 Feb 2022 10:12:08 +0100
+Subject: Define M_PIf only if it is not already defined in math.h
+
+---
+ libs/image/src/ImageSampler.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libs/image/src/ImageSampler.cpp b/libs/image/src/ImageSampler.cpp
+index 00385e9..53c68e8 100644
+--- a/libs/image/src/ImageSampler.cpp
++++ b/libs/image/src/ImageSampler.cpp
+@@ -38,7 +38,9 @@ struct FilterFunction {
+     bool rejectExternalSamples = true;
+ };
+ 
++#ifndef M_PIf
+ constexpr float M_PIf = float(filament::math::F_PI);
++#endif
+ 
+ const FilterFunction Box {
+     .fn = [](float t) { return t <= 0.5f ? 1.0f : 0.0f; },
diff --git a/debian/patches/series b/debian/patches/series
index e18104f..62d7085 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 0010-Rename-resgen-executable-to-avoid-conflict-with-mono.patch
 0011-Replace-BlueGL-with-GLEW.patch
 0012-Use-system-spirv-cross.patch
+0013-Define-M_PIf-only-if-it-is-not-already-defined-in-ma.patch