From c0156644ae7d372f51a1e298ec82952d41fda8d3 Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Mon, 9 Jul 2018 12:08:09 +0000 Subject: x11-clocks/glclock: Fix build with Clang 6 GLObject.cpp:843:22: error: non-constant-expression cannot be narrowed from type 'double' to 'GLfloat' (aka 'float') in initializer list [-Wc++11-narrowing] GLfloat lamb[4] = { color[0] * 0.1, color[1] * 0.1, color[2] * 0.1, 1.0f } ; ^~~~~~~~~~~~~~ http://beefy12.nyi.freebsd.org/data/head-amd64-default/p474051_s336054/logs/glclock-6.0.b6.0_6.log --- x11-clocks/glclock/files/patch-GLObject.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 x11-clocks/glclock/files/patch-GLObject.cpp diff --git a/x11-clocks/glclock/files/patch-GLObject.cpp b/x11-clocks/glclock/files/patch-GLObject.cpp new file mode 100644 index 000000000000..5a8ec51c574e --- /dev/null +++ b/x11-clocks/glclock/files/patch-GLObject.cpp @@ -0,0 +1,15 @@ +GLObject.cpp:843:22: error: non-constant-expression cannot be narrowed from type 'double' to 'GLfloat' (aka 'float') in initializer list [-Wc++11-narrowing] + GLfloat lamb[4] = { color[0] * 0.1, color[1] * 0.1, color[2] * 0.1, 1.0f } ; + ^~~~~~~~~~~~~~ + +--- GLObject.cpp.orig 2018-07-09 11:47:42 UTC ++++ GLObject.cpp +@@ -840,7 +840,7 @@ void SetDirectionalLight(GLenum light, GLfloat pos[4], + GLfloat amb, GLfloat specularFlag, GLfloat bright, GLfloat *modulate) + { + GLfloat color[4] = { colorRGBA[0], colorRGBA[1], colorRGBA[2], 1.0f } ; // colorRGBA[3] } ; +- GLfloat lamb[4] = { color[0] * 0.1, color[1] * 0.1, color[2] * 0.1, 1.0f } ; ++ GLfloat lamb[4] = { color[0] * 0.1f, color[1] * 0.1f, color[2] * 0.1f, 1.0f } ; + static GLfloat u_pos[4] ; + static GLfloat spec[4] = { 0.0f, 0.0f, 0.0f, 1.0f } ; + -- cgit v1.2.3