Update to upstream version 2.6.11, security fixes for bundled ffmpeg

The bundled ffmpeg version has been upgraded to 2.7.2 which addresses
multiple vulnerabilities as reported in
https://vuxml.freebsd.org/freebsd/3d950687-b4c9-4a86-8478-c56743547af8.html
https://vuxml.freebsd.org/freebsd/80c66af0-d1c5-449e-bd31-63b12525ff88.html

Heads-up by:	jbeich
MFH:		2016Q1
Security:	CVE-2015-3395
		CVE-2015-6818
		CVE-2015-6819
		CVE-2015-6820
		CVE-2015-6821
		CVE-2015-6822
		CVE-2015-6823
		CVE-2015-6824
		CVE-2015-6825
		CVE-2015-6826

8 files changed, 13 insertions, 22 deletions

diff --git a/multimedia/avidemux-plugins/pkg-plist b/multimedia/avidemux-plugins/pkg-plist
index 032a7744a3b6..b21ca4e8dfe5 100644
--- a/multimedia/avidemux-plugins/pkg-plist
+++ b/multimedia/avidemux-plugins/pkg-plist
@@ -24,11 +24,13 @@ lib/ADM_plugins6/videoEncoders/libADM_ve_null.so
 lib/ADM_plugins6/videoFilters/libADM_vf_addBorders.so
 lib/ADM_plugins6/videoFilters/libADM_vf_avsfilter.so
 lib/ADM_plugins6/videoFilters/libADM_vf_blackenBorders.so
+lib/ADM_plugins6/videoFilters/libADM_vf_black.so
 lib/ADM_plugins6/videoFilters/libADM_vf_changeFps.so
 lib/ADM_plugins6/videoFilters/libADM_vf_colorYuv.so
 lib/ADM_plugins6/videoFilters/libADM_vf_decimate.so
 lib/ADM_plugins6/videoFilters/libADM_vf_DgBob.so
 lib/ADM_plugins6/videoFilters/libADM_vf_dummy.so
+lib/ADM_plugins6/videoFilters/libADM_vf_fadeTo.so
 lib/ADM_plugins6/videoFilters/libADM_vf_fadeToBlack.so
 lib/ADM_plugins6/videoFilters/libADM_vf_mean.so
 lib/ADM_plugins6/videoFilters/libADM_vf_gauss.so
diff --git a/multimedia/avidemux-qt4/pkg-plist b/multimedia/avidemux-qt4/pkg-plist
index 9aeabcc210f4..d4141ef5bb15 100644
--- a/multimedia/avidemux-qt4/pkg-plist
+++ b/multimedia/avidemux-qt4/pkg-plist
@@ -2,6 +2,7 @@ bin/avidemux3_jobs_qt4
 bin/avidemux3_qt4
 include/avidemux/2.6/qt4/config.h
 lib/libADM_UIQT46.so
+lib/libADM_openGLQT46.so
 lib/libADM_render6_QT4.so
 share/avidemux6/qt4/i18n/avidemux_ca.qm
 share/avidemux6/qt4/i18n/avidemux_cs.qm
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index 2dc6577248d3..c62941730999 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	avidemux
 PORTVERSION=	${AVIDEMUX_VERSION}
-PORTREVISION=	4
 CATEGORIES=	multimedia
 
 MAINTAINER=	multimedia@FreeBSD.org
diff --git a/multimedia/avidemux/Makefile.common b/multimedia/avidemux/Makefile.common
index 4879709b1ae4..d25f2449fdf1 100644
--- a/multimedia/avidemux/Makefile.common
+++ b/multimedia/avidemux/Makefile.common
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-AVIDEMUX_VERSION=	2.6.10
+AVIDEMUX_VERSION=	2.6.11
 MASTER_SITES=	\
 		SF/avidemux/avidemux/${PORTVERSION}
 DISTNAME=	avidemux_${PORTVERSION}
