2
0
mirror of https://codeberg.org/kiss-community/repo synced 2024-11-19 13:10:07 -07:00

freetype-harfbuzz: bump to 2.10.2+2.7.0, swap to meson.

The harfbuzz upstream have decided to no longer publish release
tarballs (which contained pre-generated autotools stuff). This
commit swaps to using meson (as is recommended upstream) to
prevent adding a dependency on autotools.
This commit is contained in:
Dylan Araps 2020-07-27 16:45:56 +03:00
parent b33560d583
commit 2e5271ccde
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
5 changed files with 18 additions and 11 deletions

View File

@ -16,14 +16,20 @@ build_freetype() (
build_harfbuzz() ( build_harfbuzz() (
cd harfbuzz cd harfbuzz
./configure \ export DESTDIR="$1"
--prefix=/usr \
--with-glib=yes \
--with-icu=no \
--with-cairo=no
make meson \
make DESTDIR="$1" install --default-library=both \
--prefix=/usr \
-Dfreetype=enabled \
-Dglib=enabled \
-Dicu=disabled \
-Dbenchmark=disabled \
-Dtests=disabled \
. output
ninja -C output
ninja -C output install
) )
build_freetype "$1" no build_freetype "$1" no
@ -36,6 +42,6 @@ build_harfbuzz "$1"
# Point Freetype to the Harfbuzz files. # Point Freetype to the Harfbuzz files.
export HARFBUZZ_CFLAGS="-I$PWD/harfbuzz/src" export HARFBUZZ_CFLAGS="-I$PWD/harfbuzz/src"
export HARFBUZZ_LIBS="-L$PWD/harfbuzz/src/.libs -lharfbuzz" export HARFBUZZ_LIBS="-L$PWD/harfbuzz/output/src -lharfbuzz"
build_freetype "$1" yes build_freetype "$1" yes

View File

@ -1,2 +1,2 @@
1543d61025d2e6312e0a1c563652555f17378a204a61e99928c9fcef030a2d8b freetype-2.10.2.tar.xz 1543d61025d2e6312e0a1c563652555f17378a204a61e99928c9fcef030a2d8b freetype-2.10.2.tar.xz
6648a571a27f186e47094121f0095e1b809e918b3037c630c7f38ffad86e3035 harfbuzz-2.6.8.tar.xz 4dba05de1fd44705f54c40d801e0e3d4833555d004cb611cc18675173feae75b 2.7.0.tar.gz

View File

@ -13,5 +13,6 @@ libpng
libxcb libxcb
libxshmfence libxshmfence
mesa mesa
meson make
pixman pixman
zlib zlib

View File

@ -1,2 +1,2 @@
https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.10.2.tar.xz freetype https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.10.2.tar.xz freetype
https://github.com/harfbuzz/harfbuzz/releases/download/2.6.8/harfbuzz-2.6.8.tar.xz harfbuzz https://github.com/harfbuzz/harfbuzz/archive/2.7.0.tar.gz harfbuzz

View File

@ -1 +1 @@
2.10.2+2.6.8 1 2.10.2+2.7.0 1