Update to release 2.8.2 [1], add support for more external codecs [2]

PR:		204511
Submitted by:	jbeich [2]
Reviewed by:	riggs [1]

3 files changed, 118 insertions, 11 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 43f52ba1861f..5265861db991 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ffmpeg
-PORTVERSION=	2.8.1
+PORTVERSION=	2.8.2
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
@@ -22,15 +22,18 @@ USES=		compiler cpe gmake perl5 pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
-OPTIONS_DEFINE=	AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG DOCS FAAC \
-		FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GSM ICONV \
-		JACK LAME LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENH264 OPENJPEG \
-		OPTIMIZED_CFLAGS OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SMB SPEEX \
-		THEORA VAAPI VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX \
-		X11GRAB X264 X265 XVID
+OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT DC1394 \
+		DEBUG DOCS FAAC FDK_AAC FFSERVER FLITE FONTCONFIG \
+		FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK LADSPA \
+		LAME LIBBLURAY LIBV4L MODPLUG OPENAL OPENCL OPENCV OPENGL \
+		OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO QUVI \
+		RTCPU RTMP SCHROEDINGER SDL SMB SNAPPY SPEEX SSH \
+		THEORA TWOLAME VAAPI VDPAU VIDSTAB VORBIS VO_AACENC \
+		VO_AMRWBENC VPX WAVPACK WEBP X11GRAB X264 X265 XCB XVID \
+		XVIDEO ZMQ ZVBI
 
 OPTIONS_DEFAULT=	FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \
-			OPENCV SCHROEDINGER THEORA VORBIS VPX X264 XVID
+			OPENCV RTCPU SCHROEDINGER THEORA VORBIS VPX X264 XVID
 
 OPTIONS_SINGLE=	SSL
 OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
@@ -44,16 +47,28 @@ OPTIONS_DEFAULT_amd64=	MMX SSE
 OPTIONS_DEFAULT_i386=	${MACHINE_CPU:tu:MMMX} ${MACHINE_CPU:tu:MSSE}
 
 ASS_DESC=	Subtitles rendering via libass
+BS2B_DESC=	Bauer Stereophonic-to-Binaural filter
 CDIO_DESC=	Audio CD grabbing with libcdio
+DC1394_DESC=	IIDC-1394 grabbing using libdc1394
 FDK_AAC_DESC=	AAC audio encoding via Fraunhofer FDK
 FFSERVER_DESC=	Build and install ffserver
+FLITE_DESC=	Voice synthesis support via libflite
+GME_DESC=	Game Music Emu demuxer
 GPL3_DESC=	Allow (L)GPL version 3 code(cs)
+ILBC_DESC=	Internet Low Bit Rate codec
 LIBV4L_DESC=	Video for Linux support
 LICENSE_DESC=	Licensing options
 NONFREE_DESC=	Allow use of nonfree code
+OPENCL_DESC=	Heterogeneous computing via OpenCL
 OPENH264_DESC=	H.264 video codec support via OpenH264
+QUVI_DESC=	Flash media stream URLs
+RTCPU_DESC=	Detect CPU capabilities at runtime
 VFP_DESC=	Enable Vector Floating Point instructions
-X11GRAB_DESC=	Enable x11 grabbing
+VIDSTAB_DESC=	Video stabilization filter
+X11GRAB_DESC=	X11 grabbing (legacy)
+XCB_DESC=	X11 grabbing using XCB
+ZMQ_DESC=	Message passing via libzmq${ZMQ_VERSION}
+ZVBI_DESC=	Teletext support via libzvbi
 
 OPTIONS_SUB=	yes
 
@@ -81,6 +96,14 @@ AMR_WB_IMPLIES=		GPL3
 ASS_LIB_DEPENDS=	libass.so:${PORTSDIR}/multimedia/libass
 ASS_CONFIGURE_ENABLE=	libass
 
+# bs2b
+BS2B_LIB_DEPENDS=	libbs2b.so:${PORTSDIR}/audio/libbs2b
+BS2B_CONFIGURE_ENABLE=	libbs2b
+
+# caca
+CACA_LIB_DEPENDS=	libcaca.so:${PORTSDIR}/graphics/libcaca
+CACA_CONFIGURE_ENABLE=	libcaca
+
 # cdio
 CDIO_LIB_DEPENDS=	libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
 CDIO_CONFIGURE_ENABLE=	libcdio
@@ -89,6 +112,10 @@ CDIO_CONFIGURE_ENABLE=	libcdio
 CELT_LIB_DEPENDS=	libcelt0.so:${PORTSDIR}/audio/celt
 CELT_CONFIGURE_ENABLE=	libcelt
 
