Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 1 Jun 2015 18:58:34 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r388254 - in head/multimedia: avidemux26 avidemux26-cli avidemux26-plugins avidemux26-qt4 avidemux26/files
Message-ID:  <201506011858.t51IwY2Q050079@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Mon Jun  1 18:58:34 2015
New Revision: 388254
URL: https://svnweb.freebsd.org/changeset/ports/388254

Log:
  Update to upstream version 2.6.9
  
  While on it:
  Pet portlint
  
  PR:		200507
  Reported by:	venture37@geeklan.co.uk

Added:
  head/multimedia/avidemux26/files/patch-avidemux__core_ADM__core_src_ADM__memsupport.cpp
     - copied, changed from r388198, head/multimedia/avidemux26/files/patch-avidemux_core_ADM_core_src_ADM_memsupport.cpp
  head/multimedia/avidemux26/files/patch-avidemux__core_ffmpeg__package_patches_config.mak.diff
     - copied, changed from r387964, head/multimedia/avidemux26/files/patch-config.mak.diff
  head/multimedia/avidemux26/files/patch-avidemux__plugins_CMakeLists.txt   (contents, props changed)
  head/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-libavcodec-Makefile.patch   (contents, props changed)
  head/multimedia/avidemux26/files/patch-cmake_admCheckMiscLibs.cmake
     - copied, changed from r387964, head/multimedia/avidemux26/files/patch-libexecinfo
Deleted:
  head/multimedia/avidemux26/files/patch-avidemux_core_ADM_core_src_ADM_memsupport.cpp
  head/multimedia/avidemux26/files/patch-config.mak.diff
  head/multimedia/avidemux26/files/patch-libexecinfo
Modified:
  head/multimedia/avidemux26-cli/Makefile
  head/multimedia/avidemux26-plugins/Makefile
  head/multimedia/avidemux26-plugins/pkg-plist
  head/multimedia/avidemux26-qt4/Makefile
  head/multimedia/avidemux26-qt4/pkg-plist
  head/multimedia/avidemux26/Makefile
  head/multimedia/avidemux26/Makefile.common
  head/multimedia/avidemux26/distinfo
  head/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-Makefile.patch
  head/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch
  head/multimedia/avidemux26/files/patch-po__CMakeLists.txt
  head/multimedia/avidemux26/pkg-plist

Modified: head/multimedia/avidemux26-cli/Makefile
==============================================================================
--- head/multimedia/avidemux26-cli/Makefile	Mon Jun  1 18:55:45 2015	(r388253)
+++ head/multimedia/avidemux26-cli/Makefile	Mon Jun  1 18:58:34 2015	(r388254)
@@ -2,14 +2,13 @@
 
 PORTNAME=	avidemux26
 PORTVERSION=	${AVIDEMUX2_VERSION}
-PORTREVISION=	3
 CATEGORIES=	multimedia
 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

Modified: head/multimedia/avidemux26-plugins/Makefile
==============================================================================
--- head/multimedia/avidemux26-plugins/Makefile	Mon Jun  1 18:55:45 2015	(r388253)
+++ head/multimedia/avidemux26-plugins/Makefile	Mon Jun  1 18:58:34 2015	(r388254)
@@ -3,14 +3,13 @@
 
 PORTNAME=	avidemux26
 PORTVERSION=	${AVIDEMUX2_VERSION}
-PORTREVISION=	3
 CATEGORIES=	multimedia
 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

Modified: head/multimedia/avidemux26-plugins/pkg-plist
==============================================================================
--- head/multimedia/avidemux26-plugins/pkg-plist	Mon Jun  1 18:55:45 2015	(r388253)
+++ head/multimedia/avidemux26-plugins/pkg-plist	Mon Jun  1 18:58:34 2015	(r388254)
@@ -96,360 +96,363 @@ lib/ADM_plugins6/autoScripts/lib/ADM_ima
 %%VORBIS%%lib/ADM_plugins6/audioEncoders/libADM_ae_vorbis.so
 %%AMRNB%%lib/ADM_plugins6/audioDecoder/libADM_ad_opencore_amrnb.so
 %%AMRWB%%lib/ADM_plugins6/audioDecoder/libADM_ad_opencore_amrwb.so
-%%QT4%%lib/ADM_plugins6/scriptEngines/libADM_script_qt.so
+%%QT4%%lib/ADM_plugins6/scriptEngines/qt4/libadm_script_QT4.so
 %%VDPAU%%lib/ADM_plugins6/videoFilters/libADM_vf_vdpauFilter.so
 %%VDPAU%%lib/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.so
