ffmpeg: 3.1.5 -> 3.2.2

reduced number of dependencies for encoders, and made them soft-dependencies

3 files changed, 59 insertions, 87 deletions

diff --git a/ffmpeg/.footprint b/ffmpeg/.footprint
index b7516a551..cd18e9c40 100644
--- a/ffmpeg/.footprint
+++ b/ffmpeg/.footprint
@@ -1,8 +1,6 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/ffmpeg
--rwxr-xr-x	root/root	usr/bin/ffmpeg-x264-10bit
--rwxr-xr-x	root/root	usr/bin/ffplay
 -rwxr-xr-x	root/root	usr/bin/ffprobe
 -rwxr-xr-x	root/root	usr/bin/ffserver
 drwxr-xr-x	root/root	usr/include/
@@ -15,6 +13,7 @@ drwxr-xr-x	root/root	usr/include/libavcodec/
 -rw-r--r--	root/root	usr/include/libavcodec/dv_profile.h
 -rw-r--r--	root/root	usr/include/libavcodec/dxva2.h
 -rw-r--r--	root/root	usr/include/libavcodec/jni.h
+-rw-r--r--	root/root	usr/include/libavcodec/mediacodec.h
 -rw-r--r--	root/root	usr/include/libavcodec/qsv.h
 -rw-r--r--	root/root	usr/include/libavcodec/vaapi.h
 -rw-r--r--	root/root	usr/include/libavcodec/vda.h
@@ -75,6 +74,7 @@ drwxr-xr-x	root/root	usr/include/libavutil/
 -rw-r--r--	root/root	usr/include/libavutil/hwcontext.h
 -rw-r--r--	root/root	usr/include/libavutil/hwcontext_cuda.h
 -rw-r--r--	root/root	usr/include/libavutil/hwcontext_dxva2.h
+-rw-r--r--	root/root	usr/include/libavutil/hwcontext_qsv.h
 -rw-r--r--	root/root	usr/include/libavutil/hwcontext_vaapi.h
 -rw-r--r--	root/root	usr/include/libavutil/hwcontext_vdpau.h
 -rw-r--r--	root/root	usr/include/libavutil/imgutils.h
@@ -124,41 +124,41 @@ 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.57.48.101
-lrwxrwxrwx	root/root	usr/lib/libavcodec.so.57 -> libavcodec.so.57.48.101
--rwxr-xr-x	root/root	usr/lib/libavcodec.so.57.48.101
+lrwxrwxrwx	root/root	usr/lib/libavcodec.so -> libavcodec.so.57.64.101
+lrwxrwxrwx	root/root	usr/lib/libavcodec.so.57 -> libavcodec.so.57.64.101
+-rwxr-xr-x	root/root	usr/lib/libavcodec.so.57.64.101
 -rw-r--r--	root/root	usr/lib/libavdevice.a
-lrwxrwxrwx	root/root	usr/lib/libavdevice.so -> libavdevice.so.57.0.101
-lrwxrwxrwx	root/root	usr/lib/libavdevice.so.57 -> libavdevice.so.57.0.101
--rwxr-xr-x	root/root	usr/lib/libavdevice.so.57.0.101
+lrwxrwxrwx	root/root	usr/lib/libavdevice.so -> libavdevice.so.57.1.100
+lrwxrwxrwx	root/root	usr/lib/libavdevice.so.57 -> libavdevice.so.57.1.100
+-rwxr-xr-x	root/root	usr/lib/libavdevice.so.57.1.100
 -rw-r--r--	root/root	usr/lib/libavfilter.a
-lrwxrwxrwx	root/root	usr/lib/libavfilter.so -> libavfilter.so.6.47.100
-lrwxrwxrwx	root/root	usr/lib/libavfilter.so.6 -> libavfilter.so.6.47.100
--rwxr-xr-x	root/root	usr/lib/libavfilter.so.6.47.100
+lrwxrwxrwx	root/root	usr/lib/libavfilter.so -> libavfilter.so.6.65.100
+lrwxrwxrwx	root/root	usr/lib/libavfilter.so.6 -> libavfilter.so.6.65.100
+-rwxr-xr-x	root/root	usr/lib/libavfilter.so.6.65.100
 -rw-r--r--	root/root	usr/lib/libavformat.a
