Package updated.

1 files changed, 9 insertions, 23 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 2ad2dac6e241..b5e203d5b66f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,18 @@
-# PKGBUILD for android-speexdsp
 # Maintainer: Gonzalo Exequiel Pedone <hipersayan DOT x AT gmail DOT com>
 
 _android_arch=aarch64
-source android-env.sh ${_android_arch}
+source android-env ${_android_arch}
 
 pkgname=android-${_android_arch}-speexdsp
 pkgver=1.2rc3
-pkgrel=2
+pkgrel=3
 pkgdesc="DSP library derived from Speex (android)"
 arch=(any)
 url="http://www.speexdsp.org"
 license=("BSD")
 depends=('android-ndk')
 options=(!strip !buildflags staticlibs !emptydirs)
-makedepends=('android-pkg-config')
+makedepends=('android-configure')
 source=("http://downloads.xiph.org/releases/speex/speexdsp-$pkgver.tar.gz")
 md5sums=('70d9d31184f7eb761192fd1ef0b73333')
 
@@ -24,19 +23,7 @@ prepare() {
 build() {
     cd "${srcdir}"/speexdsp-${pkgver}
 
-    export CC=${ANDROID_CC}
-    export CXX=${ANDROID_CXX}
-    target=${_android_arch/x86-/x86_}-linux-android
-
-    ./configure \
-        --host=${target} \
-        --target=${target} \
-        --build="$CHOST" \
-        --prefix=${ANDROID_LIBS} \
-        --libdir=${ANDROID_LIBS}/lib \
-        --includedir=${ANDROID_LIBS}/include \
-        --enable-shared \
-        --enable-static \
+    android-${_android_arch}-configure \
         --disable-neon
 
     make $MAKEFLAGS
@@ -47,13 +34,12 @@ package() {
 
     make DESTDIR="$pkgdir" install
 
-    for f in $(find "$pkgdir/${ANDROID_LIBS}/lib" -type l -name "lib*.so"); do
-        echo HOLA "$f"
+    for f in $(find "$pkgdir/${ANDROID_PREFIX_LIB}" -type l -name "lib*.so"); do
         mv -vf "$(realpath "$f")" "$f"
     done
 
-    rm -vf "$pkgdir"/${ANDROID_LIBS}/lib/lib*.so.*
-    rm -r "${pkgdir}"/${ANDROID_LIBS}/share
-    ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_LIBS}/lib/*.so
-    ${ANDROID_STRIP} -g "$pkgdir"/${ANDROID_LIBS}/lib/*.a
+    rm -vf "$pkgdir"/${ANDROID_PREFIX_LIB}/lib*.so.*
+    rm -r "${pkgdir}"/${ANDROID_PREFIX_SHARE}
+    ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_PREFIX_LIB}/*.so
+    ${ANDROID_STRIP} -g "$pkgdir"/${ANDROID_PREFIX_LIB}/*.a
 }