Skip to content

Commit 07aad2f

Browse files
nicolas-cellier-aka-nicenicolas-cellier-aka-nice
committed
Ugrade freetype 2.9.1 -> 2.10.4
hence - remove the now useless patch - rebuild the win64 dll (same makefile as win32) rather than download from files.pharo.org
1 parent 836cba1 commit 07aad2f

File tree

5 files changed

+36
-51
lines changed

5 files changed

+36
-51
lines changed

‎build.win32x86/third-party/Makefile.freetype2‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ $(FREETYPE2ARCHIVE):
2020

2121
$(THIRDPARTYLIBDIR)/$(FREETYPE2LIBNAME): $(FREETYPE2ARCHIVE)
2222
tar x -f $(FREETYPE2ARCHIVE) -C $(THIRDPARTYDIR)
23-
patch -p1 -d $(FREETYPE2DIR) < ../../third-party/freetype291.patch
2423
cp ../third-party/Toolchain-cross-mingw32-cygwin.cmake $(FREETYPE2DIR)
2524
test -d $(FREETYPE2DIR)/build || mkdir $(FREETYPE2DIR)/build
2625
cd $(FREETYPE2DIR)/build \

‎build.win64x64/third-party/Makefile.freetype2‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,39 @@
1-
# Instead build, copy dependency from mingw distribution
2-
31
ifndef THIRDPARTYDIR
42
include ../common/Makefile.lib.extra
53
endif
64
include ../../third-party/freetype2.spec
7-
include ../../third-party/freetype2.spec.win64
85

9-
EXTERNALFILESURL:=https://files.pharo.org/vm/pharo-spur64/win/third-party
10-
FREETYPE2LIBNAME:=$(freetype2_spec_download_artifact_name_windows)
11-
FREETYPE2LIBINSTALLNAME:=$(freetype2_spec_product_name_windows)
12-
FREETYPE2LIB:=$(THIRDPARTYINSTALLDIR)/$(FREETYPE2LIBINSTALLNAME)
6+
# plugin definitions
7+
FREETYPE2URL:=$(freetype2_spec_download_url)
8+
FREETYPE2LIBNAME:=$(freetype2_spec_product_name_windows)
9+
FREETYPE2DIR:=$(THIRDPARTYDIR)/$(freetype2_spec_unpack_dir_name)
10+
FREETYPE2ARCHIVE:=$(THIRDPARTYCACHEDIR)/$(freetype2_spec_archive_name)
11+
FREETYPE2LIB:=$(THIRDPARTYINSTALLDIR)/$(FREETYPE2LIBNAME)
1312

14-
$(THIRDPARTYLIBDIR)/$(FREETYPE2LIBNAME):
15-
echo
16-
$(WGET) -O $(THIRDPARTYLIBDIR)/$(FREETYPE2LIBNAME) $(EXTERNALFILESURL)/$(FREETYPE2LIBNAME)
13+
# ensure third-party library is built and recognised by plugins
14+
INCDIRS:=$(INCDIRS) $(THIRDPARTYINCLUDEDIR) $(THIRDPARTYINCLUDEDIR)/freetype2
15+
EXTRALIBS:=$(EXTRALIBS) $(FREETYPE2LIB)
16+
PLUGINREQS:=$(PLUGINREQS) $(THIRDPARTYLIBS)
17+
18+
$(FREETYPE2ARCHIVE):
19+
$(WGET) -O $(FREETYPE2ARCHIVE) $(FREETYPE2URL)
20+
21+
$(THIRDPARTYLIBDIR)/$(FREETYPE2LIBNAME): $(FREETYPE2ARCHIVE)
22+
tar x -f $(FREETYPE2ARCHIVE) -C $(THIRDPARTYDIR)
23+
cp ../third-party/Toolchain-cross-mingw32-cygwin.cmake $(FREETYPE2DIR)
24+
test -d $(FREETYPE2DIR)/build || mkdir $(FREETYPE2DIR)/build
25+
cd $(FREETYPE2DIR)/build \
26+
&& cmake ..\
27+
-DCMAKE_TOOLCHAIN_FILE=../Toolchain-cross-mingw32-cygwin.cmake \
28+
-DCMAKE_INSTALL_PREFIX=$(THIRDPARTYOUTDIR) \
29+
-DWITH_PNG=OFF \
30+
-DBUILD_SHARED_LIBS=ON \
31+
-DCMAKE_C_FLAGS="$(THIRDPARTY_CFLAGS)" \
32+
&& make \
33+
&& make install \
34+
&& cp libfreetype.dll $(THIRDPARTYLIBDIR)/$(FREETYPE2LIBNAME)
1735

