Reflect ffmpeg pkg changes

2 files changed, 61 insertions, 89 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a4d13822190b..84e01fbc67ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ffmpeg-qsv
 	pkgdesc = Complete solution to record, convert and stream audio and video (including qsv and libfdk-aac)
 	pkgver = 4.0.2
-	pkgrel = 2
+	pkgrel = 6
 	url = http://www.ffmpeg.org/
 	arch = x86_64
 	license = GPL3
@@ -11,79 +11,58 @@ pkgbase = ffmpeg-qsv
 	makedepends = ladspa
 	makedepends = yasm
 	makedepends = opencl-headers
-	depends = glibc
 	depends = alsa-lib
-	depends = jack
-	depends = libpng
+	depends = aom
 	depends = bzip2
-	depends = frei0r-plugins
-	depends = libgcrypt
-	depends = gmp
-	depends = gnutls
-	depends = ladspa
-	depends = libass
-	depends = libbluray
-	depends = libbs2b
-	depends = libcaca
-	depends = celt
-	depends = libcdio-paranoia
-	depends = libdc1394
-	depends = libavc1394
-	depends = libfdk-aac
 	depends = fontconfig
-	depends = freetype2
 	depends = fribidi
-	depends = libgme
+	depends = glibc
+	depends = gmp
+	depends = gnutls
 	depends = gsm
+	depends = jack
+	depends = lame
+	depends = libavc1394
+	depends = libdrm
 	depends = libiec61883
 	depends = libmodplug
-	depends = lame
-	depends = opencore-amr
-	depends = openjpeg2
-	depends = opus
-	depends = pulseaudio
-	depends = librsvg
-	depends = rubberband
-	depends = rtmpdump
-	depends = smbclient
-	depends = snappy
+	depends = libomxil-bellagio
+	depends = libpulse
+	depends = libraw1394
 	depends = libsoxr
-	depends = speex
-	depends = srt
 	depends = libssh
-	depends = tesseract
 	depends = libtheora
-	depends = twolame
-	depends = v4l-utils
-	depends = vid.stab
-	depends = libvorbis
-	depends = libvpx
-	depends = wavpack
+	depends = libvdpau
 	depends = libwebp
-	depends = libx264.so
-	depends = x265
+	depends = libx11
 	depends = libxcb
-	depends = xvidcore
+	depends = libxext
 	depends = libxml2
-	depends = zimg
-	depends = zeromq
-	depends = zvbi
-	depends = lilv
-	depends = xz
-	depends = ocl-icd
-	depends = mesa
-	depends = sndio
-	depends = sdl2
 	depends = libxv
-	depends = libx11
-	depends = libxext
+	depends = opencore-amr
+	depends = openjpeg2
+	depends = opus
+	depends = sdl2
+	depends = speex
+	depends = v4l-utils
+	depends = xz
 	depends = zlib
-	depends = libomxil-bellagio
-	depends = libva
-	depends = libdrm
-	depends = libvdpau
+	depends = libass.so
+	depends = libbluray.so
+	depends = libfreetype.so
+	depends = libva-drm.so
+	depends = libva.so
+	depends = libva-x11.so
+	depends = libvidstab.so
+	depends = libvorbisenc.so
+	depends = libvorbis.so
+	depends = libvpx.so
+	depends = libx264.so
+	depends = libx265.so
+	depends = libxvidcore.so
 	depends = libfdk-aac
 	depends = intel-media-sdk
+	optdepends = ladspa: LADSPA filters
 	optdepends = compute-runtime: Intel(R) Graphics Compute Runtime for OpenCL(TM).
 	optdepends = beignet: OpenCL implementation for Intel IvyBridge+ iGPUs
 	optdepends = opencl-mesa: OpenCL support for AMD/ATI Radeon mesa drivers
@@ -96,7 +75,6 @@ pkgbase = ffmpeg-qsv
 	provides = libavdevice.so
 	provides = libavfilter.so
 	provides = libavformat.so
-	provides = libavresample.so
 	provides = libavutil.so
 	provides = libpostproc.so
 	provides = libswresample.so
diff --git a/PKGBUILD b/PKGBUILD
index c087e8811fd3..b52fba92e357 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,33 +11,35 @@
 _srcname=ffmpeg
 pkgname=ffmpeg-qsv
 pkgver=4.0.2