+# dc1394
+DC1394_LIB_DEPENDS=	libdc1394.so:${PORTSDIR}/multimedia/libdc1394
+DC1394_CONFIGURE_ENABLE=	libdc1394
+
 # debugging
 DEBUG_CONFIGURE_ON=	--disable-stripping
 DEBUG_CONFIGURE_OFF=	--disable-debug
@@ -111,6 +138,10 @@ FDK_AAC_IMPLIES=	NONFREE
 FFSERVER_CONFIGURE_ENABLE=	ffserver
 FFSERVER_VARS=		USE_RC_SUBR+=ffserver
 
+# flite
+FLITE_LIB_DEPENDS=	libflite.so:${PORTSDIR}/audio/flite
+FLITE_CONFIGURE_ENABLE=	libflite
+
 # fontconfig
 FONTCONFIG_LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 FONTCONFIG_CONFIGURE_ENABLE=	fontconfig
@@ -123,10 +154,18 @@ FREETYPE_CONFIGURE_ENABLE=	libfreetype
 FREI0R_BUILD_DEPENDS=	${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
 FREI0R_CONFIGURE_ENABLE=	frei0r
 
+# fribidi
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+FRIBIDI_CONFIGURE_ENABLE=	libfribidi
+
 # gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
 GNUTLS_CONFIGURE_ENABLE=	gnutls
 
+# gme
+GME_LIB_DEPENDS=	libgme.so:${PORTSDIR}/audio/libgme
+GME_CONFIGURE_ENABLE=	libgme
+
 # gsm
 GSM_LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
 GSM_CONFIGURE_ENABLE=	libgsm
@@ -135,9 +174,19 @@ GSM_CONFIGURE_ENABLE=	libgsm
 ICONV_USES=	iconv
 ICONV_CONFIGURE_ENABLE=	iconv
 
+# ilbc
+ILBC_LIB_DEPENDS=	libilbc.so:${PORTSDIR}/net/libilbc
+ILBC_CONFIGURE_ENABLE=	libilbc
+
+# jack
 JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 JACK_CONFIGURE_OFF=	--disable-indev=jack
 
+# ladspa
+LADSPA_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+LADSPA_RUN_DEPENDS=	${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
+LADSPA_CONFIGURE_ENABLE=	ladspa
+
 # lame
 LAME_LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame
 LAME_CONFIGURE_ENABLE=	libmp3lame
@@ -165,10 +214,19 @@ OPENAL_LIB_DEPENDS=	libopenal.so:${PORTSDIR}/audio/openal-soft
 OPENAL_CONFIGURE_ENABLE=	openal
 OPENAL_CONFIGURE_OFF=		--disable-indev=openal
 
+# opencl
+OPENCL_BUILD_DEPENDS=	${LOCALBASE}/include/CL/opencl.h:${PORTSDIR}/devel/opencl
+OPENCL_LIB_DEPENDS=	libOpenCL.so:${PORTSDIR}/devel/ocl-icd
+OPENCL_CONFIGURE_ENABLE=	opencl
+
 # opencv
 OPENCV_LIB_DEPENDS=	libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core
 OPENCV_CONFIGURE_ENABLE=	libopencv
 
+# opengl
+OPENGL_USE=		GL=gl
+OPENGL_CONFIGURE_ENABLE=	opengl
+
 # openh264
 OPENH264_LIB_DEPENDS=	libopenh264.so:${PORTSDIR}/multimedia/openh264
 OPENH264_CONFIGURE_ENABLE=	libopenh264
@@ -195,6 +253,13 @@ PULSEAUDIO_CONFIGURE_ENABLE=	libpulse
 PULSEAUDIO_CONFIGURE_OFF=	--disable-indev=pulse \
 				--disable-outdev=pulse
 
+# quvi
+QUVI_LIB_DEPENDS=	libquvi.so:${PORTSDIR}/multimedia/libquvi
+QUVI_CONFIGURE_ENABLE=	libquvi
+
+# rtcpu
+RTCPU_CONFIGURE_ENABLE=	runtime-cpudetect
+
 # rtmp
 RTMP_LIB_DEPENDS=	librtmp.so:${PORTSDIR}/multimedia/librtmp
 RTMP_CONFIGURE_ENABLE=	librtmp
@@ -213,6 +278,10 @@ SMB_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
 SMB_CONFIGURE_ENABLE=	libsmbclient
 SMB_IMPLIES=		GPL3
 
+# snappy
+SNAPPY_LIB_DEPENDS=	libsnappy.so:${PORTSDIR}/archivers/snappy
+SNAPPY_CONFIGURE_ENABLE=	libsnappy
+
 # speex
 SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
 SPEEX_CONFIGURE_ENABLE=	libspeex
@@ -222,10 +291,18 @@ SSE_CONFIGURE_ENABLE=	sse
 SSE_VARS=		FFMPEG_CFLAGS+="-msse"
 SSE_IMPLIES=		MMX
 
+# ssh
+SSH_LIB_DEPENDS=	libssh.so:${PORTSDIR}/security/libssh
+SSH_CONFIGURE_ENABLE=	libssh
+
 # theora
 THEORA_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
 THEORA_CONFIGURE_ENABLE=	libtheora
 
+# twolame
+TWOLAME_LIB_DEPENDS=	libtwolame.so:${PORTSDIR}/audio/twolame
+TWOLAME_CONFIGURE_ENABLE=	libtwolame
+
 # vaapi
 VAAPI_LIB_DEPENDS=	libva.so:${PORTSDIR}/multimedia/libva
 VAAPI_CONFIGURE_ENABLE=	vaapi
@@ -246,6 +323,10 @@ VO_AMRWBENC_LIB_DEPENDS=	libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc
 VO_AMRWBENC_CONFIGURE_ENABLE=	libvo-amrwbenc
 VO_AMRWBENC_IMPLIES=	GPL3
 
+# vid.stab
+VIDSTAB_LIB_DEPENDS=	libvidstab.so:${PORTSDIR}/multimedia/vid.stab
+VIDSTAB_CONFIGURE_ENABLE=	libvidstab
+
 # vorbis
 VORBIS_LIB_DEPENDS=	libvorbisenc.so:${PORTSDIR}/audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=	libvorbis
@@ -255,6 +336,14 @@ VORBIS_VARS=		FFMPEG_CFLAGS+="-I${LOCALBASE}/include/vorbis"
 VPX_LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx
 VPX_CONFIGURE_ENABLE=	libvpx
 
+# wavpack
+WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_CONFIGURE_ENABLE=	libwavpack
+
+# webp
+WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_CONFIGURE_ENABLE=	libwebp
+
 # x11grab
 X11GRAB_USE=		XORG=x11,xext,xfixes
 X11GRAB_CONFIGURE_ENABLE=	x11grab
@@ -267,10 +356,27 @@ X264_CONFIGURE_ENABLE=	libx264
 X265_LIB_DEPENDS=	libx265.so:${PORTSDIR}/multimedia/x265
 X265_CONFIGURE_ENABLE=	libx265
 
+# xcb
+XCB_USE=		XORG=xcb
+XCB_CONFIGURE_ENABLE=	libxcb
+
 # xvid
 XVID_LIB_DEPENDS=	libxvidcore.so:${PORTSDIR}/multimedia/xvid
 XVID_CONFIGURE_ENABLE=	libxvid
 
+# xv
+XVIDEO_USE=		XORG=xv
+XVIDEO_CONFIGURE_OFF=	--disable-outdev=xv
+
+# zmq
+ZMQ_LIB_DEPENDS=	libzmq.so:${PORTSDIR}/net/libzmq${ZMQ_VERSION}
+ZMQ_CONFIGURE_ENABLE=	libzmq
+ZMQ_VERSION?=		4
+
+# zvbi
+ZVBI_LIB_DEPENDS=	libzvbi.so:${PORTSDIR}/devel/libzvbi
+ZVBI_CONFIGURE_ENABLE=	libzvbi
+
 # License knobs
 GPL3_CONFIGURE_ENABLE=	version3
 GPL3_VARS=		LICENSE="GPLv3 LGPL3"
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 8ab71b4c6896..f2b63e8a69ee 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-2.8.1.tar.bz2) = e2ed5ab28dee1af94336739173eb0019afc21a54e38a96f4e3208e94a07866e2
-SIZE (ffmpeg-2.8.1.tar.bz2) = 8564488
+SHA256 (ffmpeg-2.8.2.tar.bz2) = 830ec647f7ad774fc0caf17ba47774bf5dee7a89cbd65894f364a87ba3ad21b2
+SIZE (ffmpeg-2.8.2.tar.bz2) = 8573586
diff --git a/multimedia/ffmpeg/pkg-plist b/multimedia/ffmpeg/pkg-plist
index 0251dfffbf2e..8977dbd2a939 100644
--- a/multimedia/ffmpeg/pkg-plist
+++ b/multimedia/ffmpeg/pkg-plist
@@ -75,6 +75,7 @@ include/libavutil/mem.h
 include/libavutil/motion_vector.h
 include/libavutil/murmur3.h
 include/libavutil/old_pix_fmts.h
+%%OPENCL%%include/libavutil/opencl.h
 include/libavutil/opt.h
 include/libavutil/parseutils.h
 include/libavutil/pixdesc.h