-%%QT4%%%%X264%%lib/ADM_plugins6/videoEncoders/libADM_ve_x264_qt4.so
+%%QT4%%%%X264%%lib/ADM_plugins6/videoEncoders/qt4/libADM_ve_x264_QT4.so
+%%QT4%%%%X265%%lib/ADM_plugins6/videoEncoders/qt4/libADM_ve_x265_QT4.so
 %%CLI%%%%X264%%lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so
-%%CLI%%lib/ADM_plugins6/videoFilters/libADM_vf_CropCli.so
-%%CLI%%lib/ADM_plugins6/videoFilters/libADM_vf_chromaShiftCli.so
-%%CLI%%lib/ADM_plugins6/videoFilters/libADM_vf_contrastCli.so
-%%CLI%%lib/ADM_plugins6/videoFilters/libADM_vf_eq2Cli.so
-%%CLI%%lib/ADM_plugins6/videoFilters/libADM_vf_mpdelogoCli.so
-%%CLI%%lib/ADM_plugins6/videoFilters/libADM_vf_swscaleResize_cli.so
-%%QT4%%lib/ADM_plugins6/videoFilters/libADM_vf_HueQt4.so
-%%QT4%%lib/ADM_plugins6/videoFilters/libADM_vf_asharpQt4.so
-%%QT4%%lib/ADM_plugins6/videoFilters/libADM_vf_chromaShiftQt4.so
-%%QT4%%lib/ADM_plugins6/videoFilters/libADM_vf_contrastQt4.so
-%%QT4%%lib/ADM_plugins6/videoFilters/libADM_vf_cropQt4.so
-%%QT4%%lib/ADM_plugins6/videoFilters/libADM_vf_eq2Qt4.so
-%%QT4%%lib/ADM_plugins6/videoFilters/libADM_vf_mpdelogoQt4.so
-%%QT4%%lib/ADM_plugins6/videoFilters/libADM_vf_swscaleResize_qt4.so
-%%QT4%%lib/ADM_plugins6/videoFilters/libADM_vf_glBenchmark.so
-%%QT4%%lib/ADM_plugins6/videoFilters/libADM_vf_glResize.so
-%%QT4%%lib/ADM_plugins6/videoFilters/libADM_vf_rotateGlFrag2.so
-%%QT4%%lib/ADM_plugins6/videoFilters/libADM_vf_sampleGlFrag2.so
-%%QT4%%lib/ADM_plugins6/videoFilters/libADM_vf_sampleGlVertex.so
-%%QT4%%share/avidemux6/help/QtScript/Dialog.jpg
-%%QT4%%share/avidemux6/help/QtScript/_dialog_8admjs-example.html
-%%QT4%%share/avidemux6/help/QtScript/_transcode_directory_8admjs-example.html
-%%QT4%%share/avidemux6/help/QtScript/annotated.html
-%%QT4%%share/avidemux6/help/QtScript/avidemux_icon_small.png
-%%QT4%%share/avidemux6/help/QtScript/bc_s.png
-%%QT4%%share/avidemux6/help/QtScript/bdwn.png
-%%QT4%%share/avidemux6/help/QtScript/class_audio_encoder-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_audio_encoder.html
-%%QT4%%share/avidemux6/help/QtScript/class_audio_output-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_audio_output.html
-%%QT4%%share/avidemux6/help/QtScript/class_audio_output_collection-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_audio_output_collection.html
-%%QT4%%share/avidemux6/help/QtScript/class_audio_properties-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_audio_properties.html
-%%QT4%%share/avidemux6/help/QtScript/class_check_box_control-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_check_box_control.html
-%%QT4%%share/avidemux6/help/QtScript/class_check_box_control.png
-%%QT4%%share/avidemux6/help/QtScript/class_combo_box_control-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_combo_box_control.html
-%%QT4%%share/avidemux6/help/QtScript/class_combo_box_control.png
-%%QT4%%share/avidemux6/help/QtScript/class_combo_box_item-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_combo_box_item.html
-%%QT4%%share/avidemux6/help/QtScript/class_combo_box_item_collection-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_combo_box_item_collection.html
-%%QT4%%share/avidemux6/help/QtScript/class_control.html
-%%QT4%%share/avidemux6/help/QtScript/class_control.png
-%%QT4%%share/avidemux6/help/QtScript/class_control_collection-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_control_collection.html
-%%QT4%%share/avidemux6/help/QtScript/class_dialog-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_dialog.html
-%%QT4%%share/avidemux6/help/QtScript/class_directory-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_directory.html
-%%QT4%%share/avidemux6/help/QtScript/class_double_spin_box_control-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_double_spin_box_control.html
-%%QT4%%share/avidemux6/help/QtScript/class_double_spin_box_control.png
-%%QT4%%share/avidemux6/help/QtScript/class_editor-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_editor.html
-%%QT4%%share/avidemux6/help/QtScript/class_file-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_file.html
-%%QT4%%share/avidemux6/help/QtScript/class_file_information-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_file_information.html
-%%QT4%%share/avidemux6/help/QtScript/class_frame_properties-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_frame_properties.html
-%%QT4%%share/avidemux6/help/QtScript/class_line_edit_control-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_line_edit_control.html
-%%QT4%%share/avidemux6/help/QtScript/class_line_edit_control.png
-%%QT4%%share/avidemux6/help/QtScript/class_muxer-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_muxer.html
-%%QT4%%share/avidemux6/help/QtScript/class_segment-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_segment.html
-%%QT4%%share/avidemux6/help/QtScript/class_segment_collection-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_segment_collection.html
-%%QT4%%share/avidemux6/help/QtScript/class_slider_control-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_slider_control.html
-%%QT4%%share/avidemux6/help/QtScript/class_slider_control.png
-%%QT4%%share/avidemux6/help/QtScript/class_spin_box_control-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_spin_box_control.html
-%%QT4%%share/avidemux6/help/QtScript/class_spin_box_control.png
-%%QT4%%share/avidemux6/help/QtScript/class_video_decoder-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_video_decoder.html
-%%QT4%%share/avidemux6/help/QtScript/class_video_encoder-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_video_encoder.html
-%%QT4%%share/avidemux6/help/QtScript/class_video_file_properties-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_video_file_properties.html
-%%QT4%%share/avidemux6/help/QtScript/class_video_filter-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_video_filter.html
-%%QT4%%share/avidemux6/help/QtScript/class_video_filter_collection-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_video_filter_collection.html
-%%QT4%%share/avidemux6/help/QtScript/class_video_output-members.html
-%%QT4%%share/avidemux6/help/QtScript/class_video_output.html
-%%QT4%%share/avidemux6/help/QtScript/classes.html
-%%QT4%%share/avidemux6/help/QtScript/closed.png
-%%QT4%%share/avidemux6/help/QtScript/doxygen.css
-%%QT4%%share/avidemux6/help/QtScript/dynsections.js
-%%QT4%%share/avidemux6/help/QtScript/examples.html
-%%QT4%%share/avidemux6/help/QtScript/ftv2blank.png
-%%QT4%%share/avidemux6/help/QtScript/ftv2cl.png
-%%QT4%%share/avidemux6/help/QtScript/ftv2doc.png
-%%QT4%%share/avidemux6/help/QtScript/ftv2folderclosed.png
-%%QT4%%share/avidemux6/help/QtScript/ftv2folderopen.png
-%%QT4%%share/avidemux6/help/QtScript/ftv2lastnode.png
-%%QT4%%share/avidemux6/help/QtScript/ftv2link.png
-%%QT4%%share/avidemux6/help/QtScript/ftv2mlastnode.png
-%%QT4%%share/avidemux6/help/QtScript/ftv2mnode.png
-%%QT4%%share/avidemux6/help/QtScript/ftv2mo.png
-%%QT4%%share/avidemux6/help/QtScript/ftv2node.png
-%%QT4%%share/avidemux6/help/QtScript/ftv2ns.png
-%%QT4%%share/avidemux6/help/QtScript/ftv2plastnode.png
-%%QT4%%share/avidemux6/help/QtScript/ftv2pnode.png
-%%QT4%%share/avidemux6/help/QtScript/ftv2splitbar.png
-%%QT4%%share/avidemux6/help/QtScript/ftv2vertline.png
-%%QT4%%share/avidemux6/help/QtScript/functions.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x62.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x63.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x64.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x65.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x66.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x67.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x68.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x69.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x6a.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x6c.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x6d.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x6e.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x6f.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x70.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x71.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x72.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x73.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x74.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x75.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x76.html
-%%QT4%%share/avidemux6/help/QtScript/functions_0x77.html
-%%QT4%%share/avidemux6/help/QtScript/functions_enum.html
-%%QT4%%share/avidemux6/help/QtScript/functions_eval.html
-%%QT4%%share/avidemux6/help/QtScript/functions_func.html
-%%QT4%%share/avidemux6/help/QtScript/functions_prop.html
-%%QT4%%share/avidemux6/help/QtScript/group__global_functions.html
-%%QT4%%share/avidemux6/help/QtScript/hierarchy.html
-%%QT4%%share/avidemux6/help/QtScript/jquery.js
-%%QT4%%share/avidemux6/help/QtScript/modules.html
-%%QT4%%share/avidemux6/help/QtScript/nav_f.png
-%%QT4%%share/avidemux6/help/QtScript/nav_g.png
-%%QT4%%share/avidemux6/help/QtScript/nav_h.png
-%%QT4%%share/avidemux6/help/QtScript/open.png
-%%QT4%%share/avidemux6/help/QtScript/search/all_61.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_61.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_62.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_62.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_63.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_63.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_64.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_64.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_65.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_65.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_66.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_66.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_67.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_67.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_68.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_68.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_69.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_69.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_6a.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_6a.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_6c.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_6c.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_6d.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_6d.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_6e.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_6e.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_6f.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_6f.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_70.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_70.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_71.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_71.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_72.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_72.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_73.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_73.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_74.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_74.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_75.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_75.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_76.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_76.js
-%%QT4%%share/avidemux6/help/QtScript/search/all_77.html
-%%QT4%%share/avidemux6/help/QtScript/search/all_77.js
-%%QT4%%share/avidemux6/help/QtScript/search/classes_61.html
-%%QT4%%share/avidemux6/help/QtScript/search/classes_61.js
-%%QT4%%share/avidemux6/help/QtScript/search/classes_63.html
-%%QT4%%share/avidemux6/help/QtScript/search/classes_63.js
-%%QT4%%share/avidemux6/help/QtScript/search/classes_64.html
-%%QT4%%share/avidemux6/help/QtScript/search/classes_64.js
-%%QT4%%share/avidemux6/help/QtScript/search/classes_65.html
-%%QT4%%share/avidemux6/help/QtScript/search/classes_65.js
-%%QT4%%share/avidemux6/help/QtScript/search/classes_66.html
-%%QT4%%share/avidemux6/help/QtScript/search/classes_66.js
-%%QT4%%share/avidemux6/help/QtScript/search/classes_6c.html
-%%QT4%%share/avidemux6/help/QtScript/search/classes_6c.js
-%%QT4%%share/avidemux6/help/QtScript/search/classes_6d.html
-%%QT4%%share/avidemux6/help/QtScript/search/classes_6d.js
-%%QT4%%share/avidemux6/help/QtScript/search/classes_73.html
-%%QT4%%share/avidemux6/help/QtScript/search/classes_73.js
-%%QT4%%share/avidemux6/help/QtScript/search/classes_76.html
-%%QT4%%share/avidemux6/help/QtScript/search/classes_76.js
-%%QT4%%share/avidemux6/help/QtScript/search/close.png
-%%QT4%%share/avidemux6/help/QtScript/search/enums_61.html
-%%QT4%%share/avidemux6/help/QtScript/search/enums_61.js
-%%QT4%%share/avidemux6/help/QtScript/search/enums_63.html
-%%QT4%%share/avidemux6/help/QtScript/search/enums_63.js
-%%QT4%%share/avidemux6/help/QtScript/search/enums_66.html
-%%QT4%%share/avidemux6/help/QtScript/search/enums_66.js
-%%QT4%%share/avidemux6/help/QtScript/search/enums_67.html
-%%QT4%%share/avidemux6/help/QtScript/search/enums_67.js
-%%QT4%%share/avidemux6/help/QtScript/search/enums_69.html
-%%QT4%%share/avidemux6/help/QtScript/search/enums_69.js
-%%QT4%%share/avidemux6/help/QtScript/search/enums_6d.html
-%%QT4%%share/avidemux6/help/QtScript/search/enums_6d.js
-%%QT4%%share/avidemux6/help/QtScript/search/enums_6f.html
-%%QT4%%share/avidemux6/help/QtScript/search/enums_6f.js
-%%QT4%%share/avidemux6/help/QtScript/search/enums_70.html
-%%QT4%%share/avidemux6/help/QtScript/search/enums_70.js
-%%QT4%%share/avidemux6/help/QtScript/search/enums_73.html
-%%QT4%%share/avidemux6/help/QtScript/search/enums_73.js
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_61.html
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_61.js
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_62.html
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_62.js
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_63.html
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_63.js
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_64.html
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_64.js
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_65.html
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_65.js
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_66.html
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_66.js
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_68.html
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_68.js
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_69.html
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_69.js
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_6a.html
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_6a.js
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_6c.html
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_6c.js
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_6d.html
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_6d.js
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_6e.html
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_6e.js
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_6f.html
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_6f.js
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_70.html
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_70.js
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_72.html
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_72.js
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_73.html
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_73.js
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_74.html
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_74.js
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_75.html
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_75.js
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_77.html
-%%QT4%%share/avidemux6/help/QtScript/search/enumvalues_77.js
-%%QT4%%share/avidemux6/help/QtScript/search/functions_61.html
-%%QT4%%share/avidemux6/help/QtScript/search/functions_61.js
-%%QT4%%share/avidemux6/help/QtScript/search/functions_63.html
-%%QT4%%share/avidemux6/help/QtScript/search/functions_63.js
-%%QT4%%share/avidemux6/help/QtScript/search/functions_64.html
-%%QT4%%share/avidemux6/help/QtScript/search/functions_64.js
-%%QT4%%share/avidemux6/help/QtScript/search/functions_65.html
-%%QT4%%share/avidemux6/help/QtScript/search/functions_65.js
-%%QT4%%share/avidemux6/help/QtScript/search/functions_66.html
-%%QT4%%share/avidemux6/help/QtScript/search/functions_66.js
-%%QT4%%share/avidemux6/help/QtScript/search/functions_69.html
-%%QT4%%share/avidemux6/help/QtScript/search/functions_69.js
-%%QT4%%share/avidemux6/help/QtScript/search/functions_6c.html
-%%QT4%%share/avidemux6/help/QtScript/search/functions_6c.js
-%%QT4%%share/avidemux6/help/QtScript/search/functions_6d.html
-%%QT4%%share/avidemux6/help/QtScript/search/functions_6d.js
-%%QT4%%share/avidemux6/help/QtScript/search/functions_6f.html
-%%QT4%%share/avidemux6/help/QtScript/search/functions_6f.js
-%%QT4%%share/avidemux6/help/QtScript/search/functions_70.html
-%%QT4%%share/avidemux6/help/QtScript/search/functions_70.js
-%%QT4%%share/avidemux6/help/QtScript/search/functions_72.html
-%%QT4%%share/avidemux6/help/QtScript/search/functions_72.js
-%%QT4%%share/avidemux6/help/QtScript/search/functions_73.html
-%%QT4%%share/avidemux6/help/QtScript/search/functions_73.js
-%%QT4%%share/avidemux6/help/QtScript/search/functions_74.html
-%%QT4%%share/avidemux6/help/QtScript/search/functions_74.js
-%%QT4%%share/avidemux6/help/QtScript/search/functions_75.html
-%%QT4%%share/avidemux6/help/QtScript/search/functions_75.js
-%%QT4%%share/avidemux6/help/QtScript/search/functions_77.html
-%%QT4%%share/avidemux6/help/QtScript/search/functions_77.js
-%%QT4%%share/avidemux6/help/QtScript/search/groups_67.html
-%%QT4%%share/avidemux6/help/QtScript/search/groups_67.js
-%%QT4%%share/avidemux6/help/QtScript/search/mag_sel.png
-%%QT4%%share/avidemux6/help/QtScript/search/nomatches.html
-%%QT4%%share/avidemux6/help/QtScript/search/pages_61.html
-%%QT4%%share/avidemux6/help/QtScript/search/pages_61.js
-%%QT4%%share/avidemux6/help/QtScript/search/properties_61.html
-%%QT4%%share/avidemux6/help/QtScript/search/properties_61.js
-%%QT4%%share/avidemux6/help/QtScript/search/properties_62.html
-%%QT4%%share/avidemux6/help/QtScript/search/properties_62.js
-%%QT4%%share/avidemux6/help/QtScript/search/properties_63.html
-%%QT4%%share/avidemux6/help/QtScript/search/properties_63.js
-%%QT4%%share/avidemux6/help/QtScript/search/properties_64.html
-%%QT4%%share/avidemux6/help/QtScript/search/properties_64.js
-%%QT4%%share/avidemux6/help/QtScript/search/properties_65.html
-%%QT4%%share/avidemux6/help/QtScript/search/properties_65.js
-%%QT4%%share/avidemux6/help/QtScript/search/properties_66.html
-%%QT4%%share/avidemux6/help/QtScript/search/properties_66.js
-%%QT4%%share/avidemux6/help/QtScript/search/properties_67.html
-%%QT4%%share/avidemux6/help/QtScript/search/properties_67.js
-%%QT4%%share/avidemux6/help/QtScript/search/properties_68.html
-%%QT4%%share/avidemux6/help/QtScript/search/properties_68.js
-%%QT4%%share/avidemux6/help/QtScript/search/properties_69.html
-%%QT4%%share/avidemux6/help/QtScript/search/properties_69.js
-%%QT4%%share/avidemux6/help/QtScript/search/properties_6c.html
-%%QT4%%share/avidemux6/help/QtScript/search/properties_6c.js
-%%QT4%%share/avidemux6/help/QtScript/search/properties_6d.html
-%%QT4%%share/avidemux6/help/QtScript/search/properties_6d.js
-%%QT4%%share/avidemux6/help/QtScript/search/properties_6e.html
-%%QT4%%share/avidemux6/help/QtScript/search/properties_6e.js
-%%QT4%%share/avidemux6/help/QtScript/search/properties_6f.html
-%%QT4%%share/avidemux6/help/QtScript/search/properties_6f.js
-%%QT4%%share/avidemux6/help/QtScript/search/properties_70.html
-%%QT4%%share/avidemux6/help/QtScript/search/properties_70.js
-%%QT4%%share/avidemux6/help/QtScript/search/properties_71.html
-%%QT4%%share/avidemux6/help/QtScript/search/properties_71.js
-%%QT4%%share/avidemux6/help/QtScript/search/properties_72.html
-%%QT4%%share/avidemux6/help/QtScript/search/properties_72.js
-%%QT4%%share/avidemux6/help/QtScript/search/properties_73.html
-%%QT4%%share/avidemux6/help/QtScript/search/properties_73.js
-%%QT4%%share/avidemux6/help/QtScript/search/properties_74.html
-%%QT4%%share/avidemux6/help/QtScript/search/properties_74.js
-%%QT4%%share/avidemux6/help/QtScript/search/properties_76.html
-%%QT4%%share/avidemux6/help/QtScript/search/properties_76.js
-%%QT4%%share/avidemux6/help/QtScript/search/properties_77.html
-%%QT4%%share/avidemux6/help/QtScript/search/properties_77.js
-%%QT4%%share/avidemux6/help/QtScript/search/search.css
-%%QT4%%share/avidemux6/help/QtScript/search/search.js
-%%QT4%%share/avidemux6/help/QtScript/search/search_l.png
-%%QT4%%share/avidemux6/help/QtScript/search/search_m.png
-%%QT4%%share/avidemux6/help/QtScript/search/search_r.png
-%%QT4%%share/avidemux6/help/QtScript/sync_off.png
-%%QT4%%share/avidemux6/help/QtScript/sync_on.png
-%%QT4%%share/avidemux6/help/QtScript/tab_a.png
-%%QT4%%share/avidemux6/help/QtScript/tab_b.png
-%%QT4%%share/avidemux6/help/QtScript/tab_h.png
-%%QT4%%share/avidemux6/help/QtScript/tab_s.png
-%%QT4%%share/avidemux6/help/QtScript/tabs.css
+%%CLI%%%%X265%%lib/ADM_plugins6/videoEncoders/libADM_ve_x265_other.so
+%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_CropCli.so
+%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_HueCli.so
+%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_chromaShiftCli.so
+%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_contrastCli.so
+%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_eq2Cli.so
+%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_mpdelogoCli.so
+%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_swscaleResize_cli.so
+%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_HueQT4.so
+%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_asharpQT4.so
+%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_chromaShiftQT4.so
+%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_contrastQT4.so
+%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_cropQT4.so
+%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_eq2QT4.so
+%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_mpdelogoQT4.so
+%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_swscaleResizeQT4.so
+%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_glBenchmark.so
+%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_glResize.so
+%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_rotateGlFrag2.so
+%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_sampleGlFrag2.so
+%%QT4%%lib/ADM_plugins6/videoFilters/qt4/libADM_vf_sampleGlVertex.so
+%%QT4%%share/avidemux6/help/QtScriptQT4/Dialog.jpg
+%%QT4%%share/avidemux6/help/QtScriptQT4/_dialog_8admjs-example.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/_transcode_directory_8admjs-example.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/annotated.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/avidemux_icon_small.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/bc_s.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/bdwn.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_encoder-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_encoder.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_output-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_output.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_output_collection-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_output_collection.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_properties-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_audio_properties.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_check_box_control-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_check_box_control.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_check_box_control.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_control-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_control.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_control.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_item-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_item.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_item_collection-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_combo_box_item_collection.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_control.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_control.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_control_collection-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_control_collection.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_dialog-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_dialog.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_directory-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_directory.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_double_spin_box_control-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_double_spin_box_control.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_double_spin_box_control.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_editor-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_editor.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_file-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_file.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_file_information-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_file_information.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_frame_properties-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_frame_properties.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_line_edit_control-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_line_edit_control.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_line_edit_control.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_muxer-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_muxer.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_segment-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_segment.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_segment_collection-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_segment_collection.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_slider_control-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_slider_control.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_slider_control.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_spin_box_control-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_spin_box_control.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_spin_box_control.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_decoder-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_decoder.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_encoder-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_encoder.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_file_properties-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_file_properties.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_filter-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_filter.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_filter_collection-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_filter_collection.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_output-members.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/class_video_output.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/classes.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/closed.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/doxygen.css
+%%QT4%%share/avidemux6/help/QtScriptQT4/dynsections.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/examples.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2blank.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2cl.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2doc.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2folderclosed.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2folderopen.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2lastnode.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2link.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2mlastnode.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2mnode.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2mo.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2node.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2ns.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2plastnode.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2pnode.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2splitbar.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/ftv2vertline.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x62.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x63.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x64.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x65.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x66.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x67.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x68.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x69.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x6a.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x6c.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x6d.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x6e.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x6f.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x70.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x71.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x72.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x73.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x74.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x75.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x76.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_0x77.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_enum.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_eval.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_func.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/functions_prop.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/group__global_functions.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/hierarchy.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/jquery.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/modules.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/nav_f.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/nav_g.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/nav_h.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/open.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_61.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_61.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_62.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_62.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_63.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_63.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_64.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_64.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_65.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_65.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_66.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_66.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_67.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_67.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_68.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_68.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_69.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_69.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6a.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6a.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6c.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6c.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6d.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6d.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6e.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6e.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6f.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_6f.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_70.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_70.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_71.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_71.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_72.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_72.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_73.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_73.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_74.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_74.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_75.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_75.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_76.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_76.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_77.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/all_77.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_61.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_61.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_63.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_63.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_64.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_64.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_65.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_65.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_66.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_66.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_6c.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_6c.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_6d.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_6d.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_73.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_73.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_76.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/classes_76.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/close.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_61.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_61.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_63.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_63.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_66.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_66.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_67.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_67.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_69.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_69.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_6d.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_6d.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_6f.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_6f.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_70.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_70.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_73.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enums_73.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_61.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_61.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_62.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_62.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_63.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_63.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_64.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_64.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_65.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_65.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_66.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_66.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_68.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_68.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_69.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_69.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6a.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6a.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6c.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6c.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6d.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6d.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6e.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6e.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6f.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_6f.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_70.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_70.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_72.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_72.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_73.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_73.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_74.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_74.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_75.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_75.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_77.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/enumvalues_77.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_61.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_61.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_63.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_63.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_64.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_64.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_65.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_65.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_66.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_66.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_69.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_69.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_6c.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_6c.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_6d.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_6d.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_6f.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_6f.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_70.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_70.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_72.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_72.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_73.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_73.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_74.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_74.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_75.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_75.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_77.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/functions_77.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/groups_67.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/groups_67.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/mag_sel.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/nomatches.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/pages_61.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/pages_61.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_61.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_61.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_62.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_62.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_63.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_63.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_64.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_64.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_65.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_65.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_66.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_66.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_67.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_67.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_68.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_68.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_69.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_69.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6c.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6c.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6d.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6d.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6e.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6e.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6f.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_6f.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_70.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_70.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_71.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_71.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_72.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_72.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_73.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_73.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_74.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_74.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_76.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_76.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_77.html
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/properties_77.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/search.css
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/search.js
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/search_l.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/search_m.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/search/search_r.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/sync_off.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/sync_on.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/tab_a.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/tab_b.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/tab_h.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/tab_s.png
+%%QT4%%share/avidemux6/help/QtScriptQT4/tabs.css

