Skip to content

Commit fc0264f

Browse files
committed
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>
1 parent 21a87a4 commit fc0264f

6 files changed

Lines changed: 53 additions & 141 deletions

meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch

Lines changed: 0 additions & 38 deletions
This file was deleted.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
From d11219b681a080c71e33c51c9404c28b134e1745 Mon Sep 17 00:00:00 2001
2+
From: Khem Raj <raj.khem@gmail.com>
3+
Date: Wed, 21 Aug 2024 13:50:34 -0700
4+
Subject: [PATCH] Fix type mismatch with latest FreeType
5+
6+
This change is intrumented due to a type change in freetype [1] with release 2.13.3
7+
8+
Fixes
9+
| ../../git/src/FTVectoriser.cpp:171:15: error: cannot initialize a variable of type 'char *' with an rvalue of type 'unsigned char *'
10+
| 171 | char* tagList = &outline.tags[startIndex];
11+
| | ^ ~~~~~~~~~~~~~~~~~~~~~~~~~
12+
13+
[1] https://gitlab.freedesktop.org/freetype/freetype/-/commit/044d142be7b6a93b6940367a1bc5847451ff4775
14+
15+
Upstream-Status: Submitted [https://github.com/frankheckenbach/ftgl/pull/19]
16+
Signed-off-by: Khem Raj <raj.khem@gmail.com>
17+
---
18+
src/FTVectoriser.cpp | 2 +-
19+
1 file changed, 1 insertion(+), 1 deletion(-)
20+
21+
diff --git a/src/FTVectoriser.cpp b/src/FTVectoriser.cpp
22+
index 26e7da8..3610215 100644
23+
--- a/src/FTVectoriser.cpp
24+
+++ b/src/FTVectoriser.cpp
25+
@@ -168,7 +168,7 @@ void FTVectoriser::ProcessContours()
26+
for(int i = 0; i < ftContourCount; ++i)
27+
{
28+
FT_Vector* pointList = &outline.points[startIndex];
29+
- char* tagList = &outline.tags[startIndex];
30+
+ char* tagList = (char*)&outline.tags[startIndex];
31+
32+
endIndex = outline.contours[i];
33+
contourLength = (endIndex - startIndex) + 1;

meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch

Lines changed: 0 additions & 38 deletions
This file was deleted.

meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch

Lines changed: 0 additions & 38 deletions
This file was deleted.

meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb

Lines changed: 0 additions & 27 deletions
This file was deleted.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
SUMMARY = "OpenGL frontend to Freetype 2"
2+
HOMEPAGE = "https://sourceforge.net/projects/ftgl/"
3+
LICENSE = "MIT"
4+
LIC_FILES_CHKSUM = "file://COPYING;md5=527a83e92c7bf363025380eec05df6e4"
5+
6+
inherit autotools pkgconfig features_check
7+
8+
REQUIRED_DISTRO_FEATURES = "opengl x11"
9+
10+
DEPENDS += " \
11+
freetype \
12+
freeglut \
13+
"
14+
SRCREV = "ddc77166651a71ae037ef3129a285440aa559b2d"
15+
PV .= "+git"
16+
17+
SRC_URI = "git://github.com/frankheckenbach/ftgl;protocol=https;branch=master \
18+
file://0001-Fix-type-mismatch-with-latest-FreeType.patch"
19+
20+
S = "${WORKDIR}/git"

0 commit comments

Comments
 (0)