diff options
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl')
3 files changed, 114 insertions, 0 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch b/external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch new file mode 100644 index 00000000..385bff8d --- /dev/null +++ b/external/meta-openembedded/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/external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch b/external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch new file mode 100644 index 00000000..cf03cd0f --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch @@ -0,0 +1,38 @@ +From 8bb183926078b6dd54048fb6820838fe7b6e6163 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Sun, 23 Oct 2016 22:46:43 +0200 +Subject: [PATCH] use pkg-config to find freetype2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + configure.ac | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 53560ea..b5bb6a3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -41,8 +41,13 @@ AC_CHECK_FUNCS(strndup) + + AC_PATH_X + +-AC_CHECK_FT2([9.0.3],[], +- [AC_MSG_ERROR([FreeType2 is required to compile this library])]) ++PKG_CHECK_MODULES(FT2, freetype2, ++ CFLAGS="$CFLAGS $FT2_CFLAGS" ++ LIBS="$LIBS $FT2_LIBS", ++ AC_MSG_ERROR([FreeType2 is required to compile this library]) ++) ++AC_SUBST([FT2_CFLAGS]) ++AC_SUBST([FT2_LIBS]) + + AC_PATH_XTRA + +-- +2.5.5 + diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch b/external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch new file mode 100644 index 00000000..830783e2 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch @@ -0,0 +1,38 @@ +From daabb4110661c4358ec73293d5c0b2106f567c1f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Sun, 23 Oct 2016 23:54:14 +0200 +Subject: [PATCH] Makefile.am: remove useless and breaking code +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + Makefile.am | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 89a8a7f..e582a34 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -24,15 +24,6 @@ EXTRA_DIST = \ + m4 \ + $(NULL) + +-# Print out an informative summary. +-all-local: +- @$(ECHO) "Done." +- @$(ECHO) +- @if test "x$(MAKECMDGOALS)" = "xall-am" -o "x$(.TARGETS)" = "xall-am" -o "x$(MAKECMDGOALS)" = "x" -o "x$(.TARGETS)" = "x" ; then \ +- $(ECHO) "---" ;\ +- $(ECHO) "Run 'make install' to begin installation into $(prefix)" ;\ +- fi +- @$(ECHO) + + # Upload documentation + DOC = docs/html docs/latex/ftgl.pdf +-- +2.5.5 + |