From 70efbb43ced05e599388c523bcf7a0a37ee09b39 Mon Sep 17 00:00:00 2001 From: Daniel Bermond Date: Wed, 2 May 2018 17:30:16 +0000 Subject: [PATCH] Add --enable-omx to match official repository package References ---------- https://git.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/ffmpeg&id=ea3d2c484f7184e70213196e0feeece5a0fb4444 --- .SRCINFO | 5 ++--- PKGBUILD | 15 +++++++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ddc16b4..ad89429 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Thu Jan 4 14:25:01 UTC 2018 pkgbase = ffmpeg-git pkgdesc = Complete solution to record, convert and stream audio and video (git version) - pkgver = 3.5.r89688.g1b283c4a0d + pkgver = 4.1.r90921.ga150b2e3a0 pkgrel = 1 url = http://www.ffmpeg.org/ arch = i686 @@ -42,6 +40,7 @@ pkgbase = ffmpeg-git depends = v4l-utils depends = xz depends = zlib + depends = libomxil-bellagio depends = libass.so depends = libbluray.so depends = libfreetype.so diff --git a/PKGBUILD b/PKGBUILD index cf1cd9f..45080bf 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: DrZaius pkgname=ffmpeg-git -pkgver=3.5.r89688.g1b283c4a0d +pkgver=4.1.r90921.ga150b2e3a0 pkgrel=1 pkgdesc='Complete solution to record, convert and stream audio and video (git version)' arch=('i686' 'x86_64') @@ -15,6 +15,7 @@ depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnutls' 'gsm' 'libraw1394' 'libsoxr' 'libssh' 'libtheora' 'libvdpau' 'libwebp' 'libx11' 'libxcb' 'libxml2' 'opencore-amr' 'openjpeg2' 'opus' 'sdl2' 'speex' 'v4l-utils' 'xz' 'zlib' + 'libomxil-bellagio' 'libass.so' 'libbluray.so' 'libfreetype.so' 'libva-drm.so' 'libva.so' 'libva-x11.so' 'libvidstab.so' 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' 'libx264.so' 'libx265.so' 'libxvidcore.so') @@ -31,9 +32,11 @@ sha256sums=('SKIP') pkgver() { cd "$pkgname" - local _version="$( git describe --tags --long | cut -d'-' -f1 | sed 's/^n//')" - local _revision="$( git describe --tags --match 'N' | cut -d'-' -f2)" + + local _version="$( git describe --tags --long | awk -F'-' '{ printf $1 }' | sed 's/^n//')" + local _revision="$( git describe --tags --match 'N' | awk -F'-' '{ printf $2 }')" local _shorthash="$(git rev-parse --short HEAD)" + printf '%s.r%s.g%s' "$_version" "$_revision" "$_shorthash" } @@ -82,13 +85,17 @@ build() { --enable-libxml2 \ --enable-libxvid \ --enable-shared \ - --enable-version3 + --enable-version3 \ + --enable-omx + make make tools/qt-faststart } package() { cd "$pkgname" + make DESTDIR="$pkgdir" install + install -D -m755 tools/qt-faststart "${pkgdir}/usr/bin/qt-faststart" }