From dbca369e582bec71e580d59d5fa88a0ee61a38ca Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 5 Feb 2019 14:00:39 +0000
Subject: [PATCH] extra/ffmpeg to 4.1-3

---
 extra/ffmpeg/PKGBUILD | 85 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 67 insertions(+), 18 deletions(-)

diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 93e9d6fca..3f1feb94e 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -5,36 +5,85 @@
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - use -fPIC in host cflags for armv7 to fix print_options.c compile
+#  - use -fPIC in host cflags for v7/v8 to fix print_options.c compile
 #  - remove makedepends on ffnvcodec-headers, remove --enable-nvenc, --enable-nvdec
 #  - remove depends on aom, remove --enable-libaom
 
 pkgname=ffmpeg
 pkgver=4.1
-pkgrel=1
+pkgrel=3
 epoch=1
 pkgdesc='Complete solution to record, convert and stream audio and video'
-arch=('x86_64')
-url='http://ffmpeg.org/'
-license=('GPL3')
+arch=(x86_64)
+url=https://ffmpeg.org/
+license=(GPL3)
 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'
+  alsa-lib
+  bzip2
+  fontconfig
+  fribidi
+  gmp
+  gnutls
+  gsm
+  jack
+  lame
+  libass.so
+  libavc1394
+  libbluray.so
+  libdrm
+  libfreetype.so
+  libiec61883
+  libmodplug
+  libomxil-bellagio
+  libpulse
+  libraw1394
+  libsoxr
+  libssh
+  libtheora
+  libva.so
+  libva-drm.so
+  libva-x11.so
+  libvdpau
+  libvidstab.so
+  libvorbisenc.so
+  libvorbis.so
+  libvpx.so
+  libwebp
+  libx11
+  libx264.so
+  libx265.so
+  libxcb
+  libxext
+  libxml2
+  libxv
+  libxvidcore.so
+  opencore-amr
+  openjpeg2
+  opus
+  sdl2
+  speex
+  v4l-utils
+  xz
+  zlib
+)
+makedepends=(
+  git
+  ladspa
+  nasm
 )
-makedepends=('git' 'ladspa' 'yasm')
 optdepends=('ladspa: LADSPA filters')
 provides=(
-  'libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
-  'libavutil.so' 'libpostproc.so' 'libswresample.so' 'libswscale.so'
+  libavcodec.so
+  libavdevice.so
+  libavfilter.so
+  libavformat.so
+  libavutil.so
+  libpostproc.so
+  libswresample.so
+  libswscale.so
 )
-source=("git+https://git.ffmpeg.org/ffmpeg.git#tag=n${pkgver}")
-sha256sums=('SKIP')
+source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=n${pkgver})
+sha256sums=(SKIP)
 
 build() {
   cd ffmpeg