-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ftgl: Fix builds with freetype 2.13.3
Based on research into this issue, freetype 2.13.3 changed some return types that caused current (modern?) builds to fail as seen in the linked ticket. A patch was applied with frankheckenbach/ftgl#20 that appears to fix this, but the repo owner has not indicated a plan to cut a new release with this and other fixes since v2.4.0. In addition to the patch files that were previously present, I have applied all other patches from v2.4.0 to current HEAD. This involved removing the existing patch files, but those changes have been fully incorporated. Builds with +doc and +universal variants worked fine and I have tested a downstream port (gource) with this on an affected system. macOS 15.2 24C101 arm64 Xcode 16.2 16C5032a Closes: https://trac.macports.org/ticket/71434
- Loading branch information
1 parent
3935297
commit 92594ff
Showing
8 changed files
with
493 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
graphics/ftgl/files/0001-fix-duplicated-entry-in-doc.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| From bf07517ded4704be37eef39b758b5206fc6f4f0d Mon Sep 17 00:00:00 2001 | ||
| From: Frank Heckenbach | ||
| Date: Fri, 8 Feb 2019 02:48:57 +0100 | ||
| Subject: [PATCH 01/14] fix duplicated entry in doc | ||
|
|
||
| --- | ||
| ChangeLog | 4 ++++ | ||
| docs/projects_using_ftgl.txt | 2 +- | ||
| 2 files changed, 5 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/ChangeLog b/ChangeLog | ||
| index 42fef90bc716..ee06b8a2f5ee 100644 | ||
| --- a/ChangeLog | ||
| +++ b/ChangeLog | ||
| @@ -1,5 +1,9 @@ | ||
| +2019-02-08 00:44 Manuel A. Fernandez Montecelo | ||
| + | ||
| + * docs/projects_using_ftgl.txt: fix duplicated entry in doc | ||
| + | ||
| 2019-02-07 22:35 Frank Heckenbach <[email protected]> | ||
|
|
||
| * NEWS, configure.ac, ppa_upload.sh, msvc/config.h, CMakeLists.txt: | ||
| * Mark package as being version 2.4.0. | ||
|
|
||
| diff --git a/docs/projects_using_ftgl.txt b/docs/projects_using_ftgl.txt | ||
| index 0b756a898316..2066350de323 100644 | ||
| --- a/docs/projects_using_ftgl.txt | ||
| +++ b/docs/projects_using_ftgl.txt | ||
| @@ -152,11 +152,11 @@ Projects are listed in alphabetical order. | ||
| \subsection duel Duel | ||
|
|
||
| Duel (http://www.personal.rdg.ac.uk/~sir03me/play/code.html) is a small | ||
| overhead perspective spaceship game. | ||
|
|
||
| -\subsection emptyclip EMAN2 | ||
| +\subsection eman2 EMAN2 | ||
|
|
||
| EMAN2 (http://blake.bcm.tmc.edu/eman/eman2/) is a suite of | ||
| scientific image processing tools aimed primarily at the | ||
| transmission electron microscopy community. | ||
|
|
||
| -- | ||
| 2.47.1 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| From 778b8f21ba0b71289aef37e3422d008456445971 Mon Sep 17 00:00:00 2001 | ||
| From: Frank Heckenbach | ||
| Date: Fri, 24 May 2019 23:58:47 +0200 | ||
| Subject: [PATCH 06/14] src/FTFont/FTBufferFont.cpp, | ||
| src/FTFont/FTTextureFont.cpp: GL_TEXTURE_ENV_MODE is not valid mask for | ||
| glPushAttrib. Use GL_TEXTURE_BIT instead to avoid leaking texture env mode. | ||
| (reported by Eddie-cz, https://github.com/frankheckenbach/ftgl/issues/3) | ||
|
|
||
| --- | ||
| ChangeLog | 7 +++++++ | ||
| src/FTFont/FTBufferFont.cpp | 2 +- | ||
| src/FTFont/FTTextureFont.cpp | 2 +- | ||
| 3 files changed, 9 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/ChangeLog b/ChangeLog | ||
| index 10db8101ab2f..0bb44b8d53cd 100644 | ||
| --- a/ChangeLog | ||
| +++ b/ChangeLog | ||
| @@ -1,6 +1,13 @@ | ||
| -2019-02-08 00:44 Manuel A. Fernandez Montecelo | ||
| +2019-05-24 23:57 Frank Heckenbach <[email protected]> | ||
| + | ||
| + * src/FTFont/FTBufferFont.cpp, src/FTFont/FTTextureFont.cpp: | ||
| + GL_TEXTURE_ENV_MODE is not valid mask for glPushAttrib. | ||
| + Use GL_TEXTURE_BIT instead to avoid leaking texture env mode. | ||
| + (reported by Eddie-cz, https://github.com/frankheckenbach/ftgl/issues/3) | ||
| + | ||
| + 2019-02-08 00:44 Manuel A. Fernandez Montecelo | ||
|
|
||
| * docs/projects_using_ftgl.txt: fix duplicated entry in doc | ||
|
|
||
| 2019-02-07 22:35 Frank Heckenbach <[email protected]> | ||
|
|
||
| diff --git a/src/FTFont/FTBufferFont.cpp b/src/FTFont/FTBufferFont.cpp | ||
| index ce04cf56ae0f..b330a3b119f7 100644 | ||
| --- a/src/FTFont/FTBufferFont.cpp | ||
| +++ b/src/FTFont/FTBufferFont.cpp | ||
| @@ -230,11 +230,11 @@ inline FTPoint FTBufferFontImpl::RenderI(const T* string, const int len, | ||
| int width, height, texWidth, texHeight; | ||
| int cacheIndex = -1; | ||
| bool inCache = false; | ||
|
|
||
| // Protect blending functions, GL_TEXTURE_2D and optionally GL_BLEND | ||
| - glPushAttrib(GL_COLOR_BUFFER_BIT | GL_ENABLE_BIT | GL_TEXTURE_ENV_MODE); | ||
| + glPushAttrib(GL_COLOR_BUFFER_BIT | GL_ENABLE_BIT | GL_TEXTURE_BIT); | ||
|
|
||
| // Protect glPixelStorei() calls | ||
| glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT); | ||
|
|
||
| if(FTLibrary::Instance().GetLegacyOpenGLStateSet()) | ||
| diff --git a/src/FTFont/FTTextureFont.cpp b/src/FTFont/FTTextureFont.cpp | ||
| index 97e876876e12..a5145cf05f53 100644 | ||
| --- a/src/FTFont/FTTextureFont.cpp | ||
| +++ b/src/FTFont/FTTextureFont.cpp | ||
| @@ -239,11 +239,11 @@ template <typename T> | ||
| inline FTPoint FTTextureFontImpl::RenderI(const T* string, const int len, | ||
| FTPoint position, FTPoint spacing, | ||
| int renderMode) | ||
| { | ||
| // Protect GL_TEXTURE_2D and optionally GL_BLEND | ||
| - glPushAttrib(GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_TEXTURE_ENV_MODE); | ||
| + glPushAttrib(GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_TEXTURE_BIT); | ||
|
|
||
| if(FTLibrary::Instance().GetLegacyOpenGLStateSet()) | ||
| { | ||
| glEnable(GL_BLEND); | ||
| /* | ||
| -- | ||
| 2.47.1 | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.