summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonzalo Exequiel Pedone2019-06-12 15:29:54 -0300
committerGonzalo Exequiel Pedone2019-06-12 15:29:54 -0300
commit9aa0b3b41d4ea767582db48a990ce858984e457e (patch)
tree44d92257406fc141f59f318a984e46a8da346860
parentb1be6c0569d1acf4dddbbb58b432472ff2e725bf (diff)
downloadaur-9aa0b3b41d4ea767582db48a990ce858984e457e.tar.gz
Package updated.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD27
-rwxr-xr-xandroid-env.sh101
3 files changed, 9 insertions, 125 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f6676b7eed0..bb6f9648bad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,11 @@
-# Generated by mksrcinfo v8
-# mar abr 23 17:35:56 UTC 2019
pkgbase = android-x86-libtheora
pkgdesc = An open video codec developed by the Xiph.org (android)
pkgver = 1.1.1
- pkgrel = 1
+ pkgrel = 2
url = http://xiph.org
arch = any
license = BSD
- makedepends = android-pkg-config
+ makedepends = android-configure
depends = android-x86-libvorbis
options = !strip
options = !buildflags
diff --git a/PKGBUILD b/PKGBUILD
index 992e761e34a..95c0c0e7f25 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,17 @@
-# PKGBUILD for android-libtheora
# Maintainer: Gonzalo Exequiel Pedone <hipersayan DOT x AT gmail DOT com>
_android_arch=x86
-source android-env.sh ${_android_arch}
+source android-env ${_android_arch}
pkgname=android-${_android_arch}-libtheora
pkgver=1.1.1
-pkgrel=1
+pkgrel=2
pkgdesc="An open video codec developed by the Xiph.org (android)"
arch=('any')
url="http://xiph.org"
license=("BSD")
depends=("android-${_android_arch}-libvorbis")
-makedepends=('android-pkg-config')
+makedepends=('android-configure')
options=(!strip !buildflags staticlibs)
source=("http://downloads.xiph.org/releases/theora/libtheora-${pkgver}.tar.bz2")
md5sums=('292ab65cedd5021d6b7ddd117e07cd8e')
@@ -26,19 +25,7 @@ prepare() {
build() {
cd "${srcdir}"/libtheora-${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-examples
make $MAKEFLAGS
@@ -48,7 +35,7 @@ package() {
cd "${srcdir}"/libtheora-${pkgver}
make DESTDIR="$pkgdir" install
- rm -r "${pkgdir}"/${ANDROID_LIBS}/share
- ${ANDROID_STRIP} --strip-unneeded "${pkgdir}"/${ANDROID_LIBS}/lib/*.so
- ${ANDROID_STRIP} -g "$pkgdir"/${ANDROID_LIBS}/lib/*.a
+ rm -r "${pkgdir}"/${ANDROID_PREFIX_SHARE}
+ ${ANDROID_STRIP} --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 3549d530bb1..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:
-#
-# https://developer.android.com/about/dashboards/
-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
-}