Package updated.

1 files changed, 7 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index fb4643951ca1..530c1303616b 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=armv7a-eabi
-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
 }