d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update: freetype, harfbuzz 

Update requires a second occurence of libfreetype in the static link
list to resolved symbols in the second occurence of libharfbuzz.
This commit is contained in:
Mark Brand 2017-06-11 01:28:46 +02:00
parent 862ba8fdf1
commit 95e0d6da70
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/freetype.mk
View File

@ -3,8 +3,8 @@
PKG := freetype
$(PKG)_WEBSITE := https://www.freetype.org/
$(PKG)_IGNORE :=
$(PKG)_VERSION := 2.7
$(PKG)_CHECKSUM := d6a451f5b754857d2aa3964fd4473f8bc5c64e879b24516d780fb26bec7f7d48
$(PKG)_VERSION := 2.8
$(PKG)_CHECKSUM := a3c603ed84c3c2495f9c9331fe6bba3bb0ee65e06ec331e0a0fb52158291b40b
$(PKG)_SUBDIR := freetype-$($(PKG)_VERSION)
$(PKG)_FILE := freetype-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/freetype/freetype2/$(shell echo '$($(PKG)_VERSION)' | cut -d . -f 1,2,3)/$($(PKG)_FILE)
@ -23,15 +23,17 @@ define $(PKG)_BUILD_COMMON
LIBPNG_CFLAGS="`$(TARGET)-pkg-config libpng --cflags`" \
LIBPNG_LDFLAGS="`$(TARGET)-pkg-config libpng --libs`" \
FT2_EXTRA_LIBS="`$(TARGET)-pkg-config libpng --libs`" \
$(if $(BUILD_STATIC),HARFBUZZ_LIBS="`$(TARGET)-pkg-config harfbuzz --libs` -lharfbuzz_too `$(TARGET)-pkg-config glib-2.0 --libs`",)
$(if $(BUILD_STATIC),HARFBUZZ_LIBS="`$(TARGET)-pkg-config harfbuzz --libs` -lharfbuzz_too -lfreetype_too `$(TARGET)-pkg-config glib-2.0 --libs`",)
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
ln -sf '$(PREFIX)/$(TARGET)/bin/freetype-config' '$(PREFIX)/bin/$(TARGET)-freetype-config'
endef
define $(PKG)_BUILD
# alias harfbuzz to handle linking circularity
# alias libharfbuzz and libfreetype to satisfy circular dependence
# libfreetype should already have been created by freetype-bootstrap.mk
$(if $(BUILD_STATIC),\
ln -sf libharfbuzz.a '$(PREFIX)/$(TARGET)/lib/libharfbuzz_too.a',)
ln -sf libharfbuzz.a '$(PREFIX)/$(TARGET)/lib/libharfbuzz_too.a' \
&& ln -sf libfreetype.a '$(PREFIX)/$(TARGET)/lib/libfreetype_too.a',)
$($(PKG)_BUILD_COMMON)
endef

4
src/harfbuzz.mk
View File

@ -4,8 +4,8 @@ PKG := harfbuzz
$(PKG)_WEBSITE := https://wiki.freedesktop.org/www/Software/HarfBuzz/
$(PKG)_DESCR := HarfBuzz
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.4.1
$(PKG)_CHECKSUM := 85a27fab639a1d651737dcb6b69e4101e3fd09522fdfdcb793df810b5cb315bd
$(PKG)_VERSION := 1.4.6
$(PKG)_CHECKSUM := 21a78b81cd20cbffdb04b59ac7edfb410e42141869f637ae1d6778e74928d293
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := https://www.freedesktop.org/software/$(PKG)/release/$($(PKG)_FILE)