Skip to content

Commit

Permalink
Support circular dependency of harfbuzz-freetype
Browse files Browse the repository at this point in the history
  • Loading branch information
ebraminio committed Jan 20, 2018
1 parent 36015b9 commit 7861f81
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 6 deletions.
4 changes: 2 additions & 2 deletions freetype/VITABUILD
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
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
Expand Down
8 changes: 4 additions & 4 deletions harfbuzz/VITABUILD
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
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=("https://github.com/harfbuzz/harfbuzz/releases/download/${pkgver}/harfbuzz-${pkgver}.tar.bz2")
sha256sums=('b5d6ac8415f97f3540d73f3f91c41c5c10f8a4d76350f11a7184062aae88ac0b')
prepare() {
cd $pkgname-$pkgver
}

build() {
cd harfbuzz-$pkgver
mkdir build && cd build
cmake .. $CMARGS -DCMAKE_INSTALL_PREFIX=$prefix
cmake .. $CMARGS -DHB_HAVE_FREETYPE=ON -DCMAKE_INSTALL_PREFIX=$prefix
make
}

Expand Down
20 changes: 20 additions & 0 deletions harfbuzz_noft/VITABUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
pkgname=harfbuzz
pkgver=1.7.4
pkgrel=1
url="http://harfbuzz.org/"
source=("https://github.com/harfbuzz/harfbuzz/releases/download/${pkgver}/harfbuzz-${pkgver}.tar.bz2")
sha256sums=('b5d6ac8415f97f3540d73f3f91c41c5c10f8a4d76350f11a7184062aae88ac0b')
prepare() {
cd $pkgname-$pkgver
}

build() {
cd harfbuzz-$pkgver
./autogen.sh --host arm-vita-eabi --prefix=$prefix --with-freetype=no --with-glib=no --with-icu=no --with-cairo=no --with-fontconfig=no --disable-shared --enable-static
make
}

package () {
cd harfbuzz-$pkgver
make DESTDIR=$pkgdir install
}
1 change: 1 addition & 0 deletions travis_packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ b libexif
b libjpeg-turbo
b jansson
b yaml-cpp
b harfbuzz_noft # to support hb-ft circular dependency
b freetype
b harfbuzz
b fftw
Expand Down

0 comments on commit 7861f81

Please sign in to comment.