[notify] ffmpeg: 1.2.2 -> 2.0.2, Removed faac, Added libass,libbluray,libmodplug,opus,rtmpdump,schroedinger

3 files changed, 66 insertions, 44 deletions

diff --git a/ffmpeg/.footprint b/ffmpeg/.footprint
index 659d23c09..a5c614039 100644
--- a/ffmpeg/.footprint
+++ b/ffmpeg/.footprint
@@ -44,6 +44,7 @@ drwxr-xr-x	root/root	usr/include/libavutil/
 -rw-r--r--	root/root	usr/include/libavutil/blowfish.h
 -rw-r--r--	root/root	usr/include/libavutil/bprint.h
 -rw-r--r--	root/root	usr/include/libavutil/bswap.h
+-rw-r--r--	root/root	usr/include/libavutil/buffer.h
 -rw-r--r--	root/root	usr/include/libavutil/channel_layout.h
 -rw-r--r--	root/root	usr/include/libavutil/common.h
 -rw-r--r--	root/root	usr/include/libavutil/cpu.h
@@ -53,6 +54,7 @@ drwxr-xr-x	root/root	usr/include/libavutil/
 -rw-r--r--	root/root	usr/include/libavutil/eval.h
 -rw-r--r--	root/root	usr/include/libavutil/fifo.h
 -rw-r--r--	root/root	usr/include/libavutil/file.h
+-rw-r--r--	root/root	usr/include/libavutil/frame.h
 -rw-r--r--	root/root	usr/include/libavutil/hmac.h
 -rw-r--r--	root/root	usr/include/libavutil/imgutils.h
 -rw-r--r--	root/root	usr/include/libavutil/intfloat.h
@@ -64,6 +66,7 @@ drwxr-xr-x	root/root	usr/include/libavutil/
 -rw-r--r--	root/root	usr/include/libavutil/mathematics.h
 -rw-r--r--	root/root	usr/include/libavutil/md5.h
 -rw-r--r--	root/root	usr/include/libavutil/mem.h
+-rw-r--r--	root/root	usr/include/libavutil/murmur3.h
 -rw-r--r--	root/root	usr/include/libavutil/old_pix_fmts.h
 -rw-r--r--	root/root	usr/include/libavutil/opt.h
 -rw-r--r--	root/root	usr/include/libavutil/parseutils.h
@@ -71,8 +74,10 @@ drwxr-xr-x	root/root	usr/include/libavutil/
 -rw-r--r--	root/root	usr/include/libavutil/pixfmt.h
 -rw-r--r--	root/root	usr/include/libavutil/random_seed.h
 -rw-r--r--	root/root	usr/include/libavutil/rational.h
+-rw-r--r--	root/root	usr/include/libavutil/ripemd.h
 -rw-r--r--	root/root	usr/include/libavutil/samplefmt.h
 -rw-r--r--	root/root	usr/include/libavutil/sha.h
+-rw-r--r--	root/root	usr/include/libavutil/sha512.h
 -rw-r--r--	root/root	usr/include/libavutil/time.h
 -rw-r--r--	root/root	usr/include/libavutil/timecode.h
 -rw-r--r--	root/root	usr/include/libavutil/timestamp.h
@@ -89,37 +94,37 @@ drwxr-xr-x	root/root	usr/include/libswscale/
 -rw-r--r--	root/root	usr/include/libswscale/version.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libavcodec.a
-lrwxrwxrwx	root/root	usr/lib/libavcodec.so -> libavcodec.so.54.92.100
-lrwxrwxrwx	root/root	usr/lib/libavcodec.so.54 -> libavcodec.so.54.92.100
--rwxr-xr-x	root/root	usr/lib/libavcodec.so.54.92.100
+lrwxrwxrwx	root/root	usr/lib/libavcodec.so -> libavcodec.so.55.18.102
+lrwxrwxrwx	root/root	usr/lib/libavcodec.so.55 -> libavcodec.so.55.18.102
+-rwxr-xr-x	root/root	usr/lib/libavcodec.so.55.18.102
 -rw-r--r--	root/root	usr/lib/libavdevice.a
-lrwxrwxrwx	root/root	usr/lib/libavdevice.so -> libavdevice.so.54.3.103
-lrwxrwxrwx	root/root	usr/lib/libavdevice.so.54 -> libavdevice.so.54.3.103
--rwxr-xr-x	root/root	usr/lib/libavdevice.so.54.3.103
+lrwxrwxrwx	root/root	usr/lib/libavdevice.so -> libavdevice.so.55.3.100
+lrwxrwxrwx	root/root	usr/lib/libavdevice.so.55 -> libavdevice.so.55.3.100
+-rwxr-xr-x	root/root	usr/lib/libavdevice.so.55.3.100
 -rw-r--r--	root/root	usr/lib/libavfilter.a
