From 8223027fdc47bb01b69a6d0745128d64fdf517e1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 29 Aug 2018 23:36:23 +0200
Subject: [PATCH] Sync ffmpeg variants with regular ffmpeg package

---
 ffmpeg/full-nvenc/PKGBUILD     | 3 ++-
 ffmpeg/libfdk_aac-git/PKGBUILD | 7 ++++---
 ffmpeg/libfdk_aac/PKGBUILD     | 7 +++----
 ffmpeg/mingw-w64/PKGBUILD      | 1 -
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ffmpeg/full-nvenc/PKGBUILD b/ffmpeg/full-nvenc/PKGBUILD
index deac5f51..2f7e8b0b 100644
--- a/ffmpeg/full-nvenc/PKGBUILD
+++ b/ffmpeg/full-nvenc/PKGBUILD
@@ -43,7 +43,7 @@ optdepends=('avxsynth-git: for Avisynth support'
 optdepends_x86_64=('intel-media-sdk: for Intel QSV support (Experimental! See PKGBUILD of that package for additional info)')
 conflicts=('ffmpeg' 'ffmpeg-full' 'ffmpeg-git' 'ffmpeg-full-git' 'ffmpeg-full-extra')
 provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
-          'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
+           'libavutil.so' 'libpostproc.so' 'libswresample.so'
           'libswscale.so' 'ffmpeg' 'qt-faststart')
 source=(https://ffmpeg.org/releases/$_pkgbasename-$pkgver.tar.xz{,.asc}
         'UNREDISTRIBUTABLE.txt')
@@ -90,6 +90,7 @@ build() {
     $_libnpp \
     \
     --enable-libmfx \
+    --enable-nvdec \
     --enable-nvenc \
     --enable-omx \
     --enable-omx-rpi \
diff --git a/ffmpeg/libfdk_aac-git/PKGBUILD b/ffmpeg/libfdk_aac-git/PKGBUILD
index 180bd815..53070dd2 100644
--- a/ffmpeg/libfdk_aac-git/PKGBUILD
+++ b/ffmpeg/libfdk_aac-git/PKGBUILD
@@ -19,8 +19,7 @@ depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnutls' 'gsm'
 makedepends=('ladspa' 'libvdpau' 'yasm')
 optdepends=('ladspa: LADSPA filters')
 provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
-          'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
-          'libswscale.so'
+          'libavutil.so' 'libpostproc.so' 'libswresample.so' 'libswscale.so'
           "ffmpeg=$pkgver")
 conflicts=("$_name")
 source=("$pkgname"::'git://source.ffmpeg.org/ffmpeg.git')
@@ -40,7 +39,6 @@ build() {
     --disable-static \
     --disable-stripping \
     --enable-avisynth \
-    --enable-avresample \
     --enable-fontconfig \
     --enable-gmp \
     --enable-gnutls \
@@ -72,6 +70,9 @@ build() {
     --enable-libxcb \
     --enable-libxml2 \
     --enable-libxvid \
+    --enable-nvdec \
+    --enable-nvenc \
+    --enable-omx \
     --enable-shared \
     --enable-version3 \
     --enable-x11grab \
diff --git a/ffmpeg/libfdk_aac/PKGBUILD b/ffmpeg/libfdk_aac/PKGBUILD
index 57a92407..2639903d 100644
--- a/ffmpeg/libfdk_aac/PKGBUILD
+++ b/ffmpeg/libfdk_aac/PKGBUILD
@@ -10,7 +10,7 @@
 _name=ffmpeg
 pkgname=ffmpeg-libfdk_aac
 pkgver=4.0.2
-pkgrel=3
+pkgrel=4
 epoch=1
 pkgdesc='Complete solution to record, convert and stream audio and video (with libfdk-aac support)'
 arch=('x86_64')
@@ -32,8 +32,7 @@ makedepends=('ffnvcodec-headers' 'git' 'ladspa' 'libvdpau' 'yasm')
 optdepends=('ladspa: LADSPA filters')
 provides=(
   'libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
-  'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
-  'libswscale.so'
+  'libavutil.so' 'libpostproc.so' 'libswresample.so' 'libswscale.so'
   "ffmpeg=$pkgver"
 )
 conflicts=("$_name")
@@ -48,7 +47,6 @@ build() {
     --disable-debug \
     --disable-static \
     --disable-stripping \
-    --enable-avresample \
     --enable-fontconfig \
     --enable-gmp \
     --enable-gnutls \
@@ -83,6 +81,7 @@ build() {
     --enable-libxcb \
     --enable-libxml2 \
     --enable-libxvid \
+    --enable-nvdec \
     --enable-nvenc \
     --enable-omx \
     --enable-shared \
diff --git a/ffmpeg/mingw-w64/PKGBUILD b/ffmpeg/mingw-w64/PKGBUILD
index 1941099e..e45cd5c8 100644
--- a/ffmpeg/mingw-w64/PKGBUILD
+++ b/ffmpeg/mingw-w64/PKGBUILD
@@ -40,7 +40,6 @@ build() {
         --enable-static \
         --disable-stripping \
         --enable-avisynth \
-        --enable-avresample \
         --enable-fontconfig \
         --enable-gmp \
         --enable-gnutls \