12 files changed, 100 insertions, 45 deletions

diff --git a/multimedia/avidemux26/Makefile b/multimedia/avidemux26/Makefile
index 3fce83d518f0..99bc7ce324fd 100644
--- a/multimedia/avidemux26/Makefile
+++ b/multimedia/avidemux26/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	avidemux26
 PORTVERSION=	${AVIDEMUX2_VERSION}
-PORTREVISION=	4
 CATEGORIES=	multimedia
 
 MAINTAINER=	multimedia@FreeBSD.org
@@ -25,7 +24,6 @@ PLIST_FILES+=	${DESKTOPDIR}/${PORTNAME}.desktop
 PLIST_FILES+=	${DESKTOPDIR}/${PORTNAME}_qt4.desktop
 .endif
 
-
 CMAKE_SOURCE_PATH=	${WRKSRC}/avidemux_core
 
 post-configure: post-configure-common
diff --git a/multimedia/avidemux26/Makefile.common b/multimedia/avidemux26/Makefile.common
index b4d336645599..1b9244b6c256 100644
--- a/multimedia/avidemux26/Makefile.common
+++ b/multimedia/avidemux26/Makefile.common
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-AVIDEMUX2_VERSION=	2.6.8
+AVIDEMUX2_VERSION=	2.6.9
 MASTER_SITES=	\
 		SF/avidemux/avidemux/${PORTVERSION}
 DISTNAME=	avidemux_${PORTVERSION}
@@ -26,7 +26,8 @@ USES=		cmake:outsource pkgconfig iconv gmake compiler:features
 USES+=		dos2unix
 DOS2UNIX_FILES=	cmake/admCheckMiscLibs.cmake po/CMakeLists.txt
 CMAKE_ARGS+=	-DGNUMAKE_EXECUTABLE=gmake
-CMAKE_ARGS+=    -DAVIDEMUX_PACKAGER=none
+CMAKE_ARGS+=	-DAVIDEMUX_PACKAGER=none
+CMAKE_ARGS+=	-DQT5:BOOL=OFF
 CXXFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
@@ -36,7 +37,7 @@ MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 
 OPTIONS_DEFINE=	QT4 CLI FREETYPE FONTCONFIG OSS ESOUND JACK \
 		PULSEAUDIO XVIDEO FAAC \
-		FAAD X264 VPX XVID SDL AMR VORBIS NLS LAME VDPAU
+		FAAD X264 X265 VPX XVID SDL AMR VORBIS NLS LAME VAAPI VDPAU
 OPTIONS_DEFAULT=	QT4 FREETYPE FONTCONFIG OSS XVIDEO VPX XVID \
 			SDL FAAD VORBIS
 CLI_DESC=	Build CLI tool
@@ -202,6 +203,14 @@ CMAKE_ARGS+=	-DX264:BOOL=OFF
 PLIST_SUB+=	X264="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MX265}
+LIB_DEPENDS+=	libx265.so:${PORTSDIR}/multimedia/x265
+PLIST_SUB+=	X265=""
+.else
+CMAKE_ARGS+=	-DX265:BOOL=OFF
+PLIST_SUB+=	X265="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MVPX}
 LIB_DEPENDS+=	libvpx.so:${PORTSDIR}/multimedia/libvpx
 PLIST_SUB+=	VPX=""
@@ -226,8 +235,16 @@ CMAKE_ARGS+=	-DSDL:BOOL=OFF
 PLIST_SUB+=	SDL="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MVAAPI}
+LIB_DEPENDS+=	libva.so:${PORTSDIR}/multimedia/libva
+PLIST_SUB+=	VAAPI=""
+.else
+CMAKE_ARGS+=	-DVAAPI:BOOL=OFF -DLIBVA:BOOL=OFF
+PLIST_SUB+=	VAAPI="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MVDPAU}
-LIB_DEPENDS+=   libvdpau.so:${PORTSDIR}/multimedia/libvdpau
+LIB_DEPENDS+=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
 PLIST_SUB+=	VDPAU=""
 .else
 CMAKE_ARGS+=	-DVDPAU:BOOL=OFF
