Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 1 Apr 2014 17:27:31 +0000 (UTC)
From:      Juergen Lock <nox@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r349863 - in head/multimedia: . avidemux2 avidemux26 avidemux26-cli avidemux26-plugins avidemux26-qt4 avidemux26/files
Message-ID:  <201404011727.s31HRVpe090572@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nox
Date: Tue Apr  1 17:27:31 2014
New Revision: 349863
URL: http://svnweb.freebsd.org/changeset/ports/349863
QAT: https://qat.redports.org/buildarchive/r349863/

Log:
  - Finally import avidemux 2.6.8 as new ports multimedia/avidemux26*,
    repocopied from the 2.5.6 ports multimedia/avidemux2 (left in
    the tree for now for people that want a gtk ui etc.)
  - Set CONFLICTS as only one avidemux version can be installed at a time.
  - Don't import the 2.6.8 gtk ui as it crashes at startup and apparently
    is abandoned upstream.  (In the unlikely case that someone wants to fix
    it, it is available at my redports tree.)
  - As with the old version start by installing multimedia/avidemux26-plugins,
    it is needed and depends on the other ports.
  - (portlint is still not happy but I guess it cannot know everything...)
  
  Submitted by:	frogs <4721@hushmail.com> (initial port)

Added:
  head/multimedia/avidemux26/
     - copied from r349650, head/multimedia/avidemux2/
  head/multimedia/avidemux26-cli/
  head/multimedia/avidemux26-cli/Makefile   (contents, props changed)
  head/multimedia/avidemux26-cli/pkg-plist   (contents, props changed)
  head/multimedia/avidemux26-plugins/
     - copied from r349650, head/multimedia/avidemux2-plugins/
  head/multimedia/avidemux26-qt4/
  head/multimedia/avidemux26-qt4/Makefile   (contents, props changed)
  head/multimedia/avidemux26-qt4/pkg-plist   (contents, props changed)
  head/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-Makefile.patch   (contents, props changed)
  head/multimedia/avidemux26/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch   (contents, props changed)
  head/multimedia/avidemux26/files/patch-avidemux_core_ADM_core_src_ADM_memsupport.cpp   (contents, props changed)
  head/multimedia/avidemux26/files/patch-config.mak.diff   (contents, props changed)
  head/multimedia/avidemux26/files/patch-libexecinfo   (contents, props changed)
Deleted:
  head/multimedia/avidemux26/files/execinfo.cpp
  head/multimedia/avidemux26/files/ffmpeg-configure.patch
  head/multimedia/avidemux26/files/ffmpeg-libavcodec-Makefile.patch
  head/multimedia/avidemux26/files/ffmpeg-libavutil-common.h.patch
  head/multimedia/avidemux26/files/patch-CMakeLists.txt
  head/multimedia/avidemux26/files/patch-avidemux-CMakeLists.txt
  head/multimedia/avidemux26/files/patch-cmake-admCheckMiscLibs.cmake
  head/multimedia/avidemux26/files/patch-cmake-admFFmpegBuild.cmake
  head/multimedia/avidemux26/files/patch-x264_x264Options.cpp
Modified:
  head/multimedia/Makefile
  head/multimedia/avidemux2/Makefile.common
  head/multimedia/avidemux26-plugins/Makefile
  head/multimedia/avidemux26-plugins/pkg-plist
  head/multimedia/avidemux26/Makefile
  head/multimedia/avidemux26/Makefile.common
  head/multimedia/avidemux26/distinfo
  head/multimedia/avidemux26/files/patch-po__CMakeLists.txt   (contents, props changed)
  head/multimedia/avidemux26/pkg-plist

Modified: head/multimedia/Makefile
==============================================================================
--- head/multimedia/Makefile	Tue Apr  1 17:23:56 2014	(r349862)
+++ head/multimedia/Makefile	Tue Apr  1 17:27:31 2014	(r349863)
@@ -18,6 +18,11 @@
     SUBDIR += avbin
     SUBDIR += avidemux2
     SUBDIR += avidemux2-plugins
+    SUBDIR += avidemux26
+    SUBDIR += avidemux26-cli
+    SUBDIR += avidemux26-gtk
+    SUBDIR += avidemux26-plugins
+    SUBDIR += avidemux26-qt4
     SUBDIR += avinfo
     SUBDIR += bangarang
     SUBDIR += banshee

Modified: head/multimedia/avidemux2/Makefile.common
==============================================================================
--- head/multimedia/avidemux2/Makefile.common	Tue Apr  1 17:23:56 2014	(r349862)
+++ head/multimedia/avidemux2/Makefile.common	Tue Apr  1 17:27:31 2014	(r349863)
@@ -17,7 +17,7 @@ LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audi
 
 LICENSE=	GPLv2
 
-CONFLICTS=	avidemux2-2.[0-46-9].*
+CONFLICTS=	avidemux2-2.[0-46-9].* avidemux26-*
 
 USE_GNOME=	libxml2
 USE_QT4=	# empty

