From 01ad7be41deafc6b95f9b52f2df1af3cae521e07 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 3 Feb 2016 18:15:24 +0100
Subject: [PATCH] updated ffmpeg

---
 ffmpeg/libfdk_aac/PKGBUILD | 101 +++++++++++++++++++++++++++++++++++++
 ffmpeg/mingw-w64/PKGBUILD  |   4 +-
 pkgbuilds.pro              |   1 +
 3 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 ffmpeg/libfdk_aac/PKGBUILD

diff --git a/ffmpeg/libfdk_aac/PKGBUILD b/ffmpeg/libfdk_aac/PKGBUILD
new file mode 100644
index 00000000..9b8c1f59
--- /dev/null
+++ b/ffmpeg/libfdk_aac/PKGBUILD
@@ -0,0 +1,101 @@
+# Maintainer: Ben Widawsky <ben@bwidawsk.net>
+# Contributor: Rob McCathie <korrode at gmail>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Maxime Gauduin <alucryd@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: Paul Mattal <paul@archlinux.org>
+# Contributor: Martchus <martchus@gmx.net>
+
+_name=ffmpeg
+pkgname=ffmpeg-libfdk_aac
+pkgver=2.8.6
+pkgrel=1
+epoch=1
+pkgdesc='Complete solution to record, convert and stream audio and video (Same as official package except with libfdk-aac support)'
+arch=('i686' 'x86_64')
+url='http://ffmpeg.org/'
+license=('GPL3' 'custom:libfdk-aac')
+depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gnutls' 'gsm' 'lame'
+         'libass' 'libbluray' 'libmodplug' 'libpulse' 'libsoxr' 'libssh'
+         'libtheora' 'libva' 'libvdpau' 'libwebp' 'opencore-amr' 'openjpeg'
+         'opus' 'schroedinger' 'sdl' 'speex' 'v4l-utils' 'xvidcore' 'zlib'
+         'libdcadec.so' 'libvidstab.so' 'libvorbis.so' 'libvorbisenc.so'
+         'libvpx.so' 'libx264.so' 'libx265.so'
+	 'libfdk-aac')
+makedepends=('hardening-wrapper' '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")
+conflicts=("$_name")
+source=(http://ffmpeg.org/releases/$_name-$pkgver.tar.bz2{,.asc})
+validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
+sha256sums=('40611e329bc354592c6f8f1deb033c31b91f80e91f5707ca4f9afceca78d8e62'
+            'SKIP')
+
+build() {
+  cd $_name-$pkgver
+
+  ./configure \
+    --prefix='/usr' \
+    --disable-debug \
+    --disable-static \
+    --disable-stripping \
+    --enable-avisynth \
+    --enable-avresample \
+    --enable-fontconfig \
+    --enable-gnutls \
+    --enable-gpl \
+    --enable-ladspa \
+    --enable-libass \
+    --enable-libbluray \
+    --enable-libdcadec \
+    --enable-libfreetype \
+    --enable-libfribidi \
+    --enable-libgsm \
+    --enable-libmodplug \
+    --enable-libmp3lame \
+    --enable-libopencore_amrnb \
+    --enable-libopencore_amrwb \
+    --enable-libopenjpeg \
+    --enable-libopus \
+    --enable-libpulse \
+    --enable-libschroedinger \
+    --enable-libsoxr \
+    --enable-libspeex \
+    --enable-libssh \
+    --enable-libtheora \
+    --enable-libv4l2 \
+    --enable-libvidstab \
+    --enable-libvorbis \
+    --enable-libvpx \
+    --enable-libwebp \
+    --enable-libx264 \
+    --enable-libx265 \
+    --enable-libxvid \
+    --enable-shared \
+    --enable-version3 \
+    --enable-x11grab \
+    --enable-libfdk_aac \
+    --enable-nonfree
+
+  make
+  make tools/qt-faststart
+  make doc/ff{mpeg,play,server}.1
+
+  cp /usr/share/licenses/libfdk-aac/NOTICE .
+}
+
+package() {
+  cd $_name-$pkgver
+
+  make DESTDIR="${pkgdir}" install install-man
+  install -Dm 755 tools/qt-faststart "${pkgdir}"/usr/bin/
+
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  install -m 0644 NOTICE "$pkgdir/usr/share/licenses/$pkgname/NOTICE"
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/ffmpeg/mingw-w64/PKGBUILD b/ffmpeg/mingw-w64/PKGBUILD
index 74fd4341..9681d911 100644
--- a/ffmpeg/mingw-w64/PKGBUILD
+++ b/ffmpeg/mingw-w64/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mingw-w64-ffmpeg
-pkgver=2.8.5
+pkgver=2.8.6
 pkgrel=1
 epoch=1
 pkgdesc="Complete solution to record, convert and stream audio and video (mingw-w64)"
@@ -17,7 +17,7 @@ options=(!strip !buildflags staticlibs)
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'yasm')
 source=(http://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.bz2{,.asc})
 validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
-sha256sums=('3b6d9951533323ee64a21d0aa7667a780b3470bfe4e0fb7c1b33307ce290615a'
+sha256sums=('40611e329bc354592c6f8f1deb033c31b91f80e91f5707ca4f9afceca78d8e62'
             'SKIP')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
diff --git a/pkgbuilds.pro b/pkgbuilds.pro
index 6887fb22..26e8b641 100644
--- a/pkgbuilds.pro
+++ b/pkgbuilds.pro
@@ -84,6 +84,7 @@ OTHER_FILES += \
     filezilla/mingw-w64-svn/PKGBUILD \
     libfilezilla/svn/PKGBUILD \
     libfilezilla/mingw-w64-svn/PKGBUILD \
+    ffmpeg/libfdk_aac/PKGBUILD \
     ffmpeg/libfdk_aac-git/PKGBUILD \
     ffmpeg/mingw-w64/PKGBUILD \
     x264/mingw-w64/PKGBUILD \