summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-07-21 02:35:33 +0000
committerDaniel Bermond2018-07-21 02:35:33 +0000
commit001bee3380523bbe01c00f44e73bde7399a07fd4 (patch)
tree3ba93aa910f9454717a05494cfa6910c57c55c37
parent9aba6ddccd6028219b806e43f4b66cb2a340a8a2 (diff)
downloadaur-001bee3380523bbe01c00f44e73bde7399a07fd4.tar.gz
Temporarily disable libvmaf due to compile error
ffmpeg fails to build with the newly released vmaf 1.3.7. Disabling vmaf support until upstream ffmpeg fixes this.
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD16
2 files changed, 10 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 66a57c965503..6e587973e56f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ffmpeg-full-git
pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac; git version)
- pkgver = 4.1.r91378.g3f953379e1
+ pkgver = 4.1.r91500.g3870ed7ab3
pkgrel = 1
url = http://www.ffmpeg.org/
arch = i686
@@ -9,8 +9,8 @@ pkgbase = ffmpeg-full-git
makedepends = git
makedepends = nasm
makedepends = opencl-headers
- makedepends = blackmagic-decklink-sdk
makedepends = ffnvcodec-headers
+ makedepends = blackmagic-decklink-sdk
depends = glibc
depends = alsa-lib
depends = jack
@@ -133,7 +133,6 @@ pkgbase = ffmpeg-full-git
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
depends_x86_64 = cuda
depends_x86_64 = intel-media-sdk
- makedepends_x86_64 = vmaf
pkgname = ffmpeg-full-git
diff --git a/PKGBUILD b/PKGBUILD
index 91cbccffa5d1..5bd6184af691 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniel Bermond < yahoo-com: danielbermond >
pkgname=ffmpeg-full-git
-pkgver=4.1.r91378.g3f953379e1
+pkgver=4.1.r91500.g3870ed7ab3
pkgrel=1
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac; git version)'
arch=('i686' 'x86_64')
@@ -33,14 +33,14 @@ depends_x86_64=(
)
makedepends=(
# official repositories:
- 'git' 'nasm' 'opencl-headers'
+ 'git' 'nasm' 'opencl-headers' 'ffnvcodec-headers'
# AUR:
- 'blackmagic-decklink-sdk' 'ffnvcodec-headers'
-)
-makedepends_x86_64=(
- # AUR:
- 'vmaf'
+ 'blackmagic-decklink-sdk'
)
+#makedepends_x86_64=(
+# # AUR:
+# 'vmaf'
+#)
provides=(
'ffmpeg' 'qt-faststart' 'ffmpeg-git' 'ffmpeg-decklink' 'ffmpeg-libfdk_aac' 'ffmpeg-nvenc'
'ffmpeg-qsv-git' 'ffmpeg-full' 'ffmpeg-full-nvenc' 'ffmpeg-semifull-git' 'libavutil.so'
@@ -80,7 +80,7 @@ build() {
# set x86_64 specific options
if [ "$CARCH" = 'x86_64' ]
then
- local _libvmaf='--enable-libvmaf'
+ local _libvmaf='--disable-libvmaf'
local _cudasdk='--enable-cuda-sdk'
local _libmfx='--enable-libmfx'
local _libnpp='--enable-libnpp'