diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2013-12-24 21:22:21 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2013-12-24 21:22:21 +0000 |
| commit | b1bf1620a6571c5eb84bed4e3f06cf52094d0a48 (patch) | |
| tree | 93506aaee5230ee46b75930c4b3a6b8e0f243d74 /graphics/osg | |
| parent | - Properly look for X11 using CMake and include the appropriate directories (diff) | |
Update freetype to 2.5.2.
Remove patch to add -I/usr/local/include in freetype-config --cflags. If
ports need extra headers they should look for them, and not get them via
a side-effect.
Freetype had a header resuffle in 2.5.1, patch ports to use the new header
style.
Thanks go to bdrewery for the two exp-runs and rakuco for helping me with
some troublesome cmake ports.
PR: ports/184587
Diffstat (limited to 'graphics/osg')
| -rw-r--r-- | graphics/osg/files/patch-CMakeModules_FindFreeType.cmake | 44 | ||||
| -rw-r--r-- | graphics/osg/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp | 14 |
2 files changed, 58 insertions, 0 deletions
diff --git a/graphics/osg/files/patch-CMakeModules_FindFreeType.cmake b/graphics/osg/files/patch-CMakeModules_FindFreeType.cmake new file mode 100644 index 000000000000..135d24e12ff3 --- /dev/null +++ b/graphics/osg/files/patch-CMakeModules_FindFreeType.cmake @@ -0,0 +1,44 @@ +--- CMakeModules/FindFreeType.cmake.orig 2013-12-24 19:18:24.000000000 +0100 ++++ CMakeModules/FindFreeType.cmake 2013-12-24 19:19:27.000000000 +0100 +@@ -24,18 +24,18 @@ + # wants explicit full paths and this trickery doesn't work too well. + # I'm going to attempt to cut out the middleman and hope + # everything still works. +-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h ++FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h + PATHS + $ENV{FREETYPE_DIR} + NO_DEFAULT_PATH + PATH_SUFFIXES include + ) +-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h ++FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h + PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. + NO_DEFAULT_PATH + PATH_SUFFIXES include + ) +-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h ++FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h + PATHS + /usr/local + /usr +@@ -51,16 +51,16 @@ + PATH_SUFFIXES include + ) + +-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h ++FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h + $ENV{FREETYPE_DIR}/include/freetype2 + NO_DEFAULT_PATH + ) +-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h ++FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h + PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. + NO_DEFAULT_PATH + PATH_SUFFIXES include/freetype2 + ) +-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h ++FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h + /usr/local/include/freetype2 + /usr/include/freetype2 + /usr/local/X11R6/include/freetype2 diff --git a/graphics/osg/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp b/graphics/osg/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp new file mode 100644 index 000000000000..eaae7ca841dc --- /dev/null +++ b/graphics/osg/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp @@ -0,0 +1,14 @@ +--- src/osgPlugins/freetype/FreeTypeFont.cpp.orig 2013-12-24 19:29:26.000000000 +0100 ++++ src/osgPlugins/freetype/FreeTypeFont.cpp 2013-12-24 19:30:24.000000000 +0100 +@@ -14,8 +14,9 @@ + #include "FreeTypeFont.h" + #include "FreeTypeLibrary.h" + +-#include <freetype/ftoutln.h> +-#include <freetype/ftbbox.h> ++#include <ft2build.h> ++#include FT_OUTLINE_H ++#include FT_BBOX_H + + #include <osg/Notify> + #include <osg/io_utils> |