Added: head/multimedia/avidemux26-cli/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/avidemux26-cli/Makefile	Tue Apr  1 17:27:31 2014	(r349863)
@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+PORTNAME=	avidemux26
+PORTVERSION=	${AVIDEMUX2_VERSION}
+PORTREVISION=	0
+CATEGORIES=	multimedia
+PKGNAMESUFFIX=	-cli
+
+MAINTAINER=	multimedia@FreeBSD.org
+COMMENT=	Simple GUI based video editor (cli)
+
+LIB_DEPENDS=	libADM6avutil.so.52:${PORTSDIR}/multimedia/avidemux26
+
+MASTERDIR=	${.CURDIR}/../avidemux26
+PLIST=		${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile.common"
+
+CMAKE_SOURCE_PATH=	${WRKSRC}/avidemux/cli
+
+CMAKE_ARGS+=	-DAVIDEMUX_SOURCE_DIR=${WRKSRC} -DAVIDEMUX_INSTALL_PREFIX:PATH="${PREFIX}"
+
+post-configure: post-configure-common
+
+.include <bsd.port.post.mk>

Added: head/multimedia/avidemux26-cli/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/avidemux26-cli/pkg-plist	Tue Apr  1 17:27:31 2014	(r349863)
@@ -0,0 +1,5 @@
+bin/avidemux3_cli
+include/avidemux/2.6/cli/config.h
+lib/libADM_UI_Cli6.so
+lib/libADM_render6_cli.so
+@dirrm include/avidemux/2.6/cli

Modified: head/multimedia/avidemux26-plugins/Makefile
==============================================================================
--- head/multimedia/avidemux2-plugins/Makefile	Sun Mar 30 17:38:21 2014	(r349650)
+++ head/multimedia/avidemux26-plugins/Makefile	Tue Apr  1 17:27:31 2014	(r349863)
@@ -1,34 +1,43 @@
 # Created by: Anish Mistry (with help from mean)
 # $FreeBSD$
 
-PORTNAME=	avidemux2
+PORTNAME=	avidemux26
 PORTVERSION=	${AVIDEMUX2_VERSION}
-PORTREVISION=	6
+PORTREVISION=	0
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-plugins
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Simple GUI based video editor (Plugins)
 
-BUILD_DEPENDS=	avidemux2_cli:${PORTSDIR}/multimedia/avidemux2
-RUN_DEPENDS=	avidemux2_cli:${PORTSDIR}/multimedia/avidemux2
+LIB_DEPENDS=	libADM6avutil.so.52:${PORTSDIR}/multimedia/avidemux26
 
-MASTERDIR=	${.CURDIR}/../avidemux2
+MASTERDIR=	${.CURDIR}/../avidemux26
 PLIST=		${.CURDIR}/pkg-plist
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile.common"
 
-CMAKE_ARGS+=	-DAVIDEMUX_SOURCE_DIR=${WRKSRC} -DAVIDEMUX_INSTALL_PREFIX:PATH="${PREFIX}" -DAVIDEMUX_CORECONFIG_DIR=${CONFIGURE_WRKSRC}/config
+CMAKE_SOURCE_PATH=	${WRKSRC}/avidemux_plugins
 
-post-configure: post-configure-common
-	@${MKDIR} ${WRKDIR}/.build-plugins
-	@cd ${WRKDIR}/.build-plugins && ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${WRKSRC}/plugins
-
-do-build:
-	@cd ${WRKDIR}/.build-plugins && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
+#CMAKE_ARGS+=	-DAVIDEMUX_SOURCE_DIR=${WRKSRC} -DAVIDEMUX_INSTALL_PREFIX:PATH="${PREFIX}" -DAVIDEMUX_CORECONFIG_DIR=${CONFIGURE_WRKSRC}/config
+CMAKE_ARGS+=	-DAVIDEMUX_SOURCE_DIR=${WRKSRC} -DAVIDEMUX_INSTALL_PREFIX:PATH="${PREFIX}"
+CMAKE_ARGS+=	-DPLUGIN_UI=ALL
+
+.if ${PORT_OPTIONS:MCLI}
+BUILD_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/cli/config.h:${PORTSDIR}/multimedia/avidemux26-cli
+RUN_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/cli/config.h:${PORTSDIR}/multimedia/avidemux26-cli
+.endif
+
+.if ${PORT_OPTIONS:MQT4}
+BUILD_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/qt4/config.h:${PORTSDIR}/multimedia/avidemux26-qt4
+RUN_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/qt4/config.h:${PORTSDIR}/multimedia/avidemux26-qt4
+.endif
+
+.if ${PORT_OPTIONS:MGTK3}
+BUILD_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/gtk/config.h:${PORTSDIR}/multimedia/avidemux26-gtk
+RUN_DEPENDS+=	${LOCALBASE}/include/avidemux/2.6/gtk/config.h:${PORTSDIR}/multimedia/avidemux26-gtk
+.endif
 
-do-install:
-	@(cd ${WRKDIR}/.build-plugins && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+post-configure: post-configure-common
 
 .include <bsd.port.post.mk>

Modified: head/multimedia/avidemux26-plugins/pkg-plist
==============================================================================
--- head/multimedia/avidemux2-plugins/pkg-plist	Sun Mar 30 17:38:21 2014	(r349650)
+++ head/multimedia/avidemux26-plugins/pkg-plist	Tue Apr  1 17:27:31 2014	(r349863)
@@ -1,157 +1,471 @@
-lib/ADM_plugins/audioDecoder/libADM_ad_Mad.so
-lib/ADM_plugins/audioDecoder/libADM_ad_a52.so
-%%VORBIS%%lib/ADM_plugins/audioDecoder/libADM_ad_vorbis.so
-lib/ADM_plugins/audioDevices/libADM_av_oss.so
-%%LAME%%lib/ADM_plugins/audioEncoders/libADM_ae_lame.so
-lib/ADM_plugins/audioEncoders/libADM_ae_lav_ac3.so
-lib/ADM_plugins/audioEncoders/libADM_ae_lav_mp2.so
-lib/ADM_plugins/audioEncoders/libADM_ae_pcm.so
-lib/ADM_plugins/audioEncoders/libADM_ae_twolame.so
-lib/ADM_plugins/videoEncoder/avcodec/Flv1Param.xsd
-lib/ADM_plugins/videoEncoder/avcodec/H263Param.xsd
-lib/ADM_plugins/videoEncoder/avcodec/MjpegParam.xsd
-lib/ADM_plugins/videoEncoder/avcodec/Mpeg1Param.xsd
-lib/ADM_plugins/videoEncoder/avcodec/Mpeg2Param.xsd
-lib/ADM_plugins/videoEncoder/avcodec/Mpeg4aspParam.xsd
-lib/ADM_plugins/videoEncoder/avcodec/mpeg-1/Video CD.xml
-lib/ADM_plugins/videoEncoder/avcodec/mpeg-2/DVD.xml
-lib/ADM_plugins/videoEncoder/avcodec/mpeg-2/Super Video CD.xml
-lib/ADM_plugins/videoEncoder/libADM_vidEnc_avcodec.so
-lib/ADM_plugins/videoEncoder/libADM_vidEnc_mpeg2enc.so
-lib/ADM_plugins/videoEncoder/mpeg2enc/Mpeg1Param.xsd
-lib/ADM_plugins/videoEncoder/mpeg2enc/Mpeg2Param.xsd
-lib/ADM_plugins/videoEncoder/mpeg2enc/mpeg-1/Video CD.xml
-lib/ADM_plugins/videoEncoder/mpeg2enc/mpeg-2/DVD.xml
-lib/ADM_plugins/videoEncoder/mpeg2enc/mpeg-2/Super Video CD.xml
-lib/ADM_plugins/videoFilter/libADM_vf_Deinterlace.so
-lib/ADM_plugins/videoFilter/libADM_vf_Delta.so
-lib/ADM_plugins/videoFilter/libADM_vf_Denoise.so
-lib/ADM_plugins/videoFilter/libADM_vf_FluxSmooth.so
-lib/ADM_plugins/videoFilter/libADM_vf_Hue_cli.so
-lib/ADM_plugins/videoFilter/libADM_vf_Mosaic.so
-lib/ADM_plugins/videoFilter/libADM_vf_Pulldown.so
-lib/ADM_plugins/videoFilter/libADM_vf_Stabilize.so
-lib/ADM_plugins/videoFilter/libADM_vf_Tisophote.so
-lib/ADM_plugins/videoFilter/libADM_vf_Whirl.so
-lib/ADM_plugins/videoFilter/libADM_vf_addborders.so
-lib/ADM_plugins/videoFilter/libADM_vf_asharp_cli.so
-lib/ADM_plugins/videoFilter/libADM_vf_avisynthResize_cli.so
-lib/ADM_plugins/videoFilter/libADM_vf_avsfilter.so
-lib/ADM_plugins/videoFilter/libADM_vf_blackenBorders.so
-lib/ADM_plugins/videoFilter/libADM_vf_blendDgBob.so
-lib/ADM_plugins/videoFilter/libADM_vf_blendRemoval.so
-lib/ADM_plugins/videoFilter/libADM_vf_chromashift_cli.so
-lib/ADM_plugins/videoFilter/libADM_vf_cnr2_cli.so
-lib/ADM_plugins/videoFilter/libADM_vf_colorYUV_cli.so
-lib/ADM_plugins/videoFilter/libADM_vf_contrast_cli.so
-lib/ADM_plugins/videoFilter/libADM_vf_crop_cli.so
-lib/ADM_plugins/videoFilter/libADM_vf_decimate.so
-lib/ADM_plugins/videoFilter/libADM_vf_denoise3d.so
-lib/ADM_plugins/videoFilter/libADM_vf_denoise3dhq.so
-lib/ADM_plugins/videoFilter/libADM_vf_dropOut.so
-lib/ADM_plugins/videoFilter/libADM_vf_eq2_cli.so
-lib/ADM_plugins/videoFilter/libADM_vf_equalizer_cli.so
-lib/ADM_plugins/videoFilter/libADM_vf_fade.so
-lib/ADM_plugins/videoFilter/libADM_vf_fastconvolutiongauss.so
-lib/ADM_plugins/videoFilter/libADM_vf_fastconvolutionmean.so
-lib/ADM_plugins/videoFilter/libADM_vf_fastconvolutionmedian.so
-lib/ADM_plugins/videoFilter/libADM_vf_fastconvolutionsharpen.so
-lib/ADM_plugins/videoFilter/libADM_vf_forcedPP.so
-lib/ADM_plugins/videoFilter/libADM_vf_hzStackField.so
-lib/ADM_plugins/videoFilter/libADM_vf_keepEvenField.so
-lib/ADM_plugins/videoFilter/libADM_vf_keepOddField.so
-lib/ADM_plugins/videoFilter/libADM_vf_kernelDeint.so
-lib/ADM_plugins/videoFilter/libADM_vf_largemedian.so
-lib/ADM_plugins/videoFilter/libADM_vf_lavDeinterlace.so
-lib/ADM_plugins/videoFilter/libADM_vf_logo.so
-lib/ADM_plugins/videoFilter/libADM_vf_lumaonly.so
-lib/ADM_plugins/videoFilter/libADM_vf_mSharpen.so
-lib/ADM_plugins/videoFilter/libADM_vf_mSmooth.so
-lib/ADM_plugins/videoFilter/libADM_vf_mcdeint.so
-lib/ADM_plugins/videoFilter/libADM_vf_mergeField.so
-lib/ADM_plugins/videoFilter/libADM_vf_mpdelogo_cli.so
-lib/ADM_plugins/videoFilter/libADM_vf_mplayerResize_cli.so
-lib/ADM_plugins/videoFilter/libADM_vf_palShift.so
-lib/ADM_plugins/videoFilter/libADM_vf_resampleFps.so
-lib/ADM_plugins/videoFilter/libADM_vf_reverse.so
-lib/ADM_plugins/videoFilter/libADM_vf_rotate.so
-lib/ADM_plugins/videoFilter/libADM_vf_separateField.so
-lib/ADM_plugins/videoFilter/libADM_vf_smartPalShift.so
-lib/ADM_plugins/videoFilter/libADM_vf_smartSwapField.so
-lib/ADM_plugins/videoFilter/libADM_vf_soften.so
-lib/ADM_plugins/videoFilter/libADM_vf_stackField.so
-lib/ADM_plugins/videoFilter/libADM_vf_swapField.so
-lib/ADM_plugins/videoFilter/libADM_vf_swapuv.so
-lib/ADM_plugins/videoFilter/libADM_vf_tdeint.so
-lib/ADM_plugins/videoFilter/libADM_vf_telecide.so
-lib/ADM_plugins/videoFilter/libADM_vf_unstackField.so
-lib/ADM_plugins/videoFilter/libADM_vf_vflip.so
-lib/ADM_plugins/videoFilter/libADM_vf_vlad.so
-lib/ADM_plugins/videoFilter/libADM_vf_yadif.so
-lib/ADM_plugins/videoFilter/libADM_vidChromaU.so
-lib/ADM_plugins/videoFilter/libADM_vidChromaV.so
-%%AMRNB%%lib/ADM_plugins/audioDecoder/libADM_ad_opencore_amrnb.so
-%%AMRWB%%lib/ADM_plugins/audioDecoder/libADM_ad_opencore_amrwb.so
-%%ESD%%lib/ADM_plugins/audioDevices/libADM_av_esd.so
-%%FAAC%%lib/ADM_plugins/audioEncoders/libADM_ae_faac.so
-%%FAAD%%lib/ADM_plugins/audioDecoder/libADM_ad_faad.so
-%%FREETYPE%%lib/ADM_plugins/videoFilter/libADM_vf_ssa.so
-%%FREETYPE%%lib/ADM_plugins/videoFilter/libADM_vf_sub_cli.so
-%%GTK%%%%FREETYPE%%lib/ADM_plugins/videoFilter/libADM_vf_sub_gtk.so
-%%GTK%%%%X264%%lib/ADM_plugins/videoEncoder/x264/libADM_vidEnc_x264_Gtk.so
-%%GTK%%%%XVID%%lib/ADM_plugins/videoEncoder/xvid/libADM_vidEnc_Xvid_Gtk.so
-%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_Crop_gtk.so
-%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_asharp_gtk.so
-%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_avisynthResize_gtk.so
-%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_chromaShift_gtk.so
-%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_cnr2_gtk.so
-%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_colorYUV_gtk.so
-%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_contrast_gtk.so
-%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_eq2_gtk.so
-%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_equalizer_gtk.so
-%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_hue_gtk.so
-%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_mpdelogo_gtk.so
-%%GTK%%lib/ADM_plugins/videoFilter/libADM_vf_mplayerResize_gtk.so
-%%JACK%%lib/ADM_plugins/audioDevices/libADM_av_jack.so
-%%PULSE%%lib/ADM_plugins/audioDevices/libADM_av_pulseAudioSimple.so
-%%QT4%%%%FREETYPE%%lib/ADM_plugins/videoFilter/libADM_vf_sub_qt4.so
-%%QT4%%%%X264%%lib/ADM_plugins/videoEncoder/x264/libADM_vidEnc_x264_Qt.so
-%%QT4%%%%XVID%%lib/ADM_plugins/videoEncoder/xvid/libADM_vidEnc_Xvid_Qt.so
-%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_asharp_qt4.so
-%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_avisynthResize_qt4.so
-%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_chromaShift_qt4.so
-%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_cnr2_qt4.so
-%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_colorYUV_qt4.so
-%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_contrast_qt4.so
-%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_crop_qt4.so
-%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_curveEditor_qt4.so
-%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_eq2_qt4.so
-%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_equalizer_qt4.so
-%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_hue_qt4.so
-%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_mpdelogo_qt4.so
-%%QT4%%lib/ADM_plugins/videoFilter/libADM_vf_mplayerResize_qt4.so
-%%SDL%%lib/ADM_plugins/audioDevices/libADM_av_sdl.so
-%%VORBIS%%lib/ADM_plugins/audioEncoders/libADM_ae_vorbis.so
-%%X264%%lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so
-%%X264%%lib/ADM_plugins/videoEncoder/x264/Apple iPhone.xml
-%%X264%%lib/ADM_plugins/videoEncoder/x264/Apple iPod 5.5G.xml
-%%X264%%lib/ADM_plugins/videoEncoder/x264/Apple iPod.xml
-%%X264%%lib/ADM_plugins/videoEncoder/x264/Microsoft Zune.xml
-%%X264%%lib/ADM_plugins/videoEncoder/x264/Sony PlayStation Portable.xml
-%%X264%%lib/ADM_plugins/videoEncoder/x264/x264Param.xsd
-%%XVID%%lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so
-%%XVID%%lib/ADM_plugins/videoEncoder/xvid/XvidParam.xsd
-@dirrm lib/ADM_plugins/audioDecoder
-@dirrm lib/ADM_plugins/audioDevices
-@dirrm lib/ADM_plugins/videoEncoder/avcodec/mpeg-1
-@dirrm lib/ADM_plugins/videoEncoder/avcodec/mpeg-2
-@dirrm lib/ADM_plugins/videoEncoder/avcodec
-%%X264%%@dirrm lib/ADM_plugins/videoEncoder/x264
-%%XVID%%@dirrm lib/ADM_plugins/videoEncoder/xvid
-@dirrm lib/ADM_plugins/videoEncoder/mpeg2enc/mpeg-1
-@dirrm lib/ADM_plugins/videoEncoder/mpeg2enc/mpeg-2
-@dirrm lib/ADM_plugins/videoEncoder/mpeg2enc
-@dirrm lib/ADM_plugins/videoEncoder
-@dirrm lib/ADM_plugins/videoFilter
-@dirrm lib/ADM_plugins/audioEncoders
-@dirrm lib/ADM_plugins
+lib/ADM_plugins6/audioDecoder/libADM_ad_Mad.so
+lib/ADM_plugins6/audioDecoder/libADM_ad_a52.so
+lib/ADM_plugins6/audioDecoder/libADM_ad_dca.so
+lib/ADM_plugins6/audioDecoder/libADM_ad_lav.so
+lib/ADM_plugins6/audioDecoder/libADM_ad_ulaw.so
+lib/ADM_plugins6/audioDecoder/libADM_ad_ms_adpcm.so
+lib/ADM_plugins6/audioDecoder/libADM_ad_ima_adpcm.so
+%%VORBIS%%lib/ADM_plugins6/audioDecoder/libADM_ad_vorbis.so
+lib/ADM_plugins6/audioDevices/libADM_av_oss.so
+%%LAME%%lib/ADM_plugins6/audioEncoders/libADM_ae_lame.so
+lib/ADM_plugins6/audioEncoders/libADM_ae_lav_ac3.so
+lib/ADM_plugins6/audioEncoders/libADM_ae_lav_mp2.so
+lib/ADM_plugins6/audioEncoders/libADM_ae_lav_aac.so
+lib/ADM_plugins6/audioEncoders/libADM_ae_pcm.so
+lib/ADM_plugins6/videoEncoders/libADM_ve_yv12.so
+lib/ADM_plugins6/videoEncoders/libADM_ve_png.so
+lib/ADM_plugins6/videoEncoders/libADM_ve_jpeg.so
+lib/ADM_plugins6/videoEncoders/libADM_ve_huff.so
+lib/ADM_plugins6/videoEncoders/libADM_ve_ffDv.so
+lib/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg4.so
+lib/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg2.so
+lib/ADM_plugins6/videoEncoders/libADM_ve_ffFlv1.so
+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_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_fadeToBlack.so
+lib/ADM_plugins6/videoFilters/libADM_vf_mean.so
+lib/ADM_plugins6/videoFilters/libADM_vf_gauss.so
+lib/ADM_plugins6/videoFilters/libADM_vf_median.so
+lib/ADM_plugins6/videoFilters/libADM_vf_sharpen.so
+lib/ADM_plugins6/videoFilters/libADM_vf_separateField.so
+lib/ADM_plugins6/videoFilters/libADM_vf_mergeField.so
+lib/ADM_plugins6/videoFilters/libADM_vf_FluxSmooth.so
+lib/ADM_plugins6/videoFilters/libADM_hf_hflip.so
+lib/ADM_plugins6/videoFilters/libADM_vf_kernelDeint.so
+lib/ADM_plugins6/videoFilters/libADM_vf_largeMedian.so
+lib/ADM_plugins6/videoFilters/libADM_vf_lavDeint.so
+lib/ADM_plugins6/videoFilters/libADM_vf_logo.so
+lib/ADM_plugins6/videoFilters/libADM_vf_lumaOnly.so
+lib/ADM_plugins6/videoFilters/libADM_vf_denoise3dhq.so
+lib/ADM_plugins6/videoFilters/libADM_vf_denoise3d.so
+lib/ADM_plugins6/videoFilters/libADM_vf_msharpen.so
+lib/ADM_plugins6/videoFilters/libADM_vf_printInfo.so
+lib/ADM_plugins6/videoFilters/libADM_vf_removePlane.so
+lib/ADM_plugins6/videoFilters/libADM_vf_resampleFps.so
+lib/ADM_plugins6/videoFilters/libADM_vf_rotate.so
+lib/ADM_plugins6/videoFilters/libADM_vf_stackField.so
+lib/ADM_plugins6/videoFilters/libADM_vf_unstackField.so
+lib/ADM_plugins6/videoFilters/libADM_vf_hzstackField.so
+lib/ADM_plugins6/videoFilters/libADM_vf_swapUV.so
+lib/ADM_plugins6/videoFilters/libADM_vf_telecide.so
+lib/ADM_plugins6/videoFilters/libADM_vf_yadif.so
+lib/ADM_plugins6/videoFilters/libADM_vf_vflip.so
+lib/ADM_plugins6/scriptEngines/libADM_script_spiderMonkey.so
+lib/ADM_plugins6/scriptEngines/libADM_script_tinyPy.so
+lib/ADM_plugins6/demuxers/libADM_dm_flv.so
+lib/ADM_plugins6/demuxers/libADM_dm_pic.so
+lib/ADM_plugins6/demuxers/libADM_dm_mp4.so
+lib/ADM_plugins6/demuxers/libADM_dm_matroska.so
+lib/ADM_plugins6/demuxers/libADM_dm_opendml.so
+lib/ADM_plugins6/demuxers/libADM_dm_ps.so
+lib/ADM_plugins6/demuxers/libADM_dm_ts.so
+lib/ADM_plugins6/demuxers/libADM_dm_asf.so
+lib/ADM_plugins6/demuxers/libADM_dm_avsproxy.so
+lib/ADM_plugins6/demuxers/libADM_dm_mxf.so
+lib/ADM_plugins6/muxers/libADM_mx_dummy.so
+lib/ADM_plugins6/muxers/libADM_mx_mp4v2.so
+lib/ADM_plugins6/muxers/libADM_mx_avi.so
+lib/ADM_plugins6/muxers/libADM_mx_raw.so
+lib/ADM_plugins6/muxers/libADM_mx_flv.so
+lib/ADM_plugins6/muxers/libADM_mx_mp4.so
+lib/ADM_plugins6/muxers/libADM_mx_Mkv.so
+lib/ADM_plugins6/muxers/libADM_mx_ffPS.so
+lib/ADM_plugins6/muxers/libADM_mx_ffTS.so
+lib/ADM_plugins6/autoScripts/720p.py
+lib/ADM_plugins6/autoScripts/PSP.py
+lib/ADM_plugins6/autoScripts/check24fps.py
+lib/ADM_plugins6/autoScripts/svcd.py
+lib/ADM_plugins6/autoScripts/vcd.py
+lib/ADM_plugins6/autoScripts/dvd.py
+lib/ADM_plugins6/autoScripts/lib/ADM_imageInfo.py
+lib/ADM_plugins6/autoScripts/lib/ADM_image.py
+%%VPX%%lib/ADM_plugins6/videoDecoders/libADM_vd_vpx.so
+%%ESD%%lib/ADM_plugins6/audioDevices/libADM_av_esd.so
+%%FAAC%%lib/ADM_plugins6/audioEncoders/libADM_ae_faac.so
+%%FAAD%%lib/ADM_plugins6/audioDecoder/libADM_ad_faad.so
+%%JACK%%lib/ADM_plugins6/audioDevices/libADM_av_jack.so
+%%PULSE%%lib/ADM_plugins6/audioDevices/libADM_av_pulseAudioSimple.so
+%%XVID%%lib/ADM_plugins6/videoEncoders/libADM_ve_xvid4.so
+%%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
+%%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
+%%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
+%%QT4%%@dirrm share/avidemux6/help/QtScript/search
+%%QT4%%@dirrm share/avidemux6/help/QtScript
+%%QT4%%@dirrm share/avidemux6/help
+%%QT4%%@dirrm share/avidemux6
+@dirrm lib/ADM_plugins6/audioDecoder
+@dirrm lib/ADM_plugins6/audioDevices
+@dirrm lib/ADM_plugins6/demuxers
+@dirrm lib/ADM_plugins6/muxers
+@dirrm lib/ADM_plugins6/autoScripts/lib
+@dirrm lib/ADM_plugins6/autoScripts
+@dirrm lib/ADM_plugins6/videoDecoders
+@dirrm lib/ADM_plugins6/videoEncoders
+@dirrm lib/ADM_plugins6/videoFilters
+@dirrm lib/ADM_plugins6/scriptEngines
+@dirrm lib/ADM_plugins6/audioEncoders
+@dirrm lib/ADM_plugins6

Added: head/multimedia/avidemux26-qt4/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/avidemux26-qt4/Makefile	Tue Apr  1 17:27:31 2014	(r349863)
@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+PORTNAME=	avidemux26
+PORTVERSION=	${AVIDEMUX2_VERSION}
+PORTREVISION=	0
+CATEGORIES=	multimedia
+PKGNAMESUFFIX=	-qt4
+
+MAINTAINER=	multimedia@FreeBSD.org
+COMMENT=	Simple GUI based video editor (QT4 UI)
+
+LIB_DEPENDS=	libADM6avutil.so.52:${PORTSDIR}/multimedia/avidemux26
+
+MASTERDIR=	${.CURDIR}/../avidemux26
+PLIST=		${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile.common"
+
+CMAKE_SOURCE_PATH=	${WRKSRC}/avidemux/qt4
+
+CMAKE_ARGS+=	-DAVIDEMUX_SOURCE_DIR=${WRKSRC} -DAVIDEMUX_INSTALL_PREFIX:PATH="${PREFIX}"
+
+post-configure: post-configure-common
+
+.include <bsd.port.post.mk>

Added: head/multimedia/avidemux26-qt4/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/avidemux26-qt4/pkg-plist	Tue Apr  1 17:27:31 2014	(r349863)
@@ -0,0 +1,32 @@
+bin/avidemux3_jobs
+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
+@dirrm share/avidemux6/i18n
+@dirrm share/avidemux6
+@dirrm include/avidemux/2.6/qt4

Modified: head/multimedia/avidemux26/Makefile
==============================================================================
--- head/multimedia/avidemux2/Makefile	Sun Mar 30 17:38:21 2014	(r349650)
+++ head/multimedia/avidemux26/Makefile	Tue Apr  1 17:27:31 2014	(r349863)
@@ -1,7 +1,10 @@
 # Created by: Anish Mistry (with help from mean)
 # $FreeBSD$
+# assuming freebsd always has 16 byte aligned malloc as macos does. is this true?
+# nls files not getting installed with nls=on. are they getting built?
+# sync port options with current software options
 
-PORTNAME=	avidemux2
+PORTNAME=	avidemux26
 PORTVERSION=	${AVIDEMUX2_VERSION}
 CATEGORIES=	multimedia
 
@@ -10,17 +13,18 @@ COMMENT=	Simple GUI based video editor
 
 .include "${.CURDIR}/Makefile.common"
 
+CMAKE_SOURCE_PATH=	${WRKSRC}/avidemux_core
+
 post-configure: post-configure-common
 
 post-install:
-.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MQT4}
+.if ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MQT4}
 	@${MKDIR} "${STAGEDIR}${DATADIR}"
 	${INSTALL_DATA} "${WRKSRC}/avidemux_icon.png" "${STAGEDIR}${DATADIR}/${PORTNAME}.png"
 	@${ECHO_CMD} "${DATADIR_REL}/${PORTNAME}.png" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} %D/${DATADIR_REL} 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
