summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD18
2 files changed, 5 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0a6fbb9c348c..473ea3b5600b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = android-x86-freetype2-bootstrap
pkgdesc = Font rasterization library (Android x86)
pkgver = 2.13.3
- pkgrel = 1
+ pkgrel = 2
url = https://www.freetype.org/
arch = any
groups = android-freetype2-bootstrap
@@ -9,7 +9,6 @@ pkgbase = android-x86-freetype2-bootstrap
makedepends = android-meson
depends = android-ndk
depends = android-x86-zlib
- depends = android-x86-bzip2
depends = android-x86-brotli
depends = android-x86-libpng
provides = android-x86-freetype2
diff --git a/PKGBUILD b/PKGBUILD
index 4eee78a72a28..a93f9320ee11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _android_arch=x86
pkgname=android-${_android_arch}-freetype2-bootstrap
pkgver=2.13.3
-pkgrel=1
+pkgrel=2
arch=('any')
pkgdesc="Font rasterization library (Android ${_android_arch})"
url='https://www.freetype.org/'
@@ -13,9 +13,10 @@ license=('GPL')
groups=('android-freetype2-bootstrap')
depends=("android-ndk"
"android-${_android_arch}-zlib"
- "android-${_android_arch}-bzip2"
"android-${_android_arch}-brotli"
"android-${_android_arch}-libpng")
+# FIXME: It does not properly locate bzip2, disabling for now.
+#depends+=("android-${_android_arch}-bzip2")
provides=("android-${_android_arch}-freetype2")
conflicts=("android-${_android_arch}-freetype2")
makedepends=('android-meson')
@@ -45,20 +46,9 @@ build() {
cd "${srcdir}/freetype-${pkgver}"
source android-env ${_android_arch}
- bzip2opt=enabled
-
- # Platform specific patches
- case "${_android_arch}" in
- x86)
- bzip2opt=disabled
- ;;
- *)
- ;;
- esac
-
android-${_android_arch}-meson build \
-D zlib=enabled \
- -D bzip2="${bzip2opt}" \
+ -D bzip2=disabled \
-D png=enabled \
-D harfbuzz=disabled \
-D brotli=enabled \