-lrwxrwxrwx	root/root	usr/lib/libavformat.so -> libavformat.so.57.41.100
-lrwxrwxrwx	root/root	usr/lib/libavformat.so.57 -> libavformat.so.57.41.100
--rwxr-xr-x	root/root	usr/lib/libavformat.so.57.41.100
+lrwxrwxrwx	root/root	usr/lib/libavformat.so -> libavformat.so.57.56.100
+lrwxrwxrwx	root/root	usr/lib/libavformat.so.57 -> libavformat.so.57.56.100
+-rwxr-xr-x	root/root	usr/lib/libavformat.so.57.56.100
 -rw-r--r--	root/root	usr/lib/libavresample.a
-lrwxrwxrwx	root/root	usr/lib/libavresample.so -> libavresample.so.3.0.0
-lrwxrwxrwx	root/root	usr/lib/libavresample.so.3 -> libavresample.so.3.0.0
--rwxr-xr-x	root/root	usr/lib/libavresample.so.3.0.0
+lrwxrwxrwx	root/root	usr/lib/libavresample.so -> libavresample.so.3.1.0
+lrwxrwxrwx	root/root	usr/lib/libavresample.so.3 -> libavresample.so.3.1.0
+-rwxr-xr-x	root/root	usr/lib/libavresample.so.3.1.0
 -rw-r--r--	root/root	usr/lib/libavutil.a
-lrwxrwxrwx	root/root	usr/lib/libavutil.so -> libavutil.so.55.28.100
-lrwxrwxrwx	root/root	usr/lib/libavutil.so.55 -> libavutil.so.55.28.100
--rwxr-xr-x	root/root	usr/lib/libavutil.so.55.28.100
+lrwxrwxrwx	root/root	usr/lib/libavutil.so -> libavutil.so.55.34.100
+lrwxrwxrwx	root/root	usr/lib/libavutil.so.55 -> libavutil.so.55.34.100
+-rwxr-xr-x	root/root	usr/lib/libavutil.so.55.34.100
 -rw-r--r--	root/root	usr/lib/libpostproc.a
-lrwxrwxrwx	root/root	usr/lib/libpostproc.so -> libpostproc.so.54.0.100
-lrwxrwxrwx	root/root	usr/lib/libpostproc.so.54 -> libpostproc.so.54.0.100
--rwxr-xr-x	root/root	usr/lib/libpostproc.so.54.0.100
+lrwxrwxrwx	root/root	usr/lib/libpostproc.so -> libpostproc.so.54.1.100
+lrwxrwxrwx	root/root	usr/lib/libpostproc.so.54 -> libpostproc.so.54.1.100
+-rwxr-xr-x	root/root	usr/lib/libpostproc.so.54.1.100
 -rw-r--r--	root/root	usr/lib/libswresample.a
-lrwxrwxrwx	root/root	usr/lib/libswresample.so -> libswresample.so.2.1.100
-lrwxrwxrwx	root/root	usr/lib/libswresample.so.2 -> libswresample.so.2.1.100
--rwxr-xr-x	root/root	usr/lib/libswresample.so.2.1.100
+lrwxrwxrwx	root/root	usr/lib/libswresample.so -> libswresample.so.2.3.100
+lrwxrwxrwx	root/root	usr/lib/libswresample.so.2 -> libswresample.so.2.3.100
+-rwxr-xr-x	root/root	usr/lib/libswresample.so.2.3.100
 -rw-r--r--	root/root	usr/lib/libswscale.a
