summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonzalo Exequiel Pedone2019-06-12 14:30:59 -0300
committerGonzalo Exequiel Pedone2019-06-12 14:30:59 -0300
commit1d96e985664733e41c4e1971103a53160e672be5 (patch)
tree1044a1908e9c6ca5d6f4608324218662c8aa836f
parent94ebed7b02018c8d51505f0751947be61faa1a5d (diff)
downloadaur-1d96e985664733e41c4e1971103a53160e672be5.tar.gz
Package updated.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD28
-rwxr-xr-xandroid-env.sh101
3 files changed, 9 insertions, 126 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 114be4cfb94..21807eadbda 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,11 @@
-# Generated by mksrcinfo v8
-# miƩ abr 24 13:10:20 UTC 2019
pkgbase = android-armv7a-eabi-libogg
pkgdesc = Ogg bitstream and framing library (android)
pkgver = 1.3.3
- pkgrel = 3
+ pkgrel = 4
url = http://xiph.org
arch = any
license = BSD
- makedepends = android-pkg-config
+ makedepends = android-configure
depends = android-ndk
options = !strip
options = !buildflags
diff --git a/PKGBUILD b/PKGBUILD
index d302d7945ba..a0012bc77bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,18 @@
-# PKGBUILD for android-libogg
# Maintainer: Gonzalo Exequiel Pedone <hipersayan DOT x AT gmail DOT com>
_android_arch=armv7a-eabi
-source android-env.sh ${_android_arch}
+source android-env ${_android_arch}
pkgname=android-${_android_arch}-libogg
pkgver=1.3.3
-pkgrel=3
+pkgrel=4
pkgdesc="Ogg bitstream and framing library (android)"
arch=('any')
url="http://xiph.org"
license=('BSD')
depends=('android-ndk')
options=(!strip !buildflags staticlibs !emptydirs)
-makedepends=('android-pkg-config')
+makedepends=('android-configure')
source=("http://downloads.xiph.org/releases/ogg/libogg-${pkgver}.tar.gz")
sha256sums=('c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985')
@@ -24,20 +23,7 @@ prepare() {
build() {
cd "${srcdir}"/libogg-${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
make $MAKEFLAGS
}
@@ -45,7 +31,7 @@ package() {
cd "${srcdir}"/libogg-${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 517f38e9b56..00000000000
--- 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
-}