Enable libaom support in ffmpeg-libfdk_aac and sync with regular ffmpeg

ffmpeg/libfdk_aac/PKGBUILD

@@ -10,28 +10,32 @@
 _name=ffmpeg
 pkgname=ffmpeg-libfdk_aac
 pkgver=4.0.2
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='Complete solution to record, convert and stream audio and video (with libfdk-aac support)'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='https://ffmpeg.org/'
 license=('GPL3' 'custom:libfdk-aac')
-depends=('alsa-lib' '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')
+depends=(
+  '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'
+)
 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'
-          "ffmpeg=$pkgver")
+provides=(
+  'libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
+  'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
+  'libswscale.so'
+  "ffmpeg=$pkgver"
+)
 conflicts=("$_name")
 source=("git+https://git.ffmpeg.org/ffmpeg.git#tag=n${pkgver}")
 sha256sums=('SKIP')
@@ -50,6 +54,7 @@ build() {
     --enable-gnutls \
     --enable-gpl \
     --enable-ladspa \
+    --enable-libaom \
     --enable-libass \
     --enable-libbluray \
     --enable-libfreetype \