Support circular dependency of harfbuzz-freetype

vitasdk · Jan 19, 2018 · a5f6eca · a5f6eca
1 parent 36015b9
commit a5f6eca
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/freetype/VITABUILD b/freetype/VITABUILD
@@ -1,14 +1,14 @@
 pkgname=freetype
-pkgver=2.7
+pkgver=2.9
 pkgrel=1
 url="https://www.freetype.org/"
 source=("http://downloads.sourceforge.net/project/freetype/freetype2/${pkgver}/freetype-${pkgver}.tar.gz")
-sha256sums=('7b657d5f872b0ab56461f3bd310bd1c5ec64619bd15f0d8e08282d494d9cfea4')
+sha256sums=('bf380e4d7c4f3b5b1c1a7b2bf3abb967bda5e9ab480d0df656e0e08c5019c5e6')
 
 build() {
   cd freetype-$pkgver
   mkdir build && cd build
-  cmake .. $CMARGS -DWITH_ZLIB=ON -DWITH_BZip2=OFF -DWITH_PNG=ON -DWITH_HarfBuzz=OFF -DCMAKE_INSTALL_PREFIX=$prefix
+  cmake .. $CMARGS -DWITH_ZLIB=ON -DWITH_BZip2=OFF -DWITH_PNG=ON -DWITH_HarfBuzz=ON -DCMAKE_INSTALL_PREFIX=$prefix
   make
 }
 

diff --git a/harfbuzz/VITABUILD b/harfbuzz/VITABUILD
@@ -10,12 +10,11 @@ prepare() {
 
 build() {
   cd harfbuzz-$pkgver
-  mkdir build && cd build
-  cmake .. $CMARGS -DCMAKE_INSTALL_PREFIX=$prefix
+  ./autogen.sh --host arm-vita-eabi --prefix=$prefix --with-freetype=${WITHFT:-yes} --with-glib=no --with-icu=no --with-cairo=no --with-fontconfig=no
   make
 }
 
 package () {
-  cd harfbuzz-$pkgver/build
+  cd harfbuzz-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/travis_packages.sh b/travis_packages.sh
@@ -11,6 +11,7 @@ b libexif
 b libjpeg-turbo
 b jansson
 b yaml-cpp
+WITHFT=no b harfbuzz # once without ft to support hb-ft circular dependency
 b freetype
 b harfbuzz
 b fftw