Major update!

Revamped pkgver(), removed broken build options
and removed dependencies that are no longer needed.

Signed-off-by: Kamran Mackey <kamranm1200@gmail.com>

2 files changed, 19 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dd68bdd1c826..479888886ef5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sat Feb 13 23:29:52 UTC 2016
+# Mon Jul  4 22:43:13 UTC 2016
 pkgbase = ffmpeg-git
 	pkgdesc = Complete solution to record, convert and stream audio and video (git version)
 	pkgver = r77492.f16e4a0
@@ -16,11 +16,14 @@ pkgbase = ffmpeg-git
 	depends = bzip2
 	depends = fontconfig
 	depends = fribidi
+	depends = gmp
 	depends = gnutls
 	depends = gsm
 	depends = lame
 	depends = libass
+	depends = libavc1394
 	depends = libbluray
+	depends = libiec61883
 	depends = libmodplug
 	depends = libpulse
 	depends = libsoxr
@@ -29,6 +32,7 @@ pkgbase = ffmpeg-git
 	depends = libva
 	depends = libvdpau
 	depends = libwebp
+	depends = netcdf
 	depends = opencore-amr
 	depends = openjpeg
 	depends = opus
@@ -44,7 +48,6 @@ pkgbase = ffmpeg-git
 	depends = libvpx.so
 	depends = libx264.so
 	depends = libx265.so
-	depends = libfdk-aac
 	optdepends = ladspa: LADSPA filters
 	provides = libavcodec.so
 	provides = libavdevice.so
@@ -55,7 +58,6 @@ pkgbase = ffmpeg-git
 	provides = libpostproc.so
 	provides = libswresample.so
 	provides = libswscale.so
-	provides = ffmpeg
 	conflicts = ffmpeg
 	conflicts = ffmpeg-full-git
 	source = ffmpeg-git::git://source.ffmpeg.org/ffmpeg.git
diff --git a/PKGBUILD b/PKGBUILD
index 85c102673636..623c0e567295 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,27 +9,28 @@ pkgdesc="Complete solution to record, convert and stream audio and video (git ve
 arch=('i686' 'x86_64')
 license=('GPL3')
 url="http://ffmpeg.org/"
-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'
-      'libvidstab.so' 'libvorbis.so' 'libvorbisenc.so' 'libvpx.so' 
-      'libx264.so' 'libx265.so' 'libfdk-aac')
+depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gmp' 'gnutls' 'gsm' 'lame'
+         'libass' 'libavc1394' 'libbluray' 'libiec61883' 'libmodplug' 'libpulse' 
+		 'libsoxr' 'libssh' 'libtheora' 'libva' 'libvdpau' 'libwebp'
+		 'netcdf' 'opencore-amr' 'openjpeg' 'opus' 'schroedinger' 'sdl' 'speex'
+		 'v4l-utils' 'xvidcore' 'zlib'
+		 'libvidstab.so' 'libvorbis.so' 'libvorbisenc.so' 'libvpx.so'
+		 'libx264.so' 'libx265.so')
 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'
-)
+provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
+          'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
+		  'libswscale.so')
 conflicts=('ffmpeg' 'ffmpeg-full-git')
 source=("$pkgname"::'git://source.ffmpeg.org/ffmpeg.git')
 md5sums=('SKIP')
 
 pkgver() {
   cd "$srcdir/$pkgname"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  _ver="$(git describe --tags | sed 's|-[^-]*$||' | sed 's|^n||')"
+  _rev="$(git rev-list --count HEAD)"
+  _gitid="$(git rev-parse --short HEAD)"
+  echo "${_ver}.r${_rev}.g${_gitid}"
 }
 
 build() {
@@ -47,7 +48,6 @@ build() {
     --enable-ladspa \
     --enable-libass \
     --enable-libbluray \
-    --enable-libdcadec \
     --enable-libfdk-aac \
     --enable-libfreetype \
     --enable-libfribidi \