Index: multimedia/avidemux26/Makefile.common
===================================================================
--- multimedia/avidemux26/Makefile.common	(revision 387966)
+++ multimedia/avidemux26/Makefile.common	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-AVIDEMUX2_VERSION=	2.6.8
+AVIDEMUX2_VERSION=	2.6.9
 MASTER_SITES=	\
 		SF/avidemux/avidemux/${PORTVERSION}
 DISTNAME=	avidemux_${PORTVERSION}
@@ -36,7 +36,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
@@ -104,6 +104,9 @@ CMAKE_ARGS+=	-DGTK:BOOL=OFF
 PLIST_SUB+=	GTK="@comment "
 .endif
 
+# XXX notyet
+CMAKE_ARGS+=	-DQT5:BOOL=OFF
+
 .if ${PORT_OPTIONS:MQT4}
 CMAKE_ARGS+=	-DLRELEASE_EXECUTABLE=${LOCALBASE}/bin/lrelease-qt4
 USE_QT4=	qmake_build moc_build rcc_build uic_build linguist_build gui
@@ -202,6 +205,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,6 +237,14 @@ 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
 PLIST_SUB+=	VDPAU=""
Index: multimedia/avidemux26/distinfo
===================================================================
--- multimedia/avidemux26/distinfo	(revision 387966)
+++ multimedia/avidemux26/distinfo	(working copy)
@@ -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
Index: multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-Makefile.patch
===================================================================
--- multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-Makefile.patch	(revision 387966)
+++ multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-Makefile.patch	(working copy)
@@ -3,12 +3,12 @@
 @@ -0,0 +1,11 @@
 +--- Makefile.orig
 ++++ Makefile