-	@${MKDIR} "${STAGEDIR}${DESKTOPDIR}"
 	@${ECHO_CMD} "@cwd ${DESKTOPDIR}" >> ${TMPPLIST}
-.if ${PORT_OPTIONS:MGTK2}
+.if ${PORT_OPTIONS:MGTK3}
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%DATADIR%%|${DATADIR}|g" \
 	    -e "s|%%NAME%%|${PORTNAME}|g" -e "s|%%API%%|gtk|g" \
 	    < ${FILESDIR}/avidemux2.desktop.in > ${WRKDIR}/${PORTNAME}.desktop
@@ -35,9 +39,6 @@ post-install:
 	@${ECHO_CMD} "${PORTNAME}_qt4.desktop" >> ${TMPPLIST}
 .endif
 	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} ${DESKTOPDIR} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec %D/bin/update-desktop-database 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec %D/bin/update-desktop-database 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/multimedia/avidemux26/Makefile.common
==============================================================================
--- head/multimedia/avidemux2/Makefile.common	Sun Mar 30 17:38:21 2014	(r349650)
+++ head/multimedia/avidemux26/Makefile.common	Tue Apr  1 17:27:31 2014	(r349863)
@@ -1,44 +1,49 @@
 # $FreeBSD$
-#
 
