diff options
Diffstat (limited to 'meta-oe/recipes-graphics/ftgl')
-rw-r--r-- | meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch | 38 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb | 1 |
2 files changed, 39 insertions, 0 deletions
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 000000000..385bff8dd --- /dev/null +++ b/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From e3bce98a60d6db3b719bbf5d71f732f9b86cb566 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 9 Feb 2019 08:28:09 -0800 | ||
4 | Subject: [PATCH] Explicit typecast to avoid implicit double to float | ||
5 | conversion | ||
6 | |||
7 | fixes compile errors e.g. | ||
8 | |||
9 | ../../ftgl-2.1.3~rc5/demo/simple.cpp:110:27: error: non-constant-expression cannot be narrowed from type 'double' to | ||
10 | 'float' in initializer list [-Wc++11-narrowing] | ||
11 | (t3 + 2.0) / 3, 0.3 }; | ||
12 | ^~~~~~~~~~~~~~ | ||
13 | Upstream-Status: Pending | ||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | demo/simple.cpp | 6 +++--- | ||
17 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
18 | |||
19 | diff --git a/demo/simple.cpp b/demo/simple.cpp | ||
20 | index 532e862..aba55b4 100644 | ||
21 | --- a/demo/simple.cpp | ||
22 | +++ b/demo/simple.cpp | ||
23 | @@ -105,9 +105,9 @@ static void RenderScene(void) | ||
24 | float t2 = sin(n / 50 + 1); | ||
25 | float t3 = sin(n / 30 + 2); | ||
26 | |||
27 | - float ambient[4] = { (t1 + 2.0) / 3, | ||
28 | - (t2 + 2.0) / 3, | ||
29 | - (t3 + 2.0) / 3, 0.3 }; | ||
30 | + float ambient[4] = { float(t1 + 2.0) / 3, | ||
31 | + float(t2 + 2.0) / 3, | ||
32 | + float(t3 + 2.0) / 3, 0.3 }; | ||
33 | float diffuse[4] = { 1.0, 0.9, 0.9, 1.0 }; | ||
34 | float specular[4] = { 1.0, 0.7, 0.7, 1.0 }; | ||
35 | float position[4] = { 100.0, 100.0, 0.0, 1.0 }; | ||
36 | -- | ||
37 | 2.20.1 | ||
38 | |||
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 4af3803f1..b2911595c 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 = " \ | |||
14 | ${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ | 14 | ${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ |
15 | file://0001-use-pkg-config-to-find-freetype2.patch \ | 15 | file://0001-use-pkg-config-to-find-freetype2.patch \ |
16 | file://0002-Makefile.am-remove-useless-and-breaking-code.patch \ | 16 | file://0002-Makefile.am-remove-useless-and-breaking-code.patch \ |
17 | file://0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch \ | ||
17 | " | 18 | " |
18 | SRC_URI[md5sum] = "c7879018cde844059495b3029b0b6503" | 19 | SRC_URI[md5sum] = "c7879018cde844059495b3029b0b6503" |
19 | SRC_URI[sha256sum] = "521ff7bd62c459ff5372e269c223e2a6107a6a99a36afdc2ae634a973af70c59" | 20 | SRC_URI[sha256sum] = "521ff7bd62c459ff5372e269c223e2a6107a6a99a36afdc2ae634a973af70c59" |