Modified: head/multimedia/avidemux26-qt4/Makefile
==============================================================================
--- head/multimedia/avidemux26-qt4/Makefile	Mon Jun  1 18:55:45 2015	(r388253)
+++ head/multimedia/avidemux26-qt4/Makefile	Mon Jun  1 18:58:34 2015	(r388254)
@@ -2,14 +2,13 @@
 
 PORTNAME=	avidemux26
 PORTVERSION=	${AVIDEMUX2_VERSION}
-PORTREVISION=	3
 CATEGORIES=	multimedia
 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

Modified: head/multimedia/avidemux26-qt4/pkg-plist
==============================================================================
--- head/multimedia/avidemux26-qt4/pkg-plist	Mon Jun  1 18:55:45 2015	(r388253)
+++ head/multimedia/avidemux26-qt4/pkg-plist	Mon Jun  1 18:58:34 2015	(r388254)
@@ -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

Modified: head/multimedia/avidemux26/Makefile
==============================================================================
--- head/multimedia/avidemux26/Makefile	Mon Jun  1 18:55:45 2015	(r388253)
+++ head/multimedia/avidemux26/Makefile	Mon Jun  1 18:58:34 2015	(r388254)
@@ -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}.
 PLIST_FILES+=	${DESKTOPDIR}/${PORTNAME}_qt4.desktop
 .endif
 
