diff mbox series

[oe,meta-oe,2/2] ftgl: Fix build errors with clang

Message ID 20190209190447.23092-2-raj.khem@gmail.com
State Accepted
Commit 357573db842741482f925831839e165e4a5445d0
Headers show
Series [oe,meta-oe,1/2] wifi-test-suite: Fix build with LTO | expand

Commit Message

Khem Raj Feb. 9, 2019, 7:04 p.m. UTC 
Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 ...t-to-avoid-implicit-double-to-float-.patch | 38 +++++++++++++++++++
 .../recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb   |  1 +
 2 files changed, 39 insertions(+)
 create mode 100644 meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch

-- 
2.20.1

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
diff mbox series

Patch

diff --git a/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch b/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch
new file mode 100644
index 0000000000..385bff8dd1
--- /dev/null
+++ b/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch
@@ -0,0 +1,38 @@ 
+From e3bce98a60d6db3b719bbf5d71f732f9b86cb566 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 9 Feb 2019 08:28:09 -0800
+Subject: [PATCH] Explicit typecast to avoid implicit double to float
+ conversion
+
+fixes compile errors e.g.
+
+../../ftgl-2.1.3~rc5/demo/simple.cpp:110:27: error: non-constant-expression cannot be narrowed from type 'double' to
+      'float' in initializer list [-Wc++11-narrowing]
+                          (t3 + 2.0) / 3, 0.3 };
+                          ^~~~~~~~~~~~~~
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ demo/simple.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/demo/simple.cpp b/demo/simple.cpp
+index 532e862..aba55b4 100644
+--- a/demo/simple.cpp
++++ b/demo/simple.cpp
+@@ -105,9 +105,9 @@ static void RenderScene(void)
+     float t2 = sin(n / 50 + 1);
+     float t3 = sin(n / 30 + 2);
+ 
+-    float ambient[4]  = { (t1 + 2.0) / 3,
+-                          (t2 + 2.0) / 3,
+-                          (t3 + 2.0) / 3, 0.3 };
++    float ambient[4]  = { float(t1 + 2.0) / 3,
++                          float(t2 + 2.0) / 3,
++                          float(t3 + 2.0) / 3, 0.3 };
+     float diffuse[4]  = { 1.0, 0.9, 0.9, 1.0 };
+     float specular[4] = { 1.0, 0.7, 0.7, 1.0 };
+     float position[4] = { 100.0, 100.0, 0.0, 1.0 };
+-- 
+2.20.1
+
diff --git a/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb b/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb
index 4af3803f1a..b2911595cc 100644
--- a/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb
+++ b/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb
@@ -14,6 +14,7 @@  SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
     file://0001-use-pkg-config-to-find-freetype2.patch \
     file://0002-Makefile.am-remove-useless-and-breaking-code.patch \
+    file://0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch \
 "
 SRC_URI[md5sum] = "c7879018cde844059495b3029b0b6503"
 SRC_URI[sha256sum] = "521ff7bd62c459ff5372e269c223e2a6107a6a99a36afdc2ae634a973af70c59"