-AVIDEMUX2_VERSION=	2.5.6
-PORTREVISION=	5
-MASTER_SITES=	BERLIOS \
+AVIDEMUX2_VERSION=	2.6.8
+PORTREVISION=	0
+MASTER_SITES=	\
 		SF/avidemux/avidemux/${PORTVERSION}
 DISTNAME=	avidemux_${PORTVERSION}
 
-BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
+BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm \
+		bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad \
-		liba52.so:${PORTSDIR}/audio/liba52 \
-		libpng15.so:${PORTSDIR}/graphics/png \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
 		libdca.so:${PORTSDIR}/multimedia/libdca \
-		libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+		libpng15.so:${PORTSDIR}/graphics/png
 
 LICENSE=	GPLv2
 
-CONFLICTS=	avidemux2-2.[0-46-9].*
+CONFLICTS=	avidemux2-*
 
 USE_GNOME=	libxml2
 USE_QT4=	# empty
 
+OPTIONS_FILE=	${PORT_DBDIR}/${OPTIONS_NAME:C/-.*//}/options
+
+USE_SQLITE=	yes
 WANT_SDL=	yes
 USES=		cmake:outsource pkgconfig iconv gmake compiler:features
-CMAKE_USE_PTHREAD=yes
-CMAKE_ARGS+=	-DTHREADS_HAVE_PTHREAD_ARG:STRING="${PTHREAD_LIBS}"
-CFLAGS+=	-Wno-return-type
+USES+=		dos2unix
+DOS2UNIX_FILES=	cmake/admCheckMiscLibs.cmake po/CMakeLists.txt
+CMAKE_ARGS+=	-DGNUMAKE_EXECUTABLE=gmake
+CMAKE_ARGS+=    -DAVIDEMUX_PACKAGER=none
+CXXFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 
-OPTIONS_DEFINE=	GTK2 QT4 FREETYPE FONTCONFIG OSS ESOUND JACK PULSEAUDIO XVIDEO FAAC \
-		FAAD X264 VPX XVID SDL AMR VORBIS NLS LAME
-OPTIONS_DEFAULT=	GTK2 FREETYPE FONTCONFIG OSS XVIDEO VPX XVID SDL FAAD VORBIS
+OPTIONS_DEFINE=	QT4 CLI FREETYPE FONTCONFIG OSS ESOUND JACK \
+		PULSEAUDIO XVIDEO FAAC \
+		FAAD X264 VPX XVID SDL AMR VORBIS NLS LAME VDPAU
+OPTIONS_DEFAULT=	QT4 FREETYPE FONTCONFIG OSS XVIDEO VPX XVID \
+			SDL FAAD VORBIS
+CLI_DESC=	Build CLI tool
 
 .if !defined(PACKAGE_BUILDING)
-OPTIONS_DEFAULT+=	LAME FAAC AMR
+OPTIONS_DEFAULT+=	LAME FAAC AMR X264
 .endif
 
 .include <bsd.port.options.mk>
@@ -63,27 +68,37 @@ PLIST_SUB+=	NLS="@comment " QT_NLS="@com
 LDFLAGS+=	-lc++
 .endif
 
-.if ${COMPILER_TYPE} == clang
+#.if ${COMPILER_TYPE} == clang
 USE_GCC=	yes
-.endif
+#.endif
 
 # for libexecinfo: (so that __builtin_frame_address() finds the top
 # of the stack)
 .if ${ARCH} == "amd64"
 CFLAGS+=	-fno-omit-frame-pointer
+#MAKE_ENV+=	ARCH=x86_64
+#CONFIGURE_ENV+=	ARCH=x86_64
+.endif
+.if ${OSVERSION} < 1000000
+LIB_DEPENDS+=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+CMAKE_ARGS+=	-DLIBEXECINFO_INCLUDE_DIR=${LOCALBASE}/include
+CMAKE_ARGS+=	-DLIBEXECINFO_LIBRARY_DIR=${LOCALBASE}/lib/libexecinfo.so
+.else
+CMAKE_ARGS+=	-DLIBEXECINFO_INCLUDE_DIR=/usr/include
+CMAKE_ARGS+=	-DLIBEXECINFO_LIBRARY_DIR=-lexecinfo
 .endif
 
 # We haven't ALSA(Never) & Aften(Yet) on FreeBSD
 CMAKE_ARGS+=	-DARTS:BOOL=OFF -DALSA:BOOL=OFF -DAFTEN:BOOL=OFF
 
-.if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MQT4)
+.if empty(PORT_OPTIONS:MGTK3) && empty(PORT_OPTIONS:MQT4)
 CMAKE_ARGS+=	-DX11:BOOL=OFF
 .else