-pkgrel=2
+pkgrel=6
 pkgdesc='Complete solution to record, convert and stream audio and video (including qsv and libfdk-aac)'
 arch=('x86_64')
 url='http://www.ffmpeg.org/'
 license=('GPL3' 'custom: nonfree and unredistributable')
 depends=(
-'glibc' 'alsa-lib' 'jack' 'libpng' 'bzip2' 'frei0r-plugins' 'libgcrypt' 'gmp'
-'gnutls' 'ladspa' 'libass' 'libbluray' 'libbs2b' 'libcaca' 'celt'
-'libcdio-paranoia' 'libdc1394' 'libavc1394' 'libfdk-aac' 'fontconfig' 'freetype2'
-'fribidi' 'libgme' 'gsm' 'libiec61883' 'libmodplug' 'lame' 'opencore-amr'
-'openjpeg2' 'opus' 'pulseaudio' 'librsvg' 'rubberband' 'rtmpdump' 'smbclient'
-'snappy' 'libsoxr' 'speex' 'srt' 'libssh' 'tesseract' 'libtheora' 'twolame'
-'v4l-utils' 'vid.stab' 'libvorbis' 'libvpx' 'wavpack' 'libwebp' 'libx264.so'
-'x265' 'libxcb' 'xvidcore' 'libxml2' 'zimg' 'zeromq' 'zvbi' 'lilv' 'xz' 'ocl-icd'
-'mesa' 'sndio' 'sdl2' 'libxv' 'libx11' 'libxext' 'zlib' 'libomxil-bellagio'
-'libva' 'libdrm' 'libvdpau' 'libfdk-aac' 'intel-media-sdk')
+    'alsa-lib' 'aom' 'bzip2' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnutls' 'gsm'
+    'jack' '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' 'intel-media-sdk'
+)
 makedepends=('ffnvcodec-headers' 'git' 'ladspa' 'yasm' 'opencl-headers')
-optdepends=('compute-runtime: Intel(R) Graphics Compute Runtime for OpenCL(TM).'
-'beignet: OpenCL implementation for Intel IvyBridge+ iGPUs'
-'opencl-mesa: OpenCL support for AMD/ATI Radeon mesa drivers'
-'opencl-amd: OpenCL userspace driver as provided in the amdgpu-pro driver stack'
-'opencl-nvidia: OpenCL implemention for NVIDIA'
+optdepends=(
+    'ladspa: LADSPA filters'
+    'compute-runtime: Intel(R) Graphics Compute Runtime for OpenCL(TM).'
+    'beignet: OpenCL implementation for Intel IvyBridge+ iGPUs'
+    'opencl-mesa: OpenCL support for AMD/ATI Radeon mesa drivers'
+    'opencl-amd: OpenCL userspace driver as provided in the amdgpu-pro driver stack'
+    'opencl-nvidia: OpenCL implemention for NVIDIA'
+)
+provides=(
+    'ffmpeg' 'ffmpeg-libfdk_aac' 'qt-faststart'
+    'libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
+    'libavutil.so' 'libpostproc.so' 'libswresample.so' 'libswscale.so'
 )
-provides=('ffmpeg' 'ffmpeg-libfdk_aac' 'qt-faststart'
-'libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
-'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
-'libswscale.so')
 conflicts=(
 'ffmpeg' 'ffmpeg-full-nvenc' 'ffmpeg-nvenc' 'ffmpeg-libfdk_aac' 'ffmpeg-decklink'
 'ffmpeg-git' 'ffmpeg-full-git' 'ffmpeg-semifull-git' 'ffmpeg-qsv-git')
@@ -56,11 +58,12 @@ build() {
     --disable-debug \
     --disable-static \
     --disable-stripping \
-    --enable-avresample \
     --enable-fontconfig \
     --enable-gmp \
+    --enable-gnutls \
     --enable-gpl \
     --enable-ladspa \
+    --enable-libaom \
     --enable-libass \
     --enable-libbluray \
     --enable-libdrm \
@@ -90,22 +93,13 @@ build() {
     --enable-libxcb \
     --enable-libxml2 \
     --enable-libxvid \
+    --enable-nvdec \
     --enable-nvenc \
     --enable-omx \
     --enable-shared \
     --enable-version3 \
     --enable-nonfree \
-    --enable-gnutls \
     --enable-iconv \
-    --enable-libsrt \
-    --enable-librsvg \
-    --enable-librtmp  \
-    --enable-libtwolame \
-    --enable-libwavpack \
-    --enable-lzma \
-    --enable-xlib \
-    --enable-zlib \
-    --enable-sdl2 \
     --enable-opencl \
     --enable-opengl \
     --enable-libfdk_aac \