@@ -20,7 +20,7 @@ OPTIONS_FILE=	${PORT_DBDIR}/${OPTIONS_NAME:C/-.*//}/options
 
 USES=		cmake:outsource pkgconfig iconv gmake compiler:features sqlite
 USES+=		dos2unix execinfo
-DOS2UNIX_FILES=	cmake/admCheckMiscLibs.cmake po/CMakeLists.txt
+DOS2UNIX_FILES=	cmake/admCheckMiscLibs.cmake
 CMAKE_ARGS+=	-DGNUMAKE_EXECUTABLE=gmake
 CMAKE_ARGS+=	-DAVIDEMUX_PACKAGER=none
 CMAKE_ARGS+=	-DQT5:BOOL=OFF
diff --git a/multimedia/avidemux/distinfo b/multimedia/avidemux/distinfo
index 32da783fdc74..750531a8d8b9 100644
--- a/multimedia/avidemux/distinfo
+++ b/multimedia/avidemux/distinfo
@@ -1,2 +1,2 @@
-SHA256 (avidemux_2.6.10.tar.gz) = 176c2482a0656f81e307f1505e6dfcdab086ee73e7de363617b884c5d7205aed
-SIZE (avidemux_2.6.10.tar.gz) = 19275880
+SHA256 (avidemux_2.6.11.tar.gz) = 936ff5e10ad0551460c1233c217e4cee642623f2899a8fe48cd7f0144cfd1b3a
+SIZE (avidemux_2.6.11.tar.gz) = 17980757
diff --git a/multimedia/avidemux/files/patch-avidemux__plugins_CMakeLists.txt b/multimedia/avidemux/files/patch-avidemux__plugins_CMakeLists.txt
index ad48cb5306cd..7ad4f749e4a4 100644
--- a/multimedia/avidemux/files/patch-avidemux__plugins_CMakeLists.txt
+++ b/multimedia/avidemux/files/patch-avidemux__plugins_CMakeLists.txt
@@ -1,10 +1,10 @@
---- avidemux_plugins/CMakeLists.txt.orig	2015-05-15 09:19:29 UTC
+--- avidemux_plugins/CMakeLists.txt.orig	2016-01-31 19:06:53 UTC
 +++ avidemux_plugins/CMakeLists.txt
-@@ -202,7 +202,6 @@ ENDIF(DO_COMMON)
- ADD_SUBDIRECTORY(ADM_videoEncoder)
+@@ -203,7 +203,6 @@ ADD_SUBDIRECTORY(ADM_videoEncoder)
  ADD_SUBDIRECTORY(ADM_videoFilters6)
  IF(DO_QT4)
+         add_subdirectory(ADM_demuxers/VapourSynth)
 -        add_subdirectory(ADM_scriptEngines)
-         IF(USE_OPENGL AND NOT WIN32)
+         #IF(USE_OPENGL AND NOT WIN32)
+         IF(USE_OPENGL )
           ADD_SUBDIRECTORY(ADM_videoFilters6_openGl)
-         ENDIF(USE_OPENGL AND NOT WIN32)
diff --git a/multimedia/avidemux/files/patch-po__CMakeLists.txt b/multimedia/avidemux/files/patch-po__CMakeLists.txt
deleted file mode 100644
index 441cd79bbc5b..000000000000
--- a/multimedia/avidemux/files/patch-po__CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- po/CMakeLists.txt.orig	2015-06-01 06:04:58 UTC
-+++ po/CMakeLists.txt
-@@ -1,3 +1,4 @@
-+IF (NOT DEFINED NO_NLS)
- IF (HAVE_GETTEXT)
- 	INCLUDE(Po)
- 	COMPILE_PO_FILES(${CMAKE_SOURCE_DIR}/po MO_FILES)
-@@ -11,3 +12,4 @@ IF (QT4_FOUND)
- 	
- 	ADD_CUSTOM_TARGET(qmfiles ALL DEPENDS ${QM_FILES})
- ENDIF (QT4_FOUND)
-+ENDIF (NOT DEFINED NO_NLS)
diff --git a/multimedia/avidemux/pkg-plist b/multimedia/avidemux/pkg-plist
index b4334b0ab13f..00c73bf570d8 100644
--- a/multimedia/avidemux/pkg-plist
+++ b/multimedia/avidemux/pkg-plist
@@ -46,6 +46,7 @@ include/avidemux/2.6/libavutil/macros.h
 include/avidemux/2.6/libavutil/mathematics.h
 include/avidemux/2.6/libavutil/mem.h
 include/avidemux/2.6/libavutil/old_pix_fmts.h
+include/avidemux/2.6/libavutil/opt.h
 include/avidemux/2.6/libavutil/pixfmt.h
 include/avidemux/2.6/libavutil/rational.h
 include/avidemux/2.6/libavutil/samplefmt.h