1836
$(FREETYPE2LIB): pkgconfig libpng $(THIRDPARTYLIBDIR)/$(FREETYPE2LIBNAME)
19-
cp -f $(THIRDPARTYLIBDIR)/$(FREETYPE2LIBNAME) $(FREETYPE2LIB)
20-
37+
cp -f $(THIRDPARTYLIBDIR)/$(FREETYPE2LIBNAME) $(THIRDPARTYINSTALLDIR)
38+
2139
freetype2: $(FREETYPE2LIB)

‎cmake/FreeType2.cmake‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
1-
set(FreeType2_Spec_URL "http://ftp.igh.cnrs.fr/pub/nongnu/freetype/freetype-2.9.1.tar.gz")
2-
set(FreeType2_Spec_ArchiveName freetype-2.9.1.tar.gz)
3-
set(FreeType2_Spec_ArchiveHash "SHA256=ec391504e55498adceb30baceebd147a6e963f636eb617424bcfc47a169898ce")
1+
set(FreeType2_Spec_URL "https://download.savannah.gnu.org/releases/freetype/freetype-2.10.4.tar.xz")
2+
set(FreeType2_Spec_ArchiveName freetype-2.10.4.tar.xz)
3+
set(FreeType2_Spec_ArchiveHash "SHA256=86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784")
44

55
set(FreeType2_Spec_MacLibraries libfreetype.6.dylib)
66
set(FreeType2_Spec_MacLibrariesSymlinks libfreetype*.dylib)
77
set(FreeType2_Spec_WindowsDLLs libfreetype.dll)
88

9-
set(FreeType2_Spec_Patch "${CMAKE_CURRENT_SOURCE_DIR}/third-party/freetype291.patch")
10-
119
if(WIN32)
1210
add_thirdparty_with_cmake(FreeType2
1311
DOWNLOAD_URL ${FreeType2_Spec_URL}
1412
ARCHIVE_NAME ${FreeType2_Spec_ArchiveName}
1513
ARCHIVE_HASH ${FreeType2_Spec_ArchiveHash}
16-
PATCH ${FreeType2_Spec_Patch}
1714
CMAKE_EXTRA_ARGS -DCMAKE_DISABLE_FIND_PACKAGE_PNG=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -DBUILD_SHARED_LIBS=ON
1815
MAC_LIBRARIES ${FreeType2_Spec_MacLibraries}
1916
MAC_LIBRARIES_SYMLINK_PATTERNS ${FreeType2_Spec_MacLibrariesSymlinks}
@@ -27,7 +24,6 @@ else()
2724
DOWNLOAD_URL ${FreeType2_Spec_URL}
2825
ARCHIVE_NAME ${FreeType2_Spec_ArchiveName}
2926
ARCHIVE_HASH ${FreeType2_Spec_ArchiveHash}
30-
PATCH ${FreeType2_Spec_Patch}
3127
AUTOCONF_EXTRA_ARGS --without-png --without-bzip2
3228
MAC_LIBRARIES ${FreeType2_Spec_MacLibraries}
3329
MAC_LIBRARIES_SYMLINK_PATTERNS ${FreeType2_Spec_MacLibrariesSymlinks}

‎third-party/freetype2.spec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
freetype2_spec_download_url:=http://ftp.igh.cnrs.fr/pub/nongnu/freetype/freetype-2.9.1.tar.gz
2-
freetype2_spec_archive_name:=freetype-2.9.1.tar.gz
3-
freetype2_spec_unpack_dir_name:=freetype-2.9.1
1+
freetype2_spec_download_url:=https://download.savannah.gnu.org/releases/freetype/freetype-2.10.4.tar.xz
2+
freetype2_spec_archive_name:=freetype-2.10.4.tar.xz
3+
freetype2_spec_unpack_dir_name:=freetype-2.10.4
44
freetype2_spec_product_name_macOS:=libfreetype.6.dylib
55
freetype2_spec_product_name_linux:=
66
freetype2_spec_product_name_windows:=libfreetype.dll

‎third-party/freetype291.patch‎

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

0 commit comments

Comments
 (0)