Add aom support to match official repository package

References
----------
https://git.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/ffmpeg&id=2f4a39f0d3c2fd9da58cad101e8aa7bdce1cd18c
This commit is contained in:
Daniel Bermond 2018-07-04 15:25:22 +00:00
parent 74da22f6b4
commit 163c323181
No known key found for this signature in database
GPG Key ID: 019A7474297D8577
2 changed files with 17 additions and 26 deletions

View File

@ -1,6 +1,6 @@
pkgbase = ffmpeg-git
pkgdesc = Complete solution to record, convert and stream audio and video (git version)
pkgver = 4.1.r91072.gcae004cabb
pkgver = 4.1.r91418.g267ba2aa96
pkgrel = 1
url = http://www.ffmpeg.org/
arch = i686
@ -11,6 +11,7 @@ pkgbase = ffmpeg-git
makedepends = ladspa
makedepends = nasm
depends = alsa-lib
depends = aom
depends = bzip2
depends = fontconfig
depends = fribidi
@ -58,8 +59,6 @@ pkgbase = ffmpeg-git
depends = libx265.so
depends = libxvidcore.so
optdepends = ladspa: LADSPA filters
provides = ffmpeg
provides = qt-faststart
provides = libavcodec.so
provides = libavdevice.so
provides = libavfilter.so
@ -69,15 +68,9 @@ pkgbase = ffmpeg-git
provides = libpostproc.so
provides = libswresample.so
provides = libswscale.so
provides = ffmpeg
provides = qt-faststart
conflicts = ffmpeg
conflicts = ffmpeg-decklink
conflicts = ffmpeg-libfdk_aac
conflicts = ffmpeg-nvenc
conflicts = ffmpeg-qsv-git
conflicts = ffmpeg-full
conflicts = ffmpeg-full-git
conflicts = ffmpeg-full-nvenc
conflicts = ffmpeg-semifull-git
source = ffmpeg-git::git://source.ffmpeg.org/ffmpeg.git
sha256sums = SKIP

View File

@ -4,29 +4,26 @@
# Contributor: DrZaius <lou at fakeoutdoorsman.com>
pkgname=ffmpeg-git
pkgver=4.1.r91072.gcae004cabb
pkgver=4.1.r91418.g267ba2aa96
pkgrel=1
pkgdesc='Complete solution to record, convert and stream audio and video (git version)'
arch=('i686' 'x86_64')
url='http://www.ffmpeg.org/'
license=('GPL3')
depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnutls' 'gsm'
'lame' 'libavc1394' 'libdrm' 'libiec61883' 'libmodplug'
'libomxil-bellagio' 'libpulse' 'libraw1394' 'libsoxr' 'libssh'
'libtheora' 'libvdpau' 'libwebp' 'libx11' 'libxcb' 'libxext' 'libxml2'
'libxv' 'opencore-amr' 'openjpeg2' 'opus' 'sdl2' 'speex' 'v4l-utils'
'xz' 'zlib'
depends=('alsa-lib' 'aom' 'bzip2' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnutls' 'gsm'
'lame' 'libavc1394' 'libdrm' 'libiec61883' 'libmodplug' 'libomxil-bellagio'
'libpulse' 'libraw1394' 'libsoxr' 'libssh' 'libtheora' 'libvdpau' 'libwebp'
'libx11' 'libxcb' 'libxext' 'libxml2' 'libxv' 'opencore-amr' 'openjpeg2'
'opus' 'sdl2' 'speex' 'v4l-utils' 'xz' 'zlib'
'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')
'libva-x11.so' 'libvidstab.so' 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so'
'libx264.so' 'libx265.so' 'libxvidcore.so')
makedepends=('git' 'ffnvcodec-headers' 'ladspa' 'nasm')
optdepends=('ladspa: LADSPA filters')
provides=('ffmpeg' 'qt-faststart' 'libavcodec.so' 'libavdevice.so' 'libavfilter.so'
'libavformat.so' 'libavresample.so' 'libavutil.so' 'libpostproc.so'
'libswresample.so' 'libswscale.so')
conflicts=('ffmpeg' 'ffmpeg-decklink' 'ffmpeg-libfdk_aac' 'ffmpeg-nvenc'
'ffmpeg-qsv-git' 'ffmpeg-full' 'ffmpeg-full-git' 'ffmpeg-full-nvenc'
'ffmpeg-semifull-git')
provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
'libswscale.so' 'ffmpeg' 'qt-faststart')
conflicts=('ffmpeg')
source=("$pkgname"::'git://source.ffmpeg.org/ffmpeg.git')
sha256sums=('SKIP')
@ -56,6 +53,7 @@ build() {
--enable-gnutls \
--enable-gpl \
--enable-ladspa \
--enable-libaom \
--enable-libass \
--enable-libbluray \
--enable-libdrm \