upgpkg: ffmpeg 1:4.0-2

2 files changed, 17 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 45bfaeafc81b..6488106f72b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 # Generated by mksrcinfo v8
-# Mon Apr 23 18:13:33 UTC 2018
+# Tue May 22 04:16:57 UTC 2018
 pkgbase = ffmpeg-libfdk_aac
 	pkgdesc = Complete solution to record, convert and stream audio and video (Same as official package except with libfdk-aac support)
 	pkgver = 4.0
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = http://ffmpeg.org/
 	arch = x86_64
 	license = GPL3
 	license = custom:libfdk-aac
+	makedepends = ffnvcodec-headers
 	makedepends = ladspa
-	makedepends = libvdpau
 	makedepends = yasm
 	depends = alsa-lib
 	depends = bzip2
@@ -20,11 +20,12 @@ pkgbase = ffmpeg-libfdk_aac
 	depends = gmp
 	depends = gnutls
 	depends = gsm
-	depends = jack
 	depends = lame
 	depends = libavc1394
+	depends = libdrm
 	depends = libiec61883
 	depends = libmodplug
+	depends = libomxil-bellagio
 	depends = libpulse
 	depends = libraw1394
 	depends = libsoxr
@@ -34,7 +35,9 @@ pkgbase = ffmpeg-libfdk_aac
 	depends = libwebp
 	depends = libx11
 	depends = libxcb
+	depends = libxext
 	depends = libxml2
+	depends = libxv
 	depends = opencore-amr
 	depends = openjpeg2
 	depends = opus
@@ -43,7 +46,6 @@ pkgbase = ffmpeg-libfdk_aac
 	depends = v4l-utils
 	depends = xz
 	depends = zlib
-	depends = libomxil-bellagio
 	depends = libass.so
 	depends = libbluray.so
 	depends = libfreetype.so
diff --git a/PKGBUILD b/PKGBUILD
index e4890ad16950..e537082c72ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,23 +9,23 @@
 _name=ffmpeg
 pkgname=ffmpeg-libfdk_aac
 pkgver=4.0
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='Complete solution to record, convert and stream audio and video (Same as official package except with libfdk-aac support)'
 arch=('x86_64')
 url='http://ffmpeg.org/'
 license=('GPL3' 'custom:libfdk-aac')
 depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnutls' 'gsm'
-         'jack' 'lame' 'libavc1394' 'libiec61883' 'libmodplug' 'libpulse'
-         'libraw1394' 'libsoxr' 'libssh' 'libtheora' 'libvdpau' 'libwebp'
-         'libx11' 'libxcb' 'libxml2' 'opencore-amr' 'openjpeg2' 'opus' 'sdl2'
-         'speex' 'v4l-utils' 'xz' 'zlib'
-         'libomxil-bellagio'
+         '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'
          'libfdk-aac')
-makedepends=('ladspa' 'libvdpau' 'yasm')
+makedepends=('ffnvcodec-headers' 'ladspa' 'yasm')
 optdepends=('ladspa: LADSPA filters')
 provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
           'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
@@ -45,7 +45,6 @@ build() {
     --disable-debug \
     --disable-static \
     --disable-stripping \
-    --enable-avisynth \
     --enable-avresample \
     --enable-fontconfig \
     --enable-gmp \
@@ -54,6 +53,7 @@ build() {
     --enable-ladspa \
     --enable-libass \
     --enable-libbluray \
+    --enable-libdrm \
     --enable-libfreetype \
     --enable-libfribidi \
     --enable-libgsm \
@@ -79,9 +79,10 @@ build() {
     --enable-libxcb \
     --enable-libxml2 \
     --enable-libxvid \
+    --enable-nvenc \
+    --enable-omx \
     --enable-shared \
     --enable-version3 \
-    --enable-omx \
     --enable-libfdk_aac \
     --enable-nonfree