diff options
| author | Bradley Sepos <[email protected]> | 2019-02-21 11:26:56 -0500 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2019-02-26 17:01:57 -0500 |
| commit | f60354ef7ece3c69a0c6e83021778c28270b2880 (patch) | |
| tree | 35d5a4b7ff7853898baa4a6355a7b797301c60d5 /contrib | |
| parent | 982adb1b79f4075cfc7790c0bbbdb8438fc37f1a (diff) | |
contrib: Update to FreeType 2.9.1.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/freetype/P00-mingw-lib.patch | 24 | ||||
| -rw-r--r-- | contrib/freetype/module.defs | 6 |
2 files changed, 27 insertions, 3 deletions
diff --git a/contrib/freetype/P00-mingw-lib.patch b/contrib/freetype/P00-mingw-lib.patch new file mode 100644 index 000000000..607a0956c --- /dev/null +++ b/contrib/freetype/P00-mingw-lib.patch @@ -0,0 +1,24 @@ +diff -ur freetype-2.9.1.orig/builds/unix/ftconfig.in freetype-2.9.1/builds/unix/ftconfig.in +--- freetype-2.9.1.orig/builds/unix/ftconfig.in 2018-04-22 05:41:36.000000000 -0400 ++++ freetype-2.9.1/builds/unix/ftconfig.in 2019-02-26 15:43:31.000000000 -0500 +@@ -490,7 +490,7 @@ + #ifdef FT2_BUILD_LIBRARY + + #if defined( _WIN32 ) && ( defined( _DLL ) || defined( DLL_EXPORT ) ) +-#define FT_EXPORT( x ) __declspec( dllexport ) x ++#define FT_EXPORT( x ) x + #elif defined( __GNUC__ ) && __GNUC__ >= 4 + #define FT_EXPORT( x ) __attribute__(( visibility( "default" ) )) x + #elif defined( __cplusplus ) +diff -ur freetype-2.9.1.orig/include/freetype/config/ftconfig.h freetype-2.9.1/include/freetype/config/ftconfig.h +--- freetype-2.9.1.orig/include/freetype/config/ftconfig.h 2018-04-22 05:41:36.000000000 -0400 ++++ freetype-2.9.1/include/freetype/config/ftconfig.h 2019-02-26 15:43:49.000000000 -0500 +@@ -458,7 +458,7 @@ + #ifdef FT2_BUILD_LIBRARY + + #if defined( _WIN32 ) && ( defined( _DLL ) || defined( DLL_EXPORT ) ) +-#define FT_EXPORT( x ) __declspec( dllexport ) x ++#define FT_EXPORT( x ) x + #elif defined( __GNUC__ ) && __GNUC__ >= 4 + #define FT_EXPORT( x ) __attribute__(( visibility( "default" ) )) x + #elif defined( __cplusplus ) diff --git a/contrib/freetype/module.defs b/contrib/freetype/module.defs index 19b11c902..bb88bfd22 100644 --- a/contrib/freetype/module.defs +++ b/contrib/freetype/module.defs @@ -2,8 +2,8 @@ __deps__ := BZIP2 ZLIB $(eval $(call import.MODULE.defs,FREETYPE,freetype,$(__deps__))) $(eval $(call import.CONTRIB.defs,FREETYPE)) -FREETYPE.FETCH.url = https://download.handbrake.fr/handbrake/contrib/freetype-2.8.1.tar.bz2 -FREETYPE.FETCH.url += https://download.savannah.gnu.org/releases/freetype/freetype-2.8.1.tar.bz2 -FREETYPE.FETCH.sha256 = e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78 +FREETYPE.FETCH.url = https://download.handbrake.fr/handbrake/contrib/freetype-2.9.1.tar.bz2 +FREETYPE.FETCH.url += https://download.savannah.gnu.org/releases/freetype/freetype-2.9.1.tar.bz2 +FREETYPE.FETCH.sha256 = db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d FREETYPE.CONFIGURE.extra = --with-harfbuzz=no --with-png=no |