-
 CMAKE_SOURCE_PATH=	${WRKSRC}/avidemux_core
 
 post-configure: post-configure-common

Modified: head/multimedia/avidemux26/Makefile.common
==============================================================================
--- head/multimedia/avidemux26/Makefile.common	Mon Jun  1 18:55:45 2015	(r388253)
+++ head/multimedia/avidemux26/Makefile.common	Mon Jun  1 18:58:34 2015	(r388254)
@@ -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 g
 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}/bi
 
 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

Modified: head/multimedia/avidemux26/distinfo
==============================================================================
--- head/multimedia/avidemux26/distinfo	Mon Jun  1 18:55:45 2015	(r388253)
+++ head/multimedia/avidemux26/distinfo	Mon Jun  1 18:58:34 2015	(r388254)
@@ -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

Copied and modified: head/multimedia/avidemux26/files/patch-avidemux__core_ADM__core_src_ADM__memsupport.cpp (from r388198, head/multimedia/avidemux26/files/patch-avidemux_core_ADM_core_src_ADM_memsupport.cpp)
==============================================================================
--- head/multimedia/avidemux26/files/patch-avidemux_core_ADM_core_src_ADM_memsupport.cpp	Mon Jun  1 01:47:57 2015	(r388198, copy source)
+++ head/multimedia/avidemux26/files/patch-avidemux__core_ADM__core_src_ADM__memsupport.cpp	Mon Jun  1 18:58:34 2015	(r388254)
@@ -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.                                   *

