Package updated.

3 files changed, 9 insertions, 126 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fdc2cfb6e25a..f798c974231a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,11 @@
-# Generated by mksrcinfo v8
-# dom may  5 20:22:11 UTC 2019
 pkgbase = android-aarch64-lame
 	pkgdesc = A high quality MPEG Audio Layer III (MP3) encoder (android)
 	pkgver = 3.100
-	pkgrel = 4
+	pkgrel = 5
 	url = http://lame.sourceforge.net/
 	arch = any
 	license = LGPL
-	makedepends = android-pkg-config
+	makedepends = android-configure
 	makedepends = nasm
 	depends = android-ndk
 	options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index c08c871ab668..3ced92d7808f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,18 @@
-# PKGBUILD for android-lame
 # 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}-lame
 pkgver=3.100
-pkgrel=4
+pkgrel=5
 pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder (android)"
 arch=('any')
 url="http://lame.sourceforge.net/"
 license=('LGPL')
 depends=('android-ndk')
 options=(!strip !buildflags staticlibs !emptydirs)
-makedepends=('android-pkg-config' 'nasm')
+makedepends=('android-configure' 'nasm')
 source=("http://downloads.sourceforge.net/lame/lame-$pkgver.tar.gz")
 md5sums=('83e260acbe4389b54fe08e0bdbf7cddb')
 
@@ -24,20 +23,7 @@ prepare() {
 build() {
     cd "${srcdir}"/lame-${pkgver}
 
-    export CC=${ANDROID_CC}
-    export CXX=${ANDROID_CXX}
-    export PKG_CONFIG=${ANDROID_PKGCONFIG}
-    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-frontend \
         --enable-nasm
 
@@ -48,7 +34,7 @@ package() {
     cd "${srcdir}"/lame-${pkgver}
 
     make DESTDIR="$pkgdir" install
-    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 -r "${pkgdir}"/${ANDROID_PREFIX_SHARE}
+    ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_PREFIX_LIB}/*.so
+    ${ANDROID_STRIP} -g "$pkgdir"/${ANDROID_PREFIX_LIB}/*.a
 }
diff --git a/android-env.sh b/android-env.sh
deleted file mode 100755
index 517f38e9b563..000000000000
--- a/android-env.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-
-# Useful link to keep track of latest API changes:
-#
-# https://developer.android.com/ndk/downloads/revision_history
-
-_android_arch=$1
-
-if [ -z "${_android_arch}" ]; then
-    _android_arch=armv7a-eabi
-fi
-
-# Minimum Android platform based on:
-#
-# http://gs.statcounter.com/os-version-market-share/android/mobile-tablet/worldwide
-if [ -z "${ANDROID_MINIMUM_PLATFORM}" ]; then
-    export ANDROID_MINIMUM_PLATFORM=22
-fi
-
-if [ -z "${ANDROID_HOME}" ]; then
-    export ANDROID_HOME=/opt/android-sdk
-fi
-
-if [ -z "${ANDROID_NDK_HOME}" ]; then
-    export ANDROID_NDK_HOME=/opt/android-ndk
-fi
-
-get_last() {
-    ls $1 | sort -V | tail -n 1
-}
-
-if [ -z "${ANDROID_BUILD_TOOLS_REVISION}" ]; then
-    export ANDROID_BUILD_TOOLS_REVISION=$(get_last ${ANDROID_HOME}/build-tools)
-fi
-
-if [ -z "${ANDROID_API_VERSION}" ]; then
-    export ANDROID_API_VERSION=android-$ANDROID_MINIMUM_PLATFORM
-fi
-
-if [ -z "${ANDROID_NDK_PLATFORM}" ]; then
-    export ANDROID_NDK_PLATFORM=android-$ANDROID_MINIMUM_PLATFORM
-fi
-
-export ANDROID_PLATFORM=${ANDROID_NDK_HOME}/platforms/$ANDROID_NDK_PLATFORM
-export ANDROID_TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64
-export ANDROID_SYSROOT=${ANDROID_TOOLCHAIN}/sysroot
-export ANDROID_CROSS_PREFIX=$ANDROID_TOOLCHAIN/bin/
-export ANDROID_PKGCONFIG=android-${_android_arch}-pkg-config
-
-case "$_android_arch" in
-    aarch64)
-        export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}aarch64-linux-android${ANDROID_MINIMUM_PLATFORM}-
-        export ANDROID_TOOLS_PREFIX=${ANDROID_CROSS_PREFIX}aarch64-linux-android-
-        ;;
-    armv7a-eabi)
-        export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}armv7a-linux-androideabi${ANDROID_MINIMUM_PLATFORM}-
-        export ANDROID_TOOLS_PREFIX=${ANDROID_CROSS_PREFIX}arm-linux-androideabi-
-        ;;
-    x86)
-        export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}i686-linux-android${ANDROID_MINIMUM_PLATFORM}-
-        export ANDROID_TOOLS_PREFIX=${ANDROID_CROSS_PREFIX}i686-linux-android-
-        ;;
-    x86-64)
-        export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}x86_64-linux-android${ANDROID_MINIMUM_PLATFORM}-
-        export ANDROID_TOOLS_PREFIX=${ANDROID_CROSS_PREFIX}x86_64-linux-android-
-        ;;
-esac
-
-export ANDROID_CC=${ANDROID_TOOLS_COMPILER_PREFIX}clang
-export ANDROID_CXX=${ANDROID_TOOLS_COMPILER_PREFIX}clang++
-export ANDROID_AR=${ANDROID_TOOLS_PREFIX}ar
-export ANDROID_AS=${ANDROID_TOOLS_PREFIX}as
-export ANDROID_NM=${ANDROID_TOOLS_PREFIX}nm
-export ANDROID_RANLIB=${ANDROID_TOOLS_PREFIX}ranlib
-export ANDROID_STRIP=${ANDROID_TOOLS_PREFIX}strip
-export ANDROID_LIBS=/opt/android-libs/${_android_arch}
-export PKG_CONFIG_SYSROOT_DIR=${ANDROID_LIBS}
-export PKG_CONFIG_LIBDIR=${PKG_CONFIG_SYSROOT_DIR}/lib/pkgconfig:${PKG_CONFIG_SYSROOT_DIR}/share/pkgconfig
-
-ndk_version() {
-    grep 'Pkg.Revision' ${ANDROID_NDK_HOME}/source.properties | awk '{print $3}'
-}
-
-check_ndk_version_ge_than() {
-    version=$1
-    ndk_ver=$(ndk_version)
-
-    if [ "${version}" = "${ndk_ver}" ]; then
-        return 0
-    fi
-
-    older_ver=$(printf "${version}\n${ndk_ver}" | sort -V | head -n 1)
-
-    if [ "${older_ver}" = "${ndk_ver}" ]; then
-        echo "ERROR: NDK version >= $version required."
-
-        return 1
-    fi
-
-    return 0
-}