diff --git a/multimedia/avidemux26/distinfo b/multimedia/avidemux26/distinfo
index 27d881fd747d..85958c972185 100644
--- a/multimedia/avidemux26/distinfo
+++ b/multimedia/avidemux26/distinfo
@@ -1,2 +1,2 @@
-SHA256 (avidemux_2.6.8.tar.gz) = 02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682
-SIZE (avidemux_2.6.8.tar.gz) = 17380534
+SHA256 (avidemux_2.6.9.tar.gz) = c073bdb966bc0ab0dc3bbc7b5119fb81509b9d6cd90b916183a99ec6627e5006
+SIZE (avidemux_2.6.9.tar.gz) = 19282538
diff --git a/multimedia/avidemux26/files/patch-avidemux_core_ADM_core_src_ADM_memsupport.cpp b/multimedia/avidemux26/files/patch-avidemux__core_ADM__core_src_ADM__memsupport.cpp
index ef9111df4f4b..044843cc0f18 100644
--- a/multimedia/avidemux26/files/patch-avidemux_core_ADM_core_src_ADM_memsupport.cpp
+++ b/multimedia/avidemux26/files/patch-avidemux__core_ADM__core_src_ADM__memsupport.cpp
@@ -1,4 +1,4 @@
---- avidemux_core/ADM_core/src/ADM_memsupport.cpp.orig
+--- avidemux_core/ADM_core/src/ADM_memsupport.cpp.orig	2015-05-15 09:19:29 UTC
 +++ avidemux_core/ADM_core/src/ADM_memsupport.cpp
 @@ -23,7 +23,7 @@
   *   (at your option) any later version.                                   *
diff --git a/multimedia/avidemux26/files/patch-config.mak.diff b/multimedia/avidemux26/files/patch-avidemux__core_ffmpeg__package_patches_config.mak.diff
index 2b19a78191f4..f27ec3b76574 100644
--- a/multimedia/avidemux26/files/patch-config.mak.diff
+++ b/multimedia/avidemux26/files/patch-avidemux__core_ffmpeg__package_patches_config.mak.diff
@@ -1,7 +1,7 @@
---- avidemux_core/ffmpeg_package/patches/config.mak.diff.orig
+--- avidemux_core/ffmpeg_package/patches/config.mak.diff.orig	2015-05-15 09:19:29 UTC
 +++ avidemux_core/ffmpeg_package/patches/config.mak.diff
 @@ -1,6 +1,8 @@
----- config.mak	2011-09-29 06:10:57.072423557 +0000
+---- config.mak	2011-09-29 06:10:57 UTC
 -+++ config.mak	2011-09-29 06:11:44.896423943 +0000
 -@@ -59,7 +59,7 @@
 +--- config.mak.orig
diff --git a/multimedia/avidemux26/files/patch-avidemux__plugins_CMakeLists.txt b/multimedia/avidemux26/files/patch-avidemux__plugins_CMakeLists.txt
new file mode 100644
index 000000000000..ad48cb5306cd
--- /dev/null
+++ b/multimedia/avidemux26/files/patch-avidemux__plugins_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- avidemux_plugins/CMakeLists.txt.orig	2015-05-15 09:19:29 UTC
++++ avidemux_plugins/CMakeLists.txt
+@@ -202,7 +202,6 @@ ENDIF(DO_COMMON)
+ ADD_SUBDIRECTORY(ADM_videoEncoder)
+ ADD_SUBDIRECTORY(ADM_videoFilters6)
+ IF(DO_QT4)
+-        add_subdirectory(ADM_scriptEngines)
+         IF(USE_OPENGL AND NOT WIN32)
+          ADD_SUBDIRECTORY(ADM_videoFilters6_openGl)
+         ENDIF(USE_OPENGL AND NOT WIN32)
diff --git a/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-Makefile.patch b/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-Makefile.patch
index 50af201b28b3..79dcae260068 100644
--- a/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-Makefile.patch
+++ b/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-Makefile.patch
@@ -1,14 +1,14 @@
---- /dev/null
+--- avidemux_core/ffmpeg_package/patches/Makefile.patch.orig	2015-06-01 05:59:45 UTC
 +++ avidemux_core/ffmpeg_package/patches/Makefile.patch
 @@ -0,0 +1,11 @@
-+--- Makefile.orig
++--- Makefile.orig	2015-03-16 20:25:47.000000000 +0100
 ++++ Makefile
