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.
This commit is contained in:
Daniel Bermond
2018-07-21 02:31:52 +00:00
parent 654d2499c4
commit d89b2f06f6
2 changed files with 7 additions and 8 deletions
+1 -2
View File
@@ -1,7 +1,7 @@
pkgbase = ffmpeg-full pkgbase = ffmpeg-full
pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac) pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac)
pkgver = 4.0.2 pkgver = 4.0.2
pkgrel = 1 pkgrel = 2
url = http://www.ffmpeg.org/ url = http://www.ffmpeg.org/
arch = i686 arch = i686
arch = x86_64 arch = x86_64
@@ -126,7 +126,6 @@ pkgbase = ffmpeg-full
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36 sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
depends_x86_64 = cuda depends_x86_64 = cuda
depends_x86_64 = intel-media-sdk depends_x86_64 = intel-media-sdk
makedepends_x86_64 = vmaf
pkgname = ffmpeg-full pkgname = ffmpeg-full
+6 -6
View File
@@ -4,7 +4,7 @@
pkgname=ffmpeg-full pkgname=ffmpeg-full
_srcname=ffmpeg _srcname=ffmpeg
pkgver=4.0.2 pkgver=4.0.2
pkgrel=1 pkgrel=2
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac)' pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac)'
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url='http://www.ffmpeg.org/' url='http://www.ffmpeg.org/'
@@ -39,10 +39,10 @@ makedepends=(
# AUR: # AUR:
'blackmagic-decklink-sdk' 'blackmagic-decklink-sdk'
) )
makedepends_x86_64=( #makedepends_x86_64=(
# AUR: # # AUR:
'vmaf' # 'vmaf'
) #)
provides=( provides=(
'ffmpeg' 'ffmpeg-full-nvenc' 'ffmpeg-nvenc' 'ffmpeg-libfdk_aac' 'ffmpeg-decklink' 'ffmpeg' 'ffmpeg-full-nvenc' 'ffmpeg-nvenc' 'ffmpeg-libfdk_aac' 'ffmpeg-decklink'
'qt-faststart' 'libavutil.so' 'libavcodec.so' 'libavformat.so' 'libavdevice.so' 'qt-faststart' 'libavutil.so' 'libavcodec.so' 'libavformat.so' 'libavdevice.so'
@@ -72,7 +72,7 @@ build() {
# set x86_64 specific options # set x86_64 specific options
if [ "$CARCH" = 'x86_64' ] if [ "$CARCH" = 'x86_64' ]
then then
local _libvmaf='--enable-libvmaf' local _libvmaf='--disable-libvmaf'
local _cudasdk='--enable-cuda-sdk' local _cudasdk='--enable-cuda-sdk'
local _libmfx='--enable-libmfx' local _libmfx='--enable-libmfx'
local _libnpp='--enable-libnpp' local _libnpp='--enable-libnpp'