diff options
| author | Gonzalo Exequiel Pedone | 2019-04-15 16:54:25 -0300 |
|---|---|---|
| committer | Gonzalo Exequiel Pedone | 2019-04-15 16:54:25 -0300 |
| commit | fe45f815c561f3a5868d5ae43ad2ecbf22ae0803 (patch) | |
| tree | 1fa7ec9bd7bfcb923aa616992c37ccebccf6a4d7 | |
| parent | 6ba1354ccc29ada15d05d062bc6ca40d37cf96ea (diff) | |
| download | aur-fe45f815c561f3a5868d5ae43ad2ecbf22ae0803.tar.gz | |
Package updated.
| -rw-r--r-- | .SRCINFO | 13 | ||||
| -rw-r--r-- | PKGBUILD | 41 | ||||
| -rwxr-xr-x | android-env.sh | 21 |
3 files changed, 38 insertions, 37 deletions
@@ -1,23 +1,24 @@ # Generated by mksrcinfo v8 -# vie abr 5 14:04:00 UTC 2019 +# lun abr 15 19:51:30 UTC 2019 pkgbase = android-x86-ffmpeg pkgdesc = Complete solution to record, convert and stream audio and video (android) - pkgver = 4.1.2 - pkgrel = 3 + pkgver = 4.1.3 + pkgrel = 1 url = http://ffmpeg.org/ arch = any license = GPL3 makedepends = android-pkg-config - makedepends = git makedepends = yasm depends = android-x86-libvorbis + depends = android-x86-libvpx + depends = android-x86-opus options = !strip options = !buildflags options = staticlibs options = !emptydirs - source = git+https://git.ffmpeg.org/ffmpeg.git#tag=n4.1.2 + source = http://ffmpeg.org/releases/ffmpeg-4.1.3.tar.xz source = configure.patch - sha256sums = SKIP + sha256sums = 0c3020452880581a8face91595b239198078645e7d7184273b8bcc7758beb63d sha256sums = 574f234bd6e09c47e8435faffd464a3fe01dcfdfd939889e6608451f795a1701 pkgname = android-x86-ffmpeg @@ -5,39 +5,42 @@ _android_arch=x86 source android-env.sh ${_android_arch} pkgname=android-${_android_arch}-ffmpeg -pkgver=4.1.2 -pkgrel=3 +pkgver=4.1.3 +pkgrel=1 pkgdesc="Complete solution to record, convert and stream audio and video (android)" arch=('any') url="http://ffmpeg.org/" license=('GPL3') -depends=("android-${_android_arch}-libvorbis") +depends=("android-${_android_arch}-libvorbis" + "android-${_android_arch}-libvpx" + "android-${_android_arch}-opus") options=(!strip !buildflags staticlibs !emptydirs) -makedepends=('android-pkg-config' 'git' 'yasm') -source=("git+https://git.ffmpeg.org/ffmpeg.git#tag=n${pkgver}" +makedepends=('android-pkg-config' 'yasm') +source=("http://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz" 'configure.patch') -sha256sums=('SKIP' +sha256sums=('0c3020452880581a8face91595b239198078645e7d7184273b8bcc7758beb63d' '574f234bd6e09c47e8435faffd464a3fe01dcfdfd939889e6608451f795a1701') prepare() { - cd ffmpeg + cd "${srcdir}"/ffmpeg-${pkgver} + check_ndk_version_ge_than 18.0 patch -Np1 -i ../configure.patch } build() { - cd ffmpeg + cd "${srcdir}"/ffmpeg-${pkgver} unset CC unset CXX unset CFLAGS unset CXXFLAGS - unset LDFLAGS unset CHOST unset CARCH case "$_android_arch" in aarch64) target_arch=aarch64 + export LDFLAGS="-L${ANDROID_LIBS}/lib -lm -logg -lvorbis" ;; armv7a-eabi) target_arch=arm @@ -77,7 +80,10 @@ build() { --disable-libv4l2 --disable-v4l2-m2m --disable-indev=v4l2 - --disable-outdev=v4l2" + --disable-outdev=v4l2 + --enable-libvorbis + --enable-libvpx + --enable-libopus" # Platform specific patches case "$_android_arch" in @@ -89,23 +95,14 @@ build() { ;; esac - case "$_android_arch" in - aarch64) - ;; - *) - configue_opts+=" - --enable-libvorbis" - ;; - esac - ./configure ${configue_opts} make $MAKEFLAGS } package() { - cd ffmpeg + cd "${srcdir}"/ffmpeg-${pkgver} make DESTDIR="$pkgdir" install - ${ANDROID_STRIP} "${pkgdir}"/${ANDROID_LIBS}/lib/*.a - ${ANDROID_STRIP} "${pkgdir}"/${ANDROID_LIBS}/lib/*.so + ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_LIBS}/lib/*.so + ${ANDROID_STRIP} -g "${pkgdir}"/${ANDROID_LIBS}/lib/*.a } diff --git a/android-env.sh b/android-env.sh index f967d7dcd35c..3549d530bb13 100755 --- a/android-env.sh +++ b/android-env.sh @@ -17,12 +17,12 @@ if [ -z "${ANDROID_MINIMUM_PLATFORM}" ]; then export ANDROID_MINIMUM_PLATFORM=22 fi -if [ -z "${ANDROID_NDK_ROOT}" ]; then - export ANDROID_NDK_ROOT=/opt/android-ndk +if [ -z "${ANDROID_HOME}" ]; then + export ANDROID_HOME=/opt/android-sdk fi -if [ -z "${ANDROID_SDK_ROOT}" ]; then - export ANDROID_SDK_ROOT=/opt/android-sdk +if [ -z "${ANDROID_NDK_HOME}" ]; then + export ANDROID_NDK_HOME=/opt/android-ndk fi get_last() { @@ -30,7 +30,7 @@ get_last() { } if [ -z "${ANDROID_BUILD_TOOLS_REVISION}" ]; then - export ANDROID_BUILD_TOOLS_REVISION=$(get_last ${ANDROID_SDK_ROOT}/build-tools) + export ANDROID_BUILD_TOOLS_REVISION=$(get_last ${ANDROID_HOME}/build-tools) fi if [ -z "${ANDROID_API_VERSION}" ]; then @@ -41,8 +41,8 @@ if [ -z "${ANDROID_NDK_PLATFORM}" ]; then export ANDROID_NDK_PLATFORM=android-$ANDROID_MINIMUM_PLATFORM fi -export ANDROID_PLATFORM=${ANDROID_NDK_ROOT}/platforms/$ANDROID_NDK_PLATFORM -export ANDROID_TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64 +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 @@ -69,6 +69,7 @@ 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 @@ -77,10 +78,10 @@ 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_ROOT}/source.properties | awk '{print $3}' + grep 'Pkg.Revision' ${ANDROID_NDK_HOME}/source.properties | awk '{print $3}' } -ndk_version_ge_than() { +check_ndk_version_ge_than() { version=$1 ndk_ver=$(ndk_version) @@ -91,6 +92,8 @@ ndk_version_ge_than() { 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 |