-lrwxrwxrwx	root/root	usr/lib/libavfilter.so -> libavfilter.so.3.42.103
-lrwxrwxrwx	root/root	usr/lib/libavfilter.so.3 -> libavfilter.so.3.42.103
--rwxr-xr-x	root/root	usr/lib/libavfilter.so.3.42.103
+lrwxrwxrwx	root/root	usr/lib/libavfilter.so -> libavfilter.so.3.79.101
+lrwxrwxrwx	root/root	usr/lib/libavfilter.so.3 -> libavfilter.so.3.79.101
+-rwxr-xr-x	root/root	usr/lib/libavfilter.so.3.79.101
 -rw-r--r--	root/root	usr/lib/libavformat.a
-lrwxrwxrwx	root/root	usr/lib/libavformat.so -> libavformat.so.54.63.104
-lrwxrwxrwx	root/root	usr/lib/libavformat.so.54 -> libavformat.so.54.63.104
--rwxr-xr-x	root/root	usr/lib/libavformat.so.54.63.104
+lrwxrwxrwx	root/root	usr/lib/libavformat.so -> libavformat.so.55.12.100
+lrwxrwxrwx	root/root	usr/lib/libavformat.so.55 -> libavformat.so.55.12.100
+-rwxr-xr-x	root/root	usr/lib/libavformat.so.55.12.100
 -rw-r--r--	root/root	usr/lib/libavutil.a
-lrwxrwxrwx	root/root	usr/lib/libavutil.so -> libavutil.so.52.18.100
-lrwxrwxrwx	root/root	usr/lib/libavutil.so.52 -> libavutil.so.52.18.100
--rwxr-xr-x	root/root	usr/lib/libavutil.so.52.18.100
+lrwxrwxrwx	root/root	usr/lib/libavutil.so -> libavutil.so.52.38.100
+lrwxrwxrwx	root/root	usr/lib/libavutil.so.52 -> libavutil.so.52.38.100
+-rwxr-xr-x	root/root	usr/lib/libavutil.so.52.38.100
 -rw-r--r--	root/root	usr/lib/libpostproc.a
-lrwxrwxrwx	root/root	usr/lib/libpostproc.so -> libpostproc.so.52.2.100
-lrwxrwxrwx	root/root	usr/lib/libpostproc.so.52 -> libpostproc.so.52.2.100
--rwxr-xr-x	root/root	usr/lib/libpostproc.so.52.2.100
+lrwxrwxrwx	root/root	usr/lib/libpostproc.so -> libpostproc.so.52.3.100
+lrwxrwxrwx	root/root	usr/lib/libpostproc.so.52 -> libpostproc.so.52.3.100
+-rwxr-xr-x	root/root	usr/lib/libpostproc.so.52.3.100
 -rw-r--r--	root/root	usr/lib/libswresample.a
 lrwxrwxrwx	root/root	usr/lib/libswresample.so -> libswresample.so.0.17.102
 lrwxrwxrwx	root/root	usr/lib/libswresample.so.0 -> libswresample.so.0.17.102
 -rwxr-xr-x	root/root	usr/lib/libswresample.so.0.17.102
 -rw-r--r--	root/root	usr/lib/libswscale.a
-lrwxrwxrwx	root/root	usr/lib/libswscale.so -> libswscale.so.2.2.100
-lrwxrwxrwx	root/root	usr/lib/libswscale.so.2 -> libswscale.so.2.2.100
--rwxr-xr-x	root/root	usr/lib/libswscale.so.2.2.100
+lrwxrwxrwx	root/root	usr/lib/libswscale.so -> libswscale.so.2.3.100
+lrwxrwxrwx	root/root	usr/lib/libswscale.so.2 -> libswscale.so.2.3.100
+-rwxr-xr-x	root/root	usr/lib/libswscale.so.2.3.100
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libavcodec.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libavdevice.pc
@@ -131,6 +136,7 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libswscale.pc
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
+-rw-r--r--	root/root	usr/man/man1/ffmpeg-all.1.gz
 -rw-r--r--	root/root	usr/man/man1/ffmpeg-bitstream-filters.1.gz
 -rw-r--r--	root/root	usr/man/man1/ffmpeg-codecs.1.gz
 -rw-r--r--	root/root	usr/man/man1/ffmpeg-devices.1.gz
@@ -141,16 +147,20 @@ drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/ffmpeg-scaler.1.gz
 -rw-r--r--	root/root	usr/man/man1/ffmpeg-utils.1.gz
 -rw-r--r--	root/root	usr/man/man1/ffmpeg.1.gz