-+@@ -79,7 +79,7 @@
++@@ -92,7 +92,7 @@ define DOSUBDIR
 + $(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
-+ 
Index: multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch
===================================================================
--- multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch	(revision 387966)
+++ multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch	(working copy)
@@ -3,12 +3,12 @@
 @@ -0,0 +1,11 @@
 +--- configure.orig
 ++++ configure
-+@@ -4387,7 +4387,7 @@ ifndef MAIN_MAKEFILE
++@@ -5621,7 +5621,7 @@ ifndef MAIN_MAKEFILE
 + SRC_PATH:=\$(SRC_PATH:.%=..%)
 + endif
 + CC_IDENT=$cc_ident
 +-ARCH=$arch
 ++FFMPEG_ARCH=$arch
++ INTRINSICS=$intrinsics
 + CC=$cc
 + CXX=$cxx
-+ AS=$as
Index: multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-libavcodec-Makefile.patch
===================================================================
--- multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-libavcodec-Makefile.patch	(revision 0)
+++ multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-libavcodec-Makefile.patch	(working copy)
@@ -0,0 +1,14 @@
+--- /dev/null
++++ 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	2015-03-14 07:48:50.358320304 +0100
++@@ -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

Property changes on: multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-libavcodec-Makefile.patch
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: multimedia/avidemux26/pkg-plist
===================================================================
--- multimedia/avidemux26/pkg-plist	(revision 387966)
+++ multimedia/avidemux26/pkg-plist	(working copy)
@@ -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
@@ -29,10 +30,12 @@ include/avidemux/2.6/libavutil/avconfig.h
 include/avidemux/2.6/libavutil/attributes.h
 include/avidemux/2.6/libavutil/avutil.h
 include/avidemux/2.6/libavutil/bswap.h
+include/avidemux/2.6/libavutil/buffer.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/frame.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
@@ -47,6 +50,8 @@ include/avidemux/2.6/libavutil/samplefmt.h
 include/avidemux/2.6/libavutil/audioconvert.h
 include/avidemux/2.6/libavutil/rational.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
Index: multimedia/avidemux26-cli/Makefile
===================================================================
--- multimedia/avidemux26-cli/Makefile	(revision 387966)
+++ multimedia/avidemux26-cli/Makefile	(working copy)
@@ -9,7 +9,7 @@ PKGNAMESUFFIX=	-cli
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Simple GUI based video editor (cli)
 
-LIB_DEPENDS=	libADM6avutil.so.52:${PORTSDIR}/multimedia/avidemux26
+LIB_DEPENDS=	libADM6avutil.so.54:${PORTSDIR}/multimedia/avidemux26
 
 MASTERDIR=	${.CURDIR}/../avidemux26
 PLIST=		${.CURDIR}/pkg-plist
Index: multimedia/avidemux26-qt4/Makefile
===================================================================
--- multimedia/avidemux26-qt4/Makefile	(revision 387966)
+++ multimedia/avidemux26-qt4/Makefile	(working copy)
@@ -9,7 +9,7 @@ PKGNAMESUFFIX=	-qt4
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Simple GUI based video editor (QT4 UI)
 
-LIB_DEPENDS=	libADM6avutil.so.52:${PORTSDIR}/multimedia/avidemux26
+LIB_DEPENDS=	libADM6avutil.so.54:${PORTSDIR}/multimedia/avidemux26
 
 MASTERDIR=	${.CURDIR}/../avidemux26
 PLIST=		${.CURDIR}/pkg-plist
Index: multimedia/avidemux26-qt4/pkg-plist
===================================================================
--- multimedia/avidemux26-qt4/pkg-plist	(revision 387966)
+++ multimedia/avidemux26-qt4/pkg-plist	(working copy)
@@ -1,29 +1,29 @@
-bin/avidemux3_jobs
+bin/avidemux3_jobs_qt4
 bin/avidemux3_qt4
 include/avidemux/2.6/qt4/config.h
 lib/libADM_UIQT46.so
-lib/libADM_render6_qt4.so
-share/avidemux6/i18n/avidemux_ca.qm
-share/avidemux6/i18n/avidemux_cs.qm
-share/avidemux6/i18n/avidemux_de.qm
-share/avidemux6/i18n/avidemux_el.qm
-share/avidemux6/i18n/avidemux_en.qm
-share/avidemux6/i18n/avidemux_es.qm
-share/avidemux6/i18n/avidemux_eu.qm
-share/avidemux6/i18n/avidemux_fr.qm
-share/avidemux6/i18n/avidemux_it.qm
-share/avidemux6/i18n/avidemux_ja.qm
-share/avidemux6/i18n/avidemux_pl.qm
-share/avidemux6/i18n/avidemux_pt_BR.qm
-share/avidemux6/i18n/avidemux_ru.qm
-share/avidemux6/i18n/avidemux_sr.qm
-share/avidemux6/i18n/avidemux_sr@latin.qm
-share/avidemux6/i18n/avidemux_tr.qm
-share/avidemux6/i18n/avidemux_zh_TW.qm
-share/avidemux6/i18n/qt_ca.qm
-share/avidemux6/i18n/qt_cs.qm
-share/avidemux6/i18n/qt_de.qm
-share/avidemux6/i18n/qt_eu.qm
-share/avidemux6/i18n/qt_fr.qm
-share/avidemux6/i18n/qt_it.qm
-share/avidemux6/i18n/qt_zh_TW.qm
+lib/libADM_render6_QT4.so
+share/avidemux6/qt4/i18n/avidemux_ca.qm
+share/avidemux6/qt4/i18n/avidemux_cs.qm
+share/avidemux6/qt4/i18n/avidemux_de.qm
+share/avidemux6/qt4/i18n/avidemux_el.qm
+share/avidemux6/qt4/i18n/avidemux_en.qm
+share/avidemux6/qt4/i18n/avidemux_es.qm
+share/avidemux6/qt4/i18n/avidemux_eu.qm
+share/avidemux6/qt4/i18n/avidemux_fr.qm
+share/avidemux6/qt4/i18n/avidemux_it.qm
+share/avidemux6/qt4/i18n/avidemux_ja.qm
+share/avidemux6/qt4/i18n/avidemux_pl.qm
+share/avidemux6/qt4/i18n/avidemux_pt_BR.qm
+share/avidemux6/qt4/i18n/avidemux_ru.qm
+share/avidemux6/qt4/i18n/avidemux_sr.qm
+share/avidemux6/qt4/i18n/avidemux_sr@latin.qm
+share/avidemux6/qt4/i18n/avidemux_tr.qm
+share/avidemux6/qt4/i18n/avidemux_zh_TW.qm
+share/avidemux6/qt4/i18n/qt_ca.qm
+share/avidemux6/qt4/i18n/qt_cs.qm
+share/avidemux6/qt4/i18n/qt_de.qm
+share/avidemux6/qt4/i18n/qt_eu.qm
+share/avidemux6/qt4/i18n/qt_fr.qm
+share/avidemux6/qt4/i18n/qt_it.qm
+share/avidemux6/qt4/i18n/qt_zh_TW.qm
Index: multimedia/avidemux26-plugins/Makefile
===================================================================
--- multimedia/avidemux26-plugins/Makefile	(revision 387966)
+++ multimedia/avidemux26-plugins/Makefile	(working copy)
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	-plugins
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Simple GUI based video editor (Plugins)
 
-LIB_DEPENDS=	libADM6avutil.so.52:${PORTSDIR}/multimedia/avidemux26
+LIB_DEPENDS=	libADM6avutil.so.54:${PORTSDIR}/multimedia/avidemux26
 
 MASTERDIR=	${.CURDIR}/../avidemux26
 PLIST=		${.CURDIR}/pkg-plist