mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-11 04:49:58 +00:00
ftgl: Upgrade to 2.4.0
- Switch to git fork which has all the patches - Fix build with freetype 2.13.3 Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
-38
@@ -1,38 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
From d11219b681a080c71e33c51c9404c28b134e1745 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Wed, 21 Aug 2024 13:50:34 -0700
|
||||||
|
Subject: [PATCH] Fix type mismatch with latest FreeType
|
||||||
|
|
||||||
|
This change is intrumented due to a type change in freetype [1] with release 2.13.3
|
||||||
|
|
||||||
|
Fixes
|
||||||
|
| ../../git/src/FTVectoriser.cpp:171:15: error: cannot initialize a variable of type 'char *' with an rvalue of type 'unsigned char *'
|
||||||
|
| 171 | char* tagList = &outline.tags[startIndex];
|
||||||
|
| | ^ ~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
[1] https://gitlab.freedesktop.org/freetype/freetype/-/commit/044d142be7b6a93b6940367a1bc5847451ff4775
|
||||||
|
|
||||||
|
Upstream-Status: Submitted [https://github.com/frankheckenbach/ftgl/pull/19]
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
src/FTVectoriser.cpp | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/FTVectoriser.cpp b/src/FTVectoriser.cpp
|
||||||
|
index 26e7da8..3610215 100644
|
||||||
|
--- a/src/FTVectoriser.cpp
|
||||||
|
+++ b/src/FTVectoriser.cpp
|
||||||
|
@@ -168,7 +168,7 @@ void FTVectoriser::ProcessContours()
|
||||||
|
for(int i = 0; i < ftContourCount; ++i)
|
||||||
|
{
|
||||||
|
FT_Vector* pointList = &outline.points[startIndex];
|
||||||
|
- char* tagList = &outline.tags[startIndex];
|
||||||
|
+ char* tagList = (char*)&outline.tags[startIndex];
|
||||||
|
|
||||||
|
endIndex = outline.contours[i];
|
||||||
|
contourLength = (endIndex - startIndex) + 1;
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
-38
@@ -1,38 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
SUMMARY = "OpenGL frontend to Freetype 2"
|
|
||||||
HOMEPAGE = "https://sourceforge.net/projects/ftgl/"
|
|
||||||
LICENSE = "MIT"
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=527a83e92c7bf363025380eec05df6e4"
|
|
||||||
|
|
||||||
inherit autotools pkgconfig features_check
|
|
||||||
|
|
||||||
REQUIRED_DISTRO_FEATURES = "opengl x11"
|
|
||||||
|
|
||||||
DEPENDS += " \
|
|
||||||
freetype \
|
|
||||||
freeglut \
|
|
||||||
"
|
|
||||||
|
|
||||||
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"
|
|
||||||
|
|
||||||
S = "${WORKDIR}/ftgl-2.1.3~rc5"
|
|
||||||
|
|
||||||
# undefined reference to symbol 'sin@@GLIBC_2.4'
|
|
||||||
CFLAGS += "-lm"
|
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
SUMMARY = "OpenGL frontend to Freetype 2"
|
||||||
|
HOMEPAGE = "https://sourceforge.net/projects/ftgl/"
|
||||||
|
LICENSE = "MIT"
|
||||||
|
LIC_FILES_CHKSUM = "file://COPYING;md5=527a83e92c7bf363025380eec05df6e4"
|
||||||
|
|
||||||
|
inherit autotools pkgconfig features_check
|
||||||
|
|
||||||
|
REQUIRED_DISTRO_FEATURES = "opengl x11"
|
||||||
|
|
||||||
|
DEPENDS += " \
|
||||||
|
freetype \
|
||||||
|
freeglut \
|
||||||
|
"
|
||||||
|
SRCREV = "ddc77166651a71ae037ef3129a285440aa559b2d"
|
||||||
|
PV .= "+git"
|
||||||
|
|
||||||
|
SRC_URI = "git://github.com/frankheckenbach/ftgl;protocol=https;branch=master \
|
||||||
|
file://0001-Fix-type-mismatch-with-latest-FreeType.patch"
|
||||||
|
|
||||||
|
S = "${WORKDIR}/git"
|
||||||
Reference in New Issue
Block a user