Package updated.

4 files changed, 15 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eec8c4c6602a..3957e00d9e9a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# mié abr  3 21:12:01 UTC 2019
+# jue abr  4 20:54:16 UTC 2019
 pkgbase = android-aarch64-ffmpeg
 	pkgdesc = Complete solution to record, convert and stream audio and video (android)
 	pkgver = 4.1.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://ffmpeg.org/
 	arch = any
 	license = GPL3
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..b5bc2aa573e1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+pkg
+src
+*.tar.xz
+*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index b1abac7ce2d1..95e00a12f2cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ source android-env.sh ${_android_arch}
 
 pkgname=android-${_android_arch}-ffmpeg
 pkgver=4.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Complete solution to record, convert and stream audio and video (android)"
 arch=('any')
 url="http://ffmpeg.org/"
@@ -20,12 +20,10 @@ depends=('apache-ant'
 options=(!strip !buildflags staticlibs !emptydirs)
 makedepends=('android-pkg-config' 'git' 'yasm')
 source=("git+https://git.ffmpeg.org/ffmpeg.git#tag=n${pkgver}"
-        configure.patch)
+        'configure.patch')
 sha256sums=('SKIP'
             '574f234bd6e09c47e8435faffd464a3fe01dcfdfd939889e6608451f795a1701')
 
-_pref=/opt/android-libs/$_android_arch
-
 prepare() {
     cd ffmpeg
     patch -Np1 -i ../configure.patch
@@ -58,7 +56,7 @@ build() {
     esac
 
     configue_opts="
-        --prefix="${_pref}"
+        --prefix="${ANDROID_LIBS}"
         --enable-cross-compile
         --cross-prefix="${ANDROID_CROSS_PREFIX}"
         --target-os=android
@@ -104,6 +102,6 @@ package() {
     cd ffmpeg
     make DESTDIR="$pkgdir" install
 
-    ${ANDROID_STRIP} "${pkgdir}"/${_pref}/lib/*.a
-    ${ANDROID_STRIP} "${pkgdir}"/${_pref}/lib/*.so
+    ${ANDROID_STRIP} "${pkgdir}"/${ANDROID_LIBS}/lib/*.a
+    ${ANDROID_STRIP} "${pkgdir}"/${ANDROID_LIBS}/lib/*.so
 }
diff --git a/android-env.sh b/android-env.sh
index 54e8330f8654..d9f6b78ecbb9 100755
--- a/android-env.sh
+++ b/android-env.sh
@@ -41,7 +41,7 @@ export ANDROID_PLATFORM=${ANDROID_NDK_ROOT}/platforms/$ANDROID_NDK_PLATFORM
 export ANDROID_TOOLCHAIN=${ANDROID_NDK_ROOT}/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
+export ANDROID_PKGCONFIG=android-${_android_arch}-pkg-config
 
 case "$_android_arch" in
     aarch64)
@@ -68,3 +68,6 @@ export ANDROID_AR=${ANDROID_TOOLS_PREFIX}ar
 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