+-rw-r--r--	root/root	usr/man/man1/ffplay-all.1.gz
 -rw-r--r--	root/root	usr/man/man1/ffplay.1.gz
+-rw-r--r--	root/root	usr/man/man1/ffprobe-all.1.gz
 -rw-r--r--	root/root	usr/man/man1/ffprobe.1.gz
+-rw-r--r--	root/root	usr/man/man1/ffserver-all.1.gz
 -rw-r--r--	root/root	usr/man/man1/ffserver.1.gz
--rw-r--r--	root/root	usr/man/man1/libavcodec.3.gz
--rw-r--r--	root/root	usr/man/man1/libavdevice.3.gz
--rw-r--r--	root/root	usr/man/man1/libavfilter.3.gz
--rw-r--r--	root/root	usr/man/man1/libavformat.3.gz
--rw-r--r--	root/root	usr/man/man1/libavutil.3.gz
--rw-r--r--	root/root	usr/man/man1/libswresample.3.gz
--rw-r--r--	root/root	usr/man/man1/libswscale.3.gz
+drwxr-xr-x	root/root	usr/man/man3/
+-rw-r--r--	root/root	usr/man/man3/libavcodec.3.gz
+-rw-r--r--	root/root	usr/man/man3/libavdevice.3.gz
+-rw-r--r--	root/root	usr/man/man3/libavfilter.3.gz
+-rw-r--r--	root/root	usr/man/man3/libavformat.3.gz
+-rw-r--r--	root/root	usr/man/man3/libavutil.3.gz
+-rw-r--r--	root/root	usr/man/man3/libswresample.3.gz
+-rw-r--r--	root/root	usr/man/man3/libswscale.3.gz
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/ffmpeg/
 drwxr-xr-x	root/root	usr/share/ffmpeg/examples/
diff --git a/ffmpeg/.md5sum b/ffmpeg/.md5sum
index 60695c38d..e10116dee 100644
--- a/ffmpeg/.md5sum
+++ b/ffmpeg/.md5sum
@@ -1 +1 @@
-4997660dfc077922e37d0583f9322f6b  ffmpeg-1.2.2.tar.bz2
+6c5cfed204d8a108325d1fc439ab734a  ffmpeg-2.0.2.tar.bz2
diff --git a/ffmpeg/Pkgfile b/ffmpeg/Pkgfile
index e21d2a82b..a23471e20 100644
--- a/ffmpeg/Pkgfile
+++ b/ffmpeg/Pkgfile
@@ -2,10 +2,10 @@
 # URL: http://ffmpeg.org/
 # Maintainer: Danny Rawlins, monster dot romster at gmail dot com
 # Packager: Matt Housh, jaeger at crux dot nu
-# Depends on: faac imlib2 lame libsdl libtheora libxvid x264 opencore-amr speex libva libvdpau
+# Depends on: gnutls imlib2 lame libass libbluray libmodplug libsdl libtheora libva libvdpau libxvid opencore-amr opus rtmpdump schroedinger speex x264
 
 name=ffmpeg
-version=1.2.2
+version=2.0.2
 release=1
 source=(http://ffmpeg.org/releases/$name-$version.tar.bz2)
 
@@ -15,27 +15,39 @@ build() {
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/man \
-		--enable-vaapi \
-		--enable-vdpau \
-		--enable-gpl \
-		--enable-version3 \
+		--disable-debug \
+		--disable-doc \
 		--enable-avfilter \
-		--enable-libopencore-amrnb \
-		--enable-libopencore-amrwb \
-		--enable-libfaac \
+		--enable-avresample \
+		--enable-dxva2 \
+		--enable-fontconfig \
+		--enable-gnutls \
+		--enable-gpl \
+		--enable-libass \
+		--enable-libbluray \
+		--enable-libfreetype \
+		--enable-libmodplug \
 		--enable-libmp3lame \
+		--enable-libopencore_amrnb \
+		--enable-libopencore_amrwb \
+		--enable-libopenjpeg \
+		--enable-libopus \
+		--enable-librtmp \
+		--enable-libschroedinger \
 		--enable-libspeex \
 		--enable-libtheora \
 		--enable-libvorbis \
 		--enable-libx264 \
 		--enable-libxvid \
-		--enable-shared \
-		--enable-pthreads \
+		--enable-pic \
 		--enable-postproc \
-		--enable-x11grab \
-		--enable-nonfree \
-		--disable-debug \
-		--disable-doc
+		--enable-pthreads \
+		--enable-shared \
+		--enable-swresample \
+		--enable-vaapi \
+		--enable-vdpau \
+		--enable-version3 \
+		--enable-x11grab
 
 	[ "$CC" ] || CC=gcc
 	make CC="$CC" SHARED_PP='yes' $MAKEFLAGS