Copied and modified: head/multimedia/avidemux26/files/patch-avidemux__core_ffmpeg__package_patches_config.mak.diff (from r387964, head/multimedia/avidemux26/files/patch-config.mak.diff)
==============================================================================
--- head/multimedia/avidemux26/files/patch-config.mak.diff	Sat May 30 13:14:26 2015	(r387964, copy source)
+++ head/multimedia/avidemux26/files/patch-avidemux__core_ffmpeg__package_patches_config.mak.diff	Mon Jun  1 18:58:34 2015	(r388254)
@@ -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

Added: head/multimedia/avidemux26/files/patch-avidemux__plugins_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/avidemux26/files/patch-avidemux__plugins_CMakeLists.txt	Mon Jun  1 18:58:34 2015	(r388254)
@@ -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)

Modified: head/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-Makefile.patch
==============================================================================
--- head/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-Makefile.patch	Mon Jun  1 18:55:45 2015	(r388253)
+++ head/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-Makefile.patch	Mon Jun  1 18:58:34 2015	(r388254)
@@ -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
-+ 

Modified: head/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch
==============================================================================
--- head/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch	Mon Jun  1 18:55:45 2015	(r388253)
+++ head/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch	Mon Jun  1 18:58:34 2015	(r388254)
@@ -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 @@

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506011858.t51IwY2Q050079>