-lrwxrwxrwx	root/root	usr/lib/libswscale.so -> libswscale.so.4.1.100
-lrwxrwxrwx	root/root	usr/lib/libswscale.so.4 -> libswscale.so.4.1.100
--rwxr-xr-x	root/root	usr/lib/libswscale.so.4.1.100
+lrwxrwxrwx	root/root	usr/lib/libswscale.so -> libswscale.so.4.2.100
+lrwxrwxrwx	root/root	usr/lib/libswscale.so.4 -> libswscale.so.4.2.100
+-rwxr-xr-x	root/root	usr/lib/libswscale.so.4.2.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
@@ -171,26 +171,6 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libswscale.pc
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/ffmpeg/
-drwxr-xr-x	root/root	usr/share/ffmpeg/examples/
--rw-r--r--	root/root	usr/share/ffmpeg/examples/Makefile
--rw-r--r--	root/root	usr/share/ffmpeg/examples/README
--rw-r--r--	root/root	usr/share/ffmpeg/examples/avio_dir_cmd.c
--rw-r--r--	root/root	usr/share/ffmpeg/examples/avio_reading.c
--rw-r--r--	root/root	usr/share/ffmpeg/examples/decoding_encoding.c
--rw-r--r--	root/root	usr/share/ffmpeg/examples/demuxing_decoding.c
--rw-r--r--	root/root	usr/share/ffmpeg/examples/extract_mvs.c
--rw-r--r--	root/root	usr/share/ffmpeg/examples/filter_audio.c
--rw-r--r--	root/root	usr/share/ffmpeg/examples/filtering_audio.c
--rw-r--r--	root/root	usr/share/ffmpeg/examples/filtering_video.c
--rw-r--r--	root/root	usr/share/ffmpeg/examples/http_multiclient.c
--rw-r--r--	root/root	usr/share/ffmpeg/examples/metadata.c
--rw-r--r--	root/root	usr/share/ffmpeg/examples/muxing.c
--rw-r--r--	root/root	usr/share/ffmpeg/examples/qsvdec.c
--rw-r--r--	root/root	usr/share/ffmpeg/examples/remuxing.c
--rw-r--r--	root/root	usr/share/ffmpeg/examples/resampling_audio.c
--rw-r--r--	root/root	usr/share/ffmpeg/examples/scaling_video.c
--rw-r--r--	root/root	usr/share/ffmpeg/examples/transcode_aac.c
--rw-r--r--	root/root	usr/share/ffmpeg/examples/transcoding.c
 -rw-r--r--	root/root	usr/share/ffmpeg/ffprobe.xsd
 -rw-r--r--	root/root	usr/share/ffmpeg/libvpx-1080p.ffpreset
 -rw-r--r--	root/root	usr/share/ffmpeg/libvpx-1080p50_60.ffpreset
@@ -210,8 +190,6 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/ffmpeg-scaler.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/ffmpeg-utils.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/ffmpeg.1.gz
--rw-r--r--	root/root	usr/share/man/man1/ffplay-all.1.gz
--rw-r--r--	root/root	usr/share/man/man1/ffplay.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/ffprobe-all.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/ffprobe.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/ffserver-all.1.gz
diff --git a/ffmpeg/.md5sum b/ffmpeg/.md5sum
index e9dde4a80..416b3945d 100644
--- a/ffmpeg/.md5sum
+++ b/ffmpeg/.md5sum
@@ -1,2 +1,2 @@
-0dd2f448a41f555a100fb075d5df136e  ffmpeg-3.1.5.tar.bz2
+82cf25d36df70ee995bbdb3efc079934  ffmpeg-3.2.2.tar.bz2
 dae0c10c99399580c929fc100e79faef  ffmpeg-x264-10bit.sh
diff --git a/ffmpeg/Pkgfile b/ffmpeg/Pkgfile
index a610f6e17..b5185df0d 100644
--- a/ffmpeg/Pkgfile
+++ b/ffmpeg/Pkgfile
@@ -2,10 +2,11 @@
 # URL: http://ffmpeg.org/
 # Maintainer: Danny Rawlins, crux at romster dot me
 # Packager: Matt Housh, jaeger at crux dot nu