-+@@ -79,7 +79,7 @@
++@@ -92,7 +92,7 @@
 + $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
 + SUBDIR := $(1)/
 + include $(SRC_PATH)/$(1)/Makefile
 +--include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
 ++-include $(SRC_PATH)/$(1)/$(FFMPEG_ARCH)/Makefile
++ -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
 + include $(SRC_PATH)/library.mak
 + endef
-+ 
diff --git a/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch b/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch
index f92423e6023e..0e350422a3ce 100644
--- a/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch
+++ b/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch
@@ -1,14 +1,28 @@
---- /dev/null
+--- avidemux_core/ffmpeg_package/patches/configure.patch.orig	2015-06-01 05:59:45 UTC
 +++ avidemux_core/ffmpeg_package/patches/configure.patch
-@@ -0,0 +1,11 @@
-+--- configure.orig
+@@ -0,0 +1,25 @@
++--- configure.orig	2015-03-16 20:26:04.000000000 +0100
 ++++ configure
-+@@ -4387,7 +4387,7 @@ ifndef MAIN_MAKEFILE
++@@ -2733,12 +2733,7 @@
++ host_os=$target_os_default
++ 
++ # machine
++-if test "$target_os_default" = aix; then
++-    arch_default=$(uname -p)
++-    strip_default="strip -X32_64"
++-else
++-    arch_default=$(uname -m)
++-fi
+++arch_default=$(uname -p)
++ cpu="generic"
++ intrinsics="none"
++ 
++@@ -5621,7 +5616,7 @@
 + SRC_PATH:=\$(SRC_PATH:.%=..%)
 + endif
 + CC_IDENT=$cc_ident
 +-ARCH=$arch
 ++FFMPEG_ARCH=$arch
++ INTRINSICS=$intrinsics
 + CC=$cc
 + CXX=$cxx
-+ AS=$as
diff --git a/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-libavcodec-Makefile.patch b/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-libavcodec-Makefile.patch
new file mode 100644
index 000000000000..9675afd961cb
--- /dev/null
+++ b/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-libavcodec-Makefile.patch
@@ -0,0 +1,14 @@
+--- avidemux_core/ffmpeg_package/patches/libavcodec-Makefile.patch.orig	2015-06-01 05:59:45 UTC
++++ avidemux_core/ffmpeg_package/patches/libavcodec-Makefile.patch
+@@ -0,0 +1,11 @@
++--- libavcodec/Makefile.orig	2015-03-06 23:35:30.000000000 +0100
+++++ libavcodec/Makefile
++@@ -858,7 +858,7 @@
++                                           old_codec_ids.h               \
++                                           tableprint.h                  \
++                                           tableprint_vlc.h              \
++-                                          $(ARCH)/vp56_arith.h          \
+++                                          $(FFMPEG_ARCH)/vp56_arith.h          \
++ 
++ SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
++ SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
diff --git a/multimedia/avidemux26/files/patch-libexecinfo b/multimedia/avidemux26/files/patch-cmake_admCheckMiscLibs.cmake
index 0c664b3a6f08..2f1debddab21 100644
--- a/multimedia/avidemux26/files/patch-libexecinfo
+++ b/multimedia/avidemux26/files/patch-cmake_admCheckMiscLibs.cmake
@@ -1,6 +1,6 @@
---- cmake/admCheckMiscLibs.cmake.orig
+--- cmake/admCheckMiscLibs.cmake.orig	2015-05-30 14:09:29 UTC
 +++ cmake/admCheckMiscLibs.cmake
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ ENDIF (UNIX AND NOT APPLE)
  MESSAGE(STATUS "Checking for execinfo")
  MESSAGE(STATUS "*********************")
  
diff --git a/multimedia/avidemux26/files/patch-po__CMakeLists.txt b/multimedia/avidemux26/files/patch-po__CMakeLists.txt
index 3710beabeb07..441cd79bbc5b 100644
--- a/multimedia/avidemux26/files/patch-po__CMakeLists.txt
+++ b/multimedia/avidemux26/files/patch-po__CMakeLists.txt
@@ -1,15 +1,12 @@
---- ./po/CMakeLists.txt.orig	2007-10-08 15:57:48.000000000 +0200
-+++ ./po/CMakeLists.txt	2008-07-11 02:23:10.000000000 +0200
+--- 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)
-@@ -10,4 +11,5 @@
- 	COMPILE_TS_FILES(${CMAKE_SOURCE_DIR}/po QM_FILES)
+@@ -11,3 +12,4 @@ IF (QT4_FOUND)
  	
  	ADD_CUSTOM_TARGET(qmfiles ALL DEPENDS ${QM_FILES})
--ENDIF (QT4_FOUND)
-\ No newline at end of file
-+ENDIF (QT4_FOUND)
+ ENDIF (QT4_FOUND)
 +ENDIF (NOT DEFINED NO_NLS)
diff --git a/multimedia/avidemux26/pkg-plist b/multimedia/avidemux26/pkg-plist
index 818f652e4ae6..e159ea0787ab 100644
--- a/multimedia/avidemux26/pkg-plist
+++ b/multimedia/avidemux26/pkg-plist
@@ -1,11 +1,12 @@
-lib/libADM6avcodec.so.54
-lib/libADM6avformat.so.54
-lib/libADM6avutil.so.52
-lib/libADM6postproc.so.52
-lib/libADM6swscale.so.2
+lib/libADM6avcodec.so.56
+lib/libADM6avformat.so.56
+lib/libADM6avutil.so.54
+lib/libADM6postproc.so.53
+lib/libADM6swscale.so.3
 lib/libADM_core6.so
 lib/libADM_coreAudio6.so
 lib/libADM_coreImage6.so
+%%VAAPI%%lib/libADM_coreLibVA6.so
 lib/libADM_coreUI6.so
 lib/libADM_audioParser6.so
 lib/libADM_coreAudioDevice6.so
@@ -25,28 +26,32 @@ lib/libADM_coreUtils6.so
 lib/libADM_coreVideoCodec6.so
 lib/libADM_coreVideoEncoder6.so
 lib/libADM_coreVideoFilter6.so
-include/avidemux/2.6/libavutil/avconfig.h
+include/avidemux/2.6/libavutil/buffer.h
 include/avidemux/2.6/libavutil/attributes.h
+include/avidemux/2.6/libavutil/audioconvert.h
+include/avidemux/2.6/libavutil/avconfig.h
 include/avidemux/2.6/libavutil/avutil.h
 include/avidemux/2.6/libavutil/bswap.h
+include/avidemux/2.6/libavutil/channel_layout.h
 include/avidemux/2.6/libavutil/common.h
 include/avidemux/2.6/libavutil/cpu.h
-include/avidemux/2.6/libavutil/intfloat_readwrite.h
+include/avidemux/2.6/libavutil/dict.h
+include/avidemux/2.6/libavutil/error.h
+include/avidemux/2.6/libavutil/frame.h
+include/avidemux/2.6/libavutil/intfloat.h
 include/avidemux/2.6/libavutil/log.h
+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/pixfmt.h
 include/avidemux/2.6/libavutil/old_pix_fmts.h
-include/avidemux/2.6/libavutil/channel_layout.h
-include/avidemux/2.6/libavutil/error.h
-include/avidemux/2.6/libavutil/dict.h
-include/avidemux/2.6/libavutil/version.h
-include/avidemux/2.6/libavutil/time.h
-include/avidemux/2.6/libavutil/intfloat.h
-include/avidemux/2.6/libavutil/samplefmt.h
-include/avidemux/2.6/libavutil/audioconvert.h
+include/avidemux/2.6/libavutil/pixfmt.h
 include/avidemux/2.6/libavutil/rational.h
+include/avidemux/2.6/libavutil/samplefmt.h
+include/avidemux/2.6/libavutil/time.h
+include/avidemux/2.6/libavutil/version.h
 include/avidemux/2.6/libavcodec/avcodec.h
+%%VAAPI%%include/avidemux/2.6/libavcodec/vaapi.h
+%%VAAPI%%include/avidemux/2.6/libavcodec/vaapi_internal.h
 include/avidemux/2.6/libavcodec/vdpau.h
 include/avidemux/2.6/libavcodec/version.h
 include/avidemux/2.6/libavcodec/old_codec_ids.h