-USE_GNOME+=	libxslt desktopfileutils
+USE_GNOME+=	libxslt
 .endif
 
-.if ${PORT_OPTIONS:MGTK2}
-USE_GNOME+=	gnomeprefix gnomehack gtk20
+.if ${PORT_OPTIONS:MGTK3}
+USE_GNOME+=	gnomeprefix gnomehack gtk30
 PLIST_SUB+=	GTK=""
 .else
 CMAKE_ARGS+=	-DGTK:BOOL=OFF
@@ -99,6 +114,12 @@ CMAKE_ARGS+=	-DQT4:BOOL=OFF
 PLIST_SUB+=	QT4="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MCLI}
+PLIST_SUB+=	CLI=""
+.else
+PLIST_SUB+=	CLI="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MOSS}
 CMAKE_ARGS+=	-DOSS_SUPPORT:BOOL=ON
 .else
@@ -184,8 +205,10 @@ PLIST_SUB+=	X264="@comment "
 
 .if ${PORT_OPTIONS:MVPX}
 LIB_DEPENDS+=	libvpx.so:${PORTSDIR}/multimedia/libvpx
+PLIST_SUB+=	VPX=""
 .else
 CMAKE_ARGS+=	-DVPXDEC:BOOL=OFF
+PLIST_SUB+=	VPX="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MXVID}

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



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