-# Depends on: gnutls lame libass libbluray libgmp libmodplug libsdl libtheora libva libvpx libxvid opencore-amr openjpeg opus rtmpdump schroedinger speex x264 x265
+# Depends on: bzip2 xz yasm zlib
+# Optional: alsa-lib fdk-aac lame libass libsdl2 libtheora libva libvdpau libvorbis libvpx libwebp opus x264 x265
 
 name=ffmpeg
-version=3.1.5
+version=3.2.2
 release=1
 source=(http://ffmpeg.org/releases/$name-$version.tar.bz2
 	ffmpeg-x264-10bit.sh)
@@ -13,47 +14,40 @@ source=(http://ffmpeg.org/releases/$name-$version.tar.bz2
 build() {
 	cd $name-$version
 
-	./configure \
+[ -e '/usr/lib/pkgconfig/libwebp.pc' ] && PKGMK_FFMPEG+=' --enable-libwebp'
+[ -e '/usr/lib/pkgconfig/vdpau.pc' ] && PKGMK_FFMPEG+=' --enable-vdpau'
+[ -e '/usr/lib/pkgconfig/freetype2.pc' ] && PKGMK_FFMPEG+=' --enable-libfreetype'
+[ -e '/usr/lib/pkgconfig/x264.pc' ] && PKGMK_FFMPEG+=' --enable-libx264'
+[ -e '/usr/lib/pkgconfig/x265.pc' ] && PKGMK_FFMPEG+=' --enable-libx265'
+[ -e '/usr/lib/pkgconfig/libass.pc' ] && PKGMK_FFMPEG+=' --enable-libass'
+[ -e '/usr/include/lame/lame.h' ] && PKGMK_FFMPEG+=' --enable-libmp3lame'
+[ -e '/usr/lib/pkgconfig/opus.pc' ] && PKGMK_FFMPEG+=' --enable-libopus'
+[ -e '/usr/lib/pkgconfig/vpx.pc' ] && PKGMK_FFMPEG+=' --enable-libvpx'
+[ -e '/usr/lib/pkgconfig/vorbis.pc' ] && PKGMK_FFMPEG+=' --enable-libvorbis'
+[ -e '/usr/lib/pkgconfig/theora.pc' ] && PKGMK_FFMPEG+=' --enable-libtheora'
+[ -e '/usr/lib/pkgconfig/fdk-aac.pc' ] && PKGMK_FFMPEG+=' --enable-libfdk-aac --enable-nonfree'
+
+	./configure ${PKGMK_FFMPEG} \
 		--prefix=/usr \
 		--disable-debug \
 		--disable-doc \
-		--enable-avfilter \
-		--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-libx265 \
-		--enable-libvpx \
-		--enable-libxvid \
+		--enable-version3 \
+		--enable-shared \
 		--enable-pic \
+		--enable-avfilter \
+		--enable-avresample \
 		--enable-postproc \
 		--enable-pthreads \
-		--enable-shared \
-		--enable-swresample \
-		--enable-vaapi \
-		--enable-vdpau \
-		--enable-version3 \
-		--enable-x11grab
+		--enable-swresample
 
-	[ "$CC" ] || CC=gcc
-	make CC="$CC" SHARED_PP='yes' $MAKEFLAGS
+	make
 	make DESTDIR=$PKG install install-man
 
-	install -m 0755 -D $SRC/ffmpeg-x264-10bit.sh $PKG/usr/bin/ffmpeg-x264-10bit
+	rm -r $PKG/usr/share/ffmpeg/examples
+
+	if [ -e '/usr/lib/pkgconfig/x264.pc' ]; then
+		install -m 0755 -D $SRC/ffmpeg-x264-10bit.sh \
+			$PKG/usr/bin/ffmpeg-x264-10bit
+	fi
 }