Add back libvmaf (compile error was fixed by upstream)

libvmaf support was previously disabled due to an upstream compile
error. Now it is fixed by upstream.

References
----------
http://git.videolan.org/?p=ffmpeg.git;a=commit;h=87cc7e8d4ef8fa643d8d4822525b9c95cc9e7307

2 files changed, 12 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ace24c627985..47db7c80cc9c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 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.r91528.ged647ab79f
-	pkgrel = 2
+	pkgver = 4.1.r91592.g87cc7e8d4e
+	pkgrel = 1
 	url = http://www.ffmpeg.org/
 	arch = i686
 	arch = x86_64
@@ -136,6 +136,7 @@ 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 b91fde49d3cb..9ab3fce6472a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Daniel Bermond < yahoo-com: danielbermond >
 
 pkgname=ffmpeg-full-git
-pkgver=4.1.r91528.ged647ab79f
-pkgrel=2
+pkgver=4.1.r91592.g87cc7e8d4e
+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')
 url='http://www.ffmpeg.org/'
@@ -37,10 +37,10 @@ makedepends=(
     # AUR:
         'blackmagic-decklink-sdk'
 )
-#makedepends_x86_64=(
-#    # AUR:
-#        'vmaf'
-#)
+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='--disable-libvmaf'
+        local _libvmaf='--enable-libvmaf'
         local _cudasdk='--enable-cuda-sdk'
         local _libmfx='--enable-libmfx'
         local _libnpp='--enable-libnpp'
@@ -231,6 +231,6 @@ package() {
     
     make DESTDIR="$pkgdir" install
     
-    install -D -m755 tools/qt-faststart  "${pkgdir}/usr/bin/qt-faststart"
-    install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -D -m755 tools/qt-faststart  -t "${pkgdir}/usr/bin"
+    install -D -m644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }