summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-07-04 15:24:34 +0000
committerDaniel Bermond2018-07-04 15:24:34 +0000
commit02147e3f249006df4617620fd006d57fa07b4260 (patch)
tree65cfd715e1f197e17719bf03ed07014b47c14e16
parentfcabe5612cc32ce0acf9e819d78f7f6709356e5b (diff)
downloadaur-02147e3f249006df4617620fd006d57fa07b4260.tar.gz
Add aom support to match official repository package
References ---------- https://git.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/ffmpeg&id=2f4a39f0d3c2fd9da58cad101e8aa7bdce1cd18c
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD24
2 files changed, 17 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 77bd878dcf16..446a248ccb70 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ffmpeg-qsv-git
pkgdesc = Complete solution to record, convert and stream audio and video (with Intel Quick Sync Video hardware acceleration, git version)
- pkgver = 4.1.r91072.gcae004cabb
+ pkgver = 4.1.r91418.g267ba2aa96
pkgrel = 1
url = http://www.ffmpeg.org/
arch = x86_64
@@ -10,6 +10,7 @@ pkgbase = ffmpeg-qsv-git
makedepends = ladspa
makedepends = nasm
depends = alsa-lib
+ depends = aom
depends = bzip2
depends = fontconfig
depends = fribidi
@@ -58,9 +59,6 @@ pkgbase = ffmpeg-qsv-git
depends = libxvidcore.so
depends = intel-media-sdk
optdepends = ladspa: LADSPA filters
- provides = ffmpeg
- provides = ffmpeg-git
- provides = qt-faststart
provides = libavcodec.so
provides = libavdevice.so
provides = libavfilter.so
@@ -70,6 +68,9 @@ pkgbase = ffmpeg-qsv-git
provides = libpostproc.so
provides = libswresample.so
provides = libswscale.so
+ provides = ffmpeg
+ provides = ffmpeg-git
+ provides = qt-faststart
conflicts = ffmpeg
conflicts = ffmpeg-git
source = ffmpeg-qsv-git::git://source.ffmpeg.org/ffmpeg.git
diff --git a/PKGBUILD b/PKGBUILD
index 30aeebb21a50..3fb7b08448e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
# Contributor: DrZaius <lou at fakeoutdoorsman.com>
pkgname=ffmpeg-qsv-git
-pkgver=4.1.r91072.gcae004cabb
+pkgver=4.1.r91418.g267ba2aa96
pkgrel=1
pkgdesc='Complete solution to record, convert and stream audio and video (with Intel Quick Sync Video hardware acceleration, git version)'
arch=('x86_64')
@@ -13,23 +13,22 @@ url='http://www.ffmpeg.org/'
license=('GPL3')
depends=(
# official repositories:
- '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'
+ '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'
# AUR:
'intel-media-sdk'
)
makedepends=('git' 'ffnvcodec-headers' 'ladspa' 'nasm')
optdepends=('ladspa: LADSPA filters')
-provides=('ffmpeg' 'ffmpeg-git' 'qt-faststart' 'libavcodec.so' 'libavdevice.so'
- 'libavfilter.so' 'libavformat.so' 'libavresample.so' 'libavutil.so'
- 'libpostproc.so' 'libswresample.so' 'libswscale.so')
+provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
+ 'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
+ 'libswscale.so' 'ffmpeg' 'ffmpeg-git' 'qt-faststart')
conflicts=('ffmpeg' 'ffmpeg-git')
source=("$pkgname"::'git://source.ffmpeg.org/ffmpeg.git')
sha256sums=('SKIP')
@@ -62,6 +61,7 @@ build() {
--enable-gnutls \
--enable-gpl \
--enable-ladspa \
+ --enable-libaom \
--enable-libass \
--enable-libbluray \
--enable-libdrm \