Support circular depedency of harfbuzz-freetype

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

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/freetype/VITABUILD b/freetype/VITABUILD
@@ -7,8 +7,9 @@ sha256sums=('7b657d5f872b0ab56461f3bd310bd1c5ec64619bd15f0d8e08282d494d9cfea4')
 
 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
+  mkdir build || true
+  cd build
+  cmake .. $CMARGS -DWITH_ZLIB=ON -DWITH_BZip2=OFF -DWITH_PNG=ON -DWITH_HarfBuzz=${WITHHB:-ON} -DCMAKE_INSTALL_PREFIX=$prefix
   make
 }
 

diff --git a/harfbuzz/VITABUILD b/harfbuzz/VITABUILD
@@ -1,9 +1,9 @@
 pkgname=harfbuzz
-pkgver=1.4.8
+pkgver=1.7.4
 pkgrel=1
 url="http://harfbuzz.org/"
-source=("https://github.com/behdad/harfbuzz/releases/download/${pkgver}/harfbuzz-${pkgver}.tar.bz2")
-sha256sums=('ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131')
+source=("http://138.197.85.246/~ebrahim/harfbuzz-${pkgver}.tar.bz2")
+sha256sums=('f57616a00aab99739ba89e52aeadf3f868046778dd0f2d88e477bbaadb52ec47')
 prepare() {
   cd $pkgname-$pkgver
 }

diff --git a/travis_packages.sh b/travis_packages.sh
@@ -11,8 +11,9 @@ b libexif
 b libjpeg-turbo
 b jansson
 b yaml-cpp
-b freetype
+WITHHB=OFF b freetype # Support hb-ft circular dependency
 b harfbuzz
+b freetype
 b fftw
 b libvita2d
 b libmad