Date: Sun, 23 Feb 2020 09:04:44 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526907 - in head/multimedia: . avidemux avidemux-cli avidemux-plugins avidemux-qt5 avidemux/files Message-ID: <202002230904.01N94iDh084286@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sun Feb 23 09:04:44 2020 New Revision: 526907 URL: https://svnweb.freebsd.org/changeset/ports/526907 Log: multimedia/avidemux: update to 2.7.4 and readd Qt gui port - multimedia/avidemux-qt5 repo copied from multimedia/avidemux-qt4 - The port as a whole is in need of a little modernization PR: 242634 Submitted by: Lars Herschke <lhersch@dssgmbh.de>,tcberner Tested by: rkoberman@gmail.com Reported by: VVD <vvd@unislabs.com> Added: head/multimedia/avidemux-qt5/ - copied from r495966, head/multimedia/avidemux-qt4/ head/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__crashdump__unix.cpp (contents, props changed) head/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__folder__linux.cpp (contents, props changed) Deleted: head/multimedia/avidemux/files/avidemux2.desktop.in head/multimedia/avidemux/files/patch-avidemux__core_ADM__coreVideoCodec_include_ADM__ffmp43.h head/multimedia/avidemux/files/patch-avidemux__core_ffmpeg__package_patches_config.mak.diff head/multimedia/avidemux/files/patch-avidemux__plugins_ADM__demuxers_MpegTS_dmxTSPacket.cpp head/multimedia/avidemux/files/patch-avidemux__plugins_ADM__muxers_muxerMp4v2_libmp4v2_src_rtphint.cpp head/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffDv_ADM__ffDv.cpp head/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffFlv1_ADM__ffFlv1.h head/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffMpeg2_ADM__ffMpeg2.h head/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffMpeg4_ADM__ffMpeg4.h head/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_ADM__x264.cpp head/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_ADM__x264.h head/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_qt4_Q__x264.cpp head/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_ADM__x265.cpp head/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_ADM__x265.h head/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_qt4_Q__x265.cpp head/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_xvid4_ADM__xvid4.cpp head/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoFilters6_telecide_Telecide__getFrame.cpp head/multimedia/avidemux/files/patch-avidemux_qt4_ADM__jobs_src_ADM__jobControl.cpp head/multimedia/avidemux/files/patch-cmake_admCheckX265.cmake Modified: head/multimedia/Makefile head/multimedia/avidemux-cli/Makefile head/multimedia/avidemux-cli/pkg-plist head/multimedia/avidemux-plugins/Makefile head/multimedia/avidemux-plugins/pkg-plist head/multimedia/avidemux-qt5/Makefile head/multimedia/avidemux-qt5/pkg-plist head/multimedia/avidemux/Makefile head/multimedia/avidemux/Makefile.common head/multimedia/avidemux/distinfo head/multimedia/avidemux/files/patch-avidemux__core_ADM__coreUtils_src_prefs2__pref.h head/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__memsupport.cpp head/multimedia/avidemux/files/patch-avidemux__plugins_CMakeLists.txt head/multimedia/avidemux/files/patch-cmake_admCheckMiscLibs.cmake head/multimedia/avidemux/files/patch-cmake_admMainChecks.cmake head/multimedia/avidemux/pkg-plist Modified: head/multimedia/Makefile ============================================================================== --- head/multimedia/Makefile Sun Feb 23 08:58:19 2020 (r526906) +++ head/multimedia/Makefile Sun Feb 23 09:04:44 2020 (r526907) @@ -19,6 +19,7 @@ SUBDIR += avidemux SUBDIR += avidemux-cli SUBDIR += avidemux-plugins + SUBDIR += avidemux-qt5 SUBDIR += avinfo SUBDIR += baka-mplayer SUBDIR += bcmatroska2 Modified: head/multimedia/avidemux-cli/Makefile ============================================================================== --- head/multimedia/avidemux-cli/Makefile Sun Feb 23 08:58:19 2020 (r526906) +++ head/multimedia/avidemux-cli/Makefile Sun Feb 23 09:04:44 2020 (r526907) @@ -2,14 +2,13 @@ PORTNAME= avidemux PORTVERSION= ${AVIDEMUX_VERSION} -PORTREVISION= 9 CATEGORIES= multimedia PKGNAMESUFFIX= -cli MAINTAINER= multimedia@FreeBSD.org COMMENT= Simple GUI based video editor (cli) -LIB_DEPENDS= libADM6avutil.so.54:multimedia/avidemux +LIB_DEPENDS= libADM6avutil.so.56:multimedia/avidemux MASTERDIR= ${.CURDIR}/../avidemux PLIST= ${.CURDIR}/pkg-plist Modified: head/multimedia/avidemux-cli/pkg-plist ============================================================================== --- head/multimedia/avidemux-cli/pkg-plist Sun Feb 23 08:58:19 2020 (r526906) +++ head/multimedia/avidemux-cli/pkg-plist Sun Feb 23 09:04:44 2020 (r526907) @@ -1,4 +1,5 @@ bin/avidemux3_cli -include/avidemux/2.6/cli/config.h +include/avidemux/2.7/cli/config.h +include/avidemux/2.7/cli/ADM_UIs/ADM_UI_Cli6_export.h lib/libADM_UI_Cli6.so lib/libADM_render6_cli.so Modified: head/multimedia/avidemux-plugins/Makefile ============================================================================== --- head/multimedia/avidemux-plugins/Makefile Sun Feb 23 08:58:19 2020 (r526906) +++ head/multimedia/avidemux-plugins/Makefile Sun Feb 23 09:04:44 2020 (r526907) @@ -3,14 +3,13 @@ PORTNAME= avidemux PORTVERSION= ${AVIDEMUX_VERSION} -PORTREVISION= 18 CATEGORIES= multimedia PKGNAMESUFFIX= -plugins MAINTAINER= multimedia@FreeBSD.org COMMENT= Simple GUI based video editor (Plugins) -LIB_DEPENDS= libADM6avutil.so.54:multimedia/avidemux +LIB_DEPENDS= libADM6avutil.so.56:multimedia/avidemux MASTERDIR= ${.CURDIR}/../avidemux PLIST= ${.CURDIR}/pkg-plist @@ -21,17 +20,21 @@ CMAKE_SOURCE_PATH= ${WRKSRC}/avidemux_plugins #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 +PLUGIN_UI= COMMON SETTINGS .if ${PORT_OPTIONS:MCLI} -BUILD_DEPENDS+= ${LOCALBASE}/include/avidemux/2.6/cli/config.h:multimedia/avidemux-cli -RUN_DEPENDS+= ${LOCALBASE}/include/avidemux/2.6/cli/config.h:multimedia/avidemux-cli +BUILD_DEPENDS+= ${LOCALBASE}/include/avidemux/2.7/cli/config.h:multimedia/avidemux-cli +RUN_DEPENDS+= ${LOCALBASE}/include/avidemux/2.7/cli/config.h:multimedia/avidemux-cli +PLUGIN_UI+= CLI .endif -.if ${PORT_OPTIONS:MGTK3} -BUILD_DEPENDS+= ${LOCALBASE}/include/avidemux/2.6/gtk/config.h:multimedia/avidemux-gtk -RUN_DEPENDS+= ${LOCALBASE}/include/avidemux/2.6/gtk/config.h:multimedia/avidemux-gtk +.if ${PORT_OPTIONS:MQT5} +BUILD_DEPENDS+= ${LOCALBASE}/include/avidemux/2.7/qt5/config.h:multimedia/avidemux-qt5 +RUN_DEPENDS+= ${LOCALBASE}/include/avidemux/2.7/qt5/config.h:multimedia/avidemux-qt5 +PLUGIN_UI+= QT4 .endif + +CMAKE_ARGS+= -DPLUGIN_UI="${PLUGIN_UI}" post-configure: post-configure-common Modified: head/multimedia/avidemux-plugins/pkg-plist ============================================================================== --- head/multimedia/avidemux-plugins/pkg-plist Sun Feb 23 08:58:19 2020 (r526906) +++ head/multimedia/avidemux-plugins/pkg-plist Sun Feb 23 09:04:44 2020 (r526907) @@ -1,13 +1,14 @@ lib/ADM_plugins6/audioDecoder/libADM_ad_Mad.so lib/ADM_plugins6/audioDecoder/libADM_ad_a52.so -lib/ADM_plugins6/audioDecoder/libADM_ad_dca.so +%%DCA%%lib/ADM_plugins6/audioDecoder/libADM_ad_dca.so lib/ADM_plugins6/audioDecoder/libADM_ad_lav.so %%OPUS%%lib/ADM_plugins6/audioDecoder/libADM_ad_opus.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 +%%OSS%%lib/ADM_plugins6/audioDevices/libADM_av_oss.so +%%OPUS%%lib/ADM_plugins6/audioEncoders/libADM_ae_opus.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 @@ -15,7 +16,6 @@ lib/ADM_plugins6/audioEncoders/libADM_ae_lav_aac.so lib/ADM_plugins6/audioEncoders/libADM_ae_pcm.so %%TWOLAME%%lib/ADM_plugins6/audioEncoders/libADM_ae_twolame.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 @@ -23,13 +23,18 @@ 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 +%%VAAPI%%lib/ADM_plugins6/videoEncoders/libADM_ve_ffVaEncH264.so +%%VAAPI%%lib/ADM_plugins6/videoEncoders/libADM_ve_ffVaEncHEVC.so +%%VAAPI%%lib/ADM_plugins6/videoEncoders/libADM_ve_libva.so +%%QT5%%%%X264%%lib/ADM_plugins6/videoEncoders/qt5/libADM_ve_x264_QT5.so +%%QT5%%%%X265%%lib/ADM_plugins6/videoEncoders/qt5/libADM_ve_x265_QT5.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_admIvtc.so lib/ADM_plugins6/videoFilters/libADM_vf_black.so lib/ADM_plugins6/videoFilters/libADM_vf_changeFps.so lib/ADM_plugins6/videoFilters/libADM_vf_colorYuv.so -lib/ADM_plugins6/videoFilters/libADM_vf_decimate.so +lib/ADM_plugins6/videoFilters/libADM_vf_ascii.so lib/ADM_plugins6/videoFilters/libADM_vf_DgBob.so lib/ADM_plugins6/videoFilters/libADM_vf_dummy.so lib/ADM_plugins6/videoFilters/libADM_vf_fadeTo.so @@ -39,18 +44,18 @@ 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 -%%FRIBIDI%%%%FREETYPE%%lib/ADM_plugins6/videoFilters/libADM_vf_ssa.so +%%FRIBIDI%%lib/ADM_plugins6/videoFilters/libADM_vf_ssa.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_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_ivtcDupeRemover.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_stillimage.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 @@ -62,8 +67,7 @@ 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 +%%TINYPY%%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 @@ -74,6 +78,8 @@ 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 +%%VAPOURSYNTH%%lib/ADM_plugins6/demuxers/libADM_dm_vapoursynth.so +lib/ADM_plugins6/muxers/libADM_mx_Webm.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 @@ -91,23 +97,57 @@ 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 +%%FDK%%lib/ADM_plugins6/audioEncoders/libADM_ae_fdk_aac.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 +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 %%VDPAU%%lib/ADM_plugins6/videoFilters/libADM_vf_vdpauFilter.so %%VDPAU%%lib/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.so -%%CLI%%%%X264%%lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so -%%CLI%%%%X265%%lib/ADM_plugins6/videoEncoders/libADM_ve_x265_other.so +%%X264%%lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so +%%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_logoCli.so %%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_swscaleResize_cli.so +%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_blackenBordersCli.so +%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_mpdelogoCli.so +%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_msharpenCli.so +%%VAAPI%%lib/ADM_plugins6/videoFilters/libADM_vf_vaapiFilter.so +%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_HueQT5.so +%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_logoQT5.so +%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_asharpQT5.so +%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_blackenBordersQT5.so +%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_chromaShiftQT5.so +%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_contrastQT5.so +%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_cropQT5.so +%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_eq2QT5.so +%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_glBenchmark.so +%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_glResize.so +%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_mpdelogoQT5.so +%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_msharpenQT5.so +%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_rotateGlFrag2.so +%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_sampleGlFrag2.so +%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_sampleGlVertex.so +%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_shaderLoaderGl.so +%%QT5%%lib/ADM_plugins6/videoFilters/qt5/libADM_vf_swscaleResizeQT5.so +%%QT5%%lib/ADM_plugins6/shaderDemo/1/bump.shader +%%QT5%%lib/ADM_plugins6/shaderDemo/1/lightning.shader +%%QT5%%lib/ADM_plugins6/shaderDemo/1/ripple.shader +%%QT5%%lib/ADM_plugins6/shaderDemo/1/zigzag.shader +%%X264%%lib/ADM_plugins6/pluginSettings/x264/3/fast.json +%%X264%%lib/ADM_plugins6/pluginSettings/x264/3/iPhone.json +%%X264%%lib/ADM_plugins6/pluginSettings/x264/3/PSP.json +%%X264%%lib/ADM_plugins6/pluginSettings/x264/3/ultraFast.json +%%X264%%lib/ADM_plugins6/pluginSettings/x264/3/veryFast.json +%%VAPOURSYNTH%%bin/vsProxy +%%QT5%%%%VAPOURSYNTH%%bin/vsProxy_gui_qt5 +share/ADM6_addons/avsfilter/avsload.exe +share/ADM6_addons/avsfilter/pipe_source.dll Modified: head/multimedia/avidemux-qt5/Makefile ============================================================================== --- head/multimedia/avidemux-qt4/Makefile Sat Mar 16 21:52:35 2019 (r495966) +++ head/multimedia/avidemux-qt5/Makefile Sun Feb 23 09:04:44 2020 (r526907) @@ -2,17 +2,16 @@ PORTNAME= avidemux PORTVERSION= ${AVIDEMUX_VERSION} -PORTREVISION= 8 CATEGORIES= multimedia -PKGNAMESUFFIX= -qt4 +PKGNAMESUFFIX= -qt5 MAINTAINER= multimedia@FreeBSD.org -COMMENT= Simple GUI based video editor (QT4 UI) +COMMENT= Simple GUI based video editor (QT5 UI) -LIB_DEPENDS= libADM6avutil.so.54:multimedia/avidemux +LIB_DEPENDS= libADM6avutil.so.56:multimedia/avidemux MASTERDIR= ${.CURDIR}/../avidemux -OPTIONS_SLAVE= QT4 +OPTIONS_SLAVE= QT5 PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile.common" Modified: head/multimedia/avidemux-qt5/pkg-plist ============================================================================== --- head/multimedia/avidemux-qt4/pkg-plist Sat Mar 16 21:52:35 2019 (r495966) +++ head/multimedia/avidemux-qt5/pkg-plist Sun Feb 23 09:04:44 2020 (r526907) @@ -1,30 +1,60 @@ -bin/avidemux3_jobs_qt4 -bin/avidemux3_qt4 -include/avidemux/2.6/qt4/config.h -lib/libADM_UIQT46.so -lib/libADM_openGLQT46.so -lib/libADM_render6_QT4.so -share/avidemux6/qt4/i18n/avidemux_ca.qm -share/avidemux6/qt4/i18n/avidemux_cs.qm -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 +bin/avidemux3_jobs_qt5 +bin/avidemux3_qt5 +include/avidemux/2.7/qt5/ADM_openGL/ADM_openGL_export.h +include/avidemux/2.7/qt5/ADM_openGL/ADM_openGl.h +include/avidemux/2.7/qt5/ADM_UIs/ADM_dialogFactoryQt4.h +include/avidemux/2.7/qt5/ADM_UIs/ADM_toolkitQt.h +include/avidemux/2.7/qt5/ADM_UIs/ADM_UIQT46_export.h +include/avidemux/2.7/qt5/ADM_UIs/DIA_flyDialogQt4_template.h +include/avidemux/2.7/qt5/ADM_UIs/DIA_flyDialogQt4.h +include/avidemux/2.7/qt5/ADM_UIs/T_openGLFilter.h +include/avidemux/2.7/qt5/config.h +lib/libADM_openGLQT56.so +lib/libADM_render6_QT5.so +lib/libADM_UIQT56.so +share/applications/org.avidemux.Avidemux.desktop +share/avidemux6/qt5/i18n/avidemux_ca.qm +share/avidemux6/qt5/i18n/avidemux_cs.qm +share/avidemux6/qt5/i18n/avidemux_da.qm +share/avidemux6/qt5/i18n/avidemux_de.qm +share/avidemux6/qt5/i18n/avidemux_el.qm +share/avidemux6/qt5/i18n/avidemux_en.qm +share/avidemux6/qt5/i18n/avidemux_es.qm +share/avidemux6/qt5/i18n/avidemux_eu.qm +share/avidemux6/qt5/i18n/avidemux_fr.qm +share/avidemux6/qt5/i18n/avidemux_hu.qm +share/avidemux6/qt5/i18n/avidemux_it.qm +share/avidemux6/qt5/i18n/avidemux_ja.qm +share/avidemux6/qt5/i18n/avidemux_ko.qm +share/avidemux6/qt5/i18n/avidemux_pl.qm +share/avidemux6/qt5/i18n/avidemux_pt_BR.qm +share/avidemux6/qt5/i18n/avidemux_ru.qm +share/avidemux6/qt5/i18n/avidemux_sr.qm +share/avidemux6/qt5/i18n/avidemux_sr@latin.qm +share/avidemux6/qt5/i18n/avidemux_tr.qm +share/avidemux6/qt5/i18n/avidemux_zh_CN.qm +share/avidemux6/qt5/i18n/avidemux_zh_TW.qm +share/avidemux6/qt5/i18n/qtbase_ar.qm +share/avidemux6/qt5/i18n/qtbase_bg.qm +share/avidemux6/qt5/i18n/qtbase_ca.qm +share/avidemux6/qt5/i18n/qtbase_cs.qm +share/avidemux6/qt5/i18n/qtbase_da.qm +share/avidemux6/qt5/i18n/qtbase_de.qm +share/avidemux6/qt5/i18n/qtbase_es.qm +share/avidemux6/qt5/i18n/qtbase_fi.qm +share/avidemux6/qt5/i18n/qtbase_fr.qm +share/avidemux6/qt5/i18n/qtbase_gd.qm +share/avidemux6/qt5/i18n/qtbase_he.qm +share/avidemux6/qt5/i18n/qtbase_hu.qm +share/avidemux6/qt5/i18n/qtbase_it.qm +share/avidemux6/qt5/i18n/qtbase_ja.qm +share/avidemux6/qt5/i18n/qtbase_ko.qm +share/avidemux6/qt5/i18n/qtbase_lv.qm +share/avidemux6/qt5/i18n/qtbase_pl.qm +share/avidemux6/qt5/i18n/qtbase_ru.qm +share/avidemux6/qt5/i18n/qtbase_sk.qm +share/avidemux6/qt5/i18n/qtbase_uk.qm +share/avidemux6/qt5/i18n/qtbase_zh_CN.qm +share/avidemux6/qt5/i18n/qtbase_zh_TW.qm +share/icons/hicolor/128x128/apps/org.avidemux.Avidemux.png +share/metainfo/org.avidemux.Avidemux.appdata.xml Modified: head/multimedia/avidemux/Makefile ============================================================================== --- head/multimedia/avidemux/Makefile Sun Feb 23 08:58:19 2020 (r526906) +++ head/multimedia/avidemux/Makefile Sun Feb 23 09:04:44 2020 (r526907) @@ -6,7 +6,6 @@ PORTNAME= avidemux PORTVERSION= ${AVIDEMUX_VERSION} -PORTREVISION= 15 CATEGORIES= multimedia MAINTAINER= multimedia@FreeBSD.org @@ -14,28 +13,8 @@ COMMENT= Simple GUI based video editor .include "${.CURDIR}/Makefile.common" -.if ${PORT_OPTIONS:MGTK2} -PLIST_FILES+= ${DATADIR}/${PORTNAME}.png -.endif - -.if ${PORT_OPTIONS:MGTK2} -PLIST_FILES+= ${DESKTOPDIR}/${PORTNAME}.desktop -.endif - CMAKE_SOURCE_PATH= ${WRKSRC}/avidemux_core post-configure: post-configure-common - -post-install: -.if ${PORT_OPTIONS:MGTK3} - @${MKDIR} "${STAGEDIR}${DATADIR}" - ${INSTALL_DATA} "${WRKSRC}/avidemux_icon.png" "${STAGEDIR}${DATADIR}/${PORTNAME}.png" -.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 - ${INSTALL_DATA} "${WRKDIR}/${PORTNAME}.desktop" "${STAGEDIR}${DESKTOPDIR}" -.endif -.endif .include <bsd.port.post.mk> Modified: head/multimedia/avidemux/Makefile.common ============================================================================== --- head/multimedia/avidemux/Makefile.common Sun Feb 23 08:58:19 2020 (r526906) +++ head/multimedia/avidemux/Makefile.common Sun Feb 23 09:04:44 2020 (r526907) @@ -1,6 +1,6 @@ # $FreeBSD$ -AVIDEMUX_VERSION= 2.6.11 +AVIDEMUX_VERSION= 2.7.4 MASTER_SITES= \ SF/avidemux/avidemux/${PORTVERSION} DISTNAME= avidemux_${PORTVERSION} @@ -8,7 +8,7 @@ DISTNAME= avidemux_${PORTVERSION} BUILD_DEPENDS+= yasm:devel/yasm \ bash:shells/bash LIB_DEPENDS+= libmad.so:audio/libmad \ - libdca.so:multimedia/libdca \ + libpulse.so:audio/pulseaudio \ libpng.so:graphics/png LICENSE= GPLv2 @@ -17,14 +17,14 @@ USE_GNOME= libxml2 OPTIONS_FILE= ${PORT_DBDIR}/${OPTIONS_NAME:C/-.*//}/options -USES= cmake:noninja pkgconfig iconv gmake gnome compiler:features sqlite +USES= cmake:noninja pkgconfig iconv gmake compiler:features sqlite USES+= dos2unix DOS2UNIX_FILES= cmake/admCheckMiscLibs.cmake \ avidemux_core/ADM_coreVideoCodec/include/ADM_coreVideoCodec6_export.h \ avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h CMAKE_ARGS+= -DGNUMAKE_EXECUTABLE=gmake CMAKE_ARGS+= -DAVIDEMUX_PACKAGER=none -CMAKE_ARGS+= -DQT5:BOOL=OFF +CMAKE_ARGS+= -DGTK:BOOL=OFF CMAKE_ARGS+= -DESD:BOOL=OFF CXXFLAGS+= -I${LOCALBASE}/include MAKE_JOBS_UNSAFE= yes @@ -35,16 +35,21 @@ CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin OPTIONS_DEFINE= CLI FREETYPE FONTCONFIG OSS JACK \ - PULSEAUDIO XVIDEO FAAC FRIBIDI OPUS TWOLAME \ - FAAD X264 X265 VPX XVID SDL AMR VORBIS NLS LAME VAAPI VDPAU + XVIDEO FAAC FRIBIDI OPUS TWOLAME \ + FAAD X264 X265 VPX XVID AMR VORBIS NLS LAME VAAPI VDPAU \ + DCA FDK QT5 TINYPY VAPOURSYNTH OPTIONS_DEFAULT= FREETYPE FONTCONFIG OSS XVIDEO VPX XVID \ - SDL FAAD VDPAU VORBIS + FAAD VDPAU VORBIS DCA FDK QT5 TINYPY VAPOURSYNTH + OPTIONS_SUB= yes CLI_DESC= Build CLI tool +FDK_DESC= FDK AAC codec support +TINYPY_DESC= Python scripting support via TinyPy +VAPOURSYNTH_DESC= VapourSynth video manipulation support -FRIBIDI_CMAKE_OFF= -DFRIDIBI:BOOL=OFF +FRIBIDI_CMAKE_OFF= -DFRIBIDI:BOOL=OFF FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi -OPUS_CMAKE_OFF= -DOPUS:BOOL=OFF +OPUS_CMAKE_OFF= -DOPUS:BOOL=OFF -DOPUS_ENCODER:BOOL=OFF OPUS_LIB_DEPENDS= libopus.so:audio/opus TWOLAME_CMAKE_OFF= -DTWOLAME:BOOL=OFF TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame @@ -57,10 +62,8 @@ OPTIONS_DEFAULT+= LAME FAAC AMR X264 .if ${PORT_OPTIONS:MNLS} USES+= gettext -PLIST_SUB+= NLS="" .else CMAKE_ARGS+= -DNO_NLS:BOOL=ON -PLIST_SUB+= NLS="@comment " .endif # for libexecinfo: (so that __builtin_frame_address() finds the top @@ -76,23 +79,25 @@ CMAKE_ARGS+= -DLIBEXECINFO_LIBRARY_DIR=-lexecinfo # We haven't ALSA(Never) & Aften(Yet) on FreeBSD CMAKE_ARGS+= -DARTS:BOOL=OFF -DALSA:BOOL=OFF -DAFTEN:BOOL=OFF -.if empty(PORT_OPTIONS:MGTK3) +.if empty(PORT_OPTIONS:MQT5) CMAKE_ARGS+= -DX11:BOOL=OFF .else USE_GNOME+= libxslt .endif -.if ${PORT_OPTIONS:MGTK3} -USE_GNOME+= gnomeprefix gtk30 -PLIST_SUB+= GTK="" +.if ${PORT_OPTIONS:MQT5} +USES+= desktop-file-utils gl qt:5 xorg +USE_GL= gl glu +USE_QT= core gui network widgets \ + qmake_build buildtools_build linguist_build +USE_XORG= x11 +CMAKE_ARGS+= -DENABLE_QT5:BOOL=ON +PLIST_SUB+= QT5="" .else -CMAKE_ARGS+= -DGTK:BOOL=OFF -PLIST_SUB+= GTK="@comment " +CMAKE_ARGS+= -DQT4:BOOL=OFF +PLIST_SUB+= QT5="@comment " .endif -CMAKE_ARGS+= -DQT4:BOOL=OFF -PLIST_SUB+= QT4="@comment " - .if ${PORT_OPTIONS:MCLI} PLIST_SUB+= CLI="" .else @@ -100,9 +105,9 @@ PLIST_SUB+= CLI="@comment " .endif .if ${PORT_OPTIONS:MOSS} -CMAKE_ARGS+= -DOSS_SUPPORT:BOOL=ON +CMAKE_ARGS+= -DOSS:BOOL=ON -DOSS_SUPPORT:BOOL=ON .else -CMAKE_ARGS+= -DOSS_SUPPORT:BOOL=OFF +CMAKE_ARGS+= -DOSS:BOOL=OFF -DOSS_SUPPORT:BOOL=OFF .endif .if ${PORT_OPTIONS:MJACK} @@ -113,20 +118,18 @@ CMAKE_ARGS+= -DJACK:BOOL=OFF PLIST_SUB+= JACK="@comment " .endif -.if ${PORT_OPTIONS:MPULSEAUDIO} -LIB_DEPENDS+= libpulse.so:audio/pulseaudio -PLIST_SUB+= PULSE="" +.if ${PORT_OPTIONS:MFDK} +LIB_DEPENDS+= libfdk-aac.so:audio/fdk-aac +PLIST_SUB+= FDK="" .else -CMAKE_ARGS+= -DPULSEAUDIOSIMPLE:BOOL=OFF -PLIST_SUB+= PULSE="@comment " +CMAKE_ARGS+= -DFDK_AAC:BOOL=OFF +PLIST_SUB+= FDK="@comment " .endif .if ${PORT_OPTIONS:MFREETYPE} LIB_DEPENDS+= libfreetype.so:print/freetype2 -PLIST_SUB+= FREETYPE="" .else CMAKE_ARGS+= -DFREETYPE2:BOOL=OFF -PLIST_SUB+= FREETYPE="@comment " .endif .if ${PORT_OPTIONS:MFONTCONFIG} @@ -185,10 +188,8 @@ PLIST_SUB+= X265="@comment " .if ${PORT_OPTIONS:MVPX} LIB_DEPENDS+= libvpx.so:multimedia/libvpx -PLIST_SUB+= VPX="" .else CMAKE_ARGS+= -DVPXDEC:BOOL=OFF -PLIST_SUB+= VPX="@comment " .endif .if ${PORT_OPTIONS:MXVID} @@ -199,13 +200,27 @@ CMAKE_ARGS+= -DXVID:BOOL=OFF PLIST_SUB+= XVID="@comment " .endif -.if ${PORT_OPTIONS:MSDL} -USES+= sdl -USE_SDL= sdl -PLIST_SUB+= SDL="" +.if ${PORT_OPTIONS:MTINYPY} +PLIST_SUB+= TINYPY="" .else -CMAKE_ARGS+= -DSDL:BOOL=OFF -PLIST_SUB+= SDL="@comment " +CMAKE_ARGS+= -DTINYPY:BOOL=OFF +PLIST_SUB+= TINYPY="@comment " +.endif + +.if ${PORT_OPTIONS:MDCA} +LIB_DEPENDS+= libdca.so:multimedia/libdca +PLIST_SUB+= DCA="" +.else +CMAKE_ARGS+= -DLIBDCA:BOOL=OFF +PLIST_SUB+= DCA="@comment " +.endif + +.if ${PORT_OPTIONS:MVAPOURSYNTH} +LIB_DEPENDS+= libvapoursynth.so:multimedia/vapoursynth +PLIST_SUB+= VAPOURSYNTH="" +.else +CMAKE_ARGS+= -DVAPOURSYNTH:BOOL=OFF +PLIST_SUB+= VAPOURSYNTH="@comment " .endif .if ${PORT_OPTIONS:MVAAPI} Modified: head/multimedia/avidemux/distinfo ============================================================================== --- head/multimedia/avidemux/distinfo Sun Feb 23 08:58:19 2020 (r526906) +++ head/multimedia/avidemux/distinfo Sun Feb 23 09:04:44 2020 (r526907) @@ -1,2 +1,3 @@ -SHA256 (avidemux_2.6.11.tar.gz) = 936ff5e10ad0551460c1233c217e4cee642623f2899a8fe48cd7f0144cfd1b3a -SIZE (avidemux_2.6.11.tar.gz) = 17980757 +TIMESTAMP = 1582448649 +SHA256 (avidemux_2.7.4.tar.gz) = 7db0ac01c8255279a2c360ecb2725c27ea8a2c5bd1f38aeafabfed33ea588da9 +SIZE (avidemux_2.7.4.tar.gz) = 23946276 Modified: head/multimedia/avidemux/files/patch-avidemux__core_ADM__coreUtils_src_prefs2__pref.h ============================================================================== --- head/multimedia/avidemux/files/patch-avidemux__core_ADM__coreUtils_src_prefs2__pref.h Sun Feb 23 08:58:19 2020 (r526906) +++ head/multimedia/avidemux/files/patch-avidemux__core_ADM__coreUtils_src_prefs2__pref.h Sun Feb 23 09:04:44 2020 (r526907) @@ -1,11 +1,11 @@ ---- avidemux_core/ADM_coreUtils/src/prefs2_pref.h.orig 2016-01-29 08:47:25 UTC +--- avidemux_core/ADM_coreUtils/src/prefs2_pref.h.orig 2019-08-15 07:25:39 UTC +++ avidemux_core/ADM_coreUtils/src/prefs2_pref.h -@@ -19,7 +19,7 @@ static optionDesc myOptions[]={ +@@ -18,7 +18,7 @@ static optionDesc myOptions[]={ { FEATURES_REUSE_2PASS_LOG,"features.reuse_2pass_log" ,ADM_param_bool ,"0", 0, 1}, { FEATURES_AUDIOBAR_USES_MASTER,"features.audiobar_uses_master" ,ADM_param_bool ,"0", 0, 1}, { FEATURES_THREADING_LAVC,"features.threading_lavc" ,ADM_param_uint32_t ,"0", 0, 32}, -{ FEATURES_CPU_CAPS,"features.cpu_caps" ,ADM_param_uint32_t ,"4294967295", 0, 4294967295}, +{ FEATURES_CPU_CAPS,"features.cpu_caps" ,ADM_param_uint32_t ,"4294967295", 0, static_cast<float>(4294967295)}, + { FEATURES_CACHE_SIZE,"features.cache_size" ,ADM_param_uint32_t ,"16", 8, 16}, { FEATURES_MPEG_NO_LIMIT,"features.mpeg_no_limit" ,ADM_param_bool ,"0", 0, 1}, - { FEATURES_ALTERNATE_MP3_TAG,"features.alternate_mp3_tag" ,ADM_param_bool ,"1", 0, 1}, - { FEATURES_VDPAU,"features.vdpau" ,ADM_param_bool ,"0", 0, 1}, + { FEATURES_DXVA2,"features.dxva2" ,ADM_param_bool ,"0", 0, 1}, Added: head/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__crashdump__unix.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__crashdump__unix.cpp Sun Feb 23 09:04:44 2020 (r526907) @@ -0,0 +1,13 @@ +--- avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp.orig 2019-08-15 07:25:39 UTC ++++ avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp +@@ -40,8 +40,8 @@ + static ADM_saveFunction *mysaveFunction=NULL; + static ADM_fatalFunction *myFatalFunction=NULL; + static ADM_sigIntFunction *mySigIntFunction=NULL; +-static sighandler_t oldSignalHandlerSigInt; +-static sighandler_t oldSignalHandlerSigSev; ++static sig_t oldSignalHandlerSigInt; ++static sig_t oldSignalHandlerSigSev; + void sig_segfault_handler(int signo); + void sig_sigint_handler(int signo); + Added: head/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__folder__linux.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__folder__linux.cpp Sun Feb 23 09:04:44 2020 (r526907) @@ -0,0 +1,11 @@ +--- avidemux_core/ADM_core/src/ADM_folder_linux.cpp.orig 2019-12-14 18:28:33 UTC ++++ avidemux_core/ADM_core/src/ADM_folder_linux.cpp +@@ -39,7 +39,7 @@ static std::string ADM_i18nDir; + static std::string canonize(const std::string &in) + { + std::string out; +- char *simple2=canonicalize_file_name(in.c_str()); ++ char *simple2=realpath(in.c_str(),nullptr); + if(simple2) + { + out=std::string(simple2)+std::string("/"); Modified: head/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__memsupport.cpp ============================================================================== --- head/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__memsupport.cpp Sun Feb 23 08:58:19 2020 (r526906) +++ head/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__memsupport.cpp Sun Feb 23 09:04:44 2020 (r526907) @@ -1,4 +1,4 @@ ---- avidemux_core/ADM_core/src/ADM_memsupport.cpp.orig 2015-05-15 09:19:29 UTC +--- avidemux_core/ADM_core/src/ADM_memsupport.cpp.orig 2019-08-15 07:25:39 UTC +++ avidemux_core/ADM_core/src/ADM_memsupport.cpp @@ -23,7 +23,7 @@ * (at your option) any later version. * @@ -9,7 +9,7 @@ #include <malloc.h> #endif #include "ADM_default.h" -@@ -79,7 +79,7 @@ void ADM_dezalloc(void *ptr) +@@ -74,7 +74,7 @@ void ADM_dezalloc(void *ptr) ADM_aligned_free(ptr); } Modified: head/multimedia/avidemux/files/patch-avidemux__plugins_CMakeLists.txt ============================================================================== --- head/multimedia/avidemux/files/patch-avidemux__plugins_CMakeLists.txt Sun Feb 23 08:58:19 2020 (r526906) +++ head/multimedia/avidemux/files/patch-avidemux__plugins_CMakeLists.txt Sun Feb 23 09:04:44 2020 (r526907) @@ -1,10 +1,12 @@ ---- avidemux_plugins/CMakeLists.txt.orig 2016-01-31 19:06:53 UTC -+++ avidemux_plugins/CMakeLists.txt -@@ -203,7 +203,6 @@ ADD_SUBDIRECTORY(ADM_videoEncoder) +--- avidemux_plugins/CMakeLists.txt.orig 2019-08-15 09:25:40.000000000 +0200 ++++ avidemux_plugins/CMakeLists.txt 2020-01-10 15:07:57.924344000 +0100 +@@ -265,7 +265,9 @@ + ADD_SUBDIRECTORY(ADM_videoEncoder) ADD_SUBDIRECTORY(ADM_videoFilters6) IF(DO_QT4) ++ IF(NOT DO_COMMON) add_subdirectory(ADM_demuxers/VapourSynth) -- add_subdirectory(ADM_scriptEngines) ++ ENDIF(NOT DO_COMMON) + # add_subdirectory(ADM_scriptEngines) #IF(USE_OPENGL AND NOT WIN32) IF(USE_OPENGL ) - ADD_SUBDIRECTORY(ADM_videoFilters6_openGl) Modified: head/multimedia/avidemux/files/patch-cmake_admCheckMiscLibs.cmake ============================================================================== --- head/multimedia/avidemux/files/patch-cmake_admCheckMiscLibs.cmake Sun Feb 23 08:58:19 2020 (r526906) +++ head/multimedia/avidemux/files/patch-cmake_admCheckMiscLibs.cmake Sun Feb 23 09:04:44 2020 (r526907) @@ -1,11 +1,11 @@ ---- cmake/admCheckMiscLibs.cmake.orig 2015-05-30 14:09:29 UTC +--- cmake/admCheckMiscLibs.cmake.orig 2019-12-14 18:40:01 UTC +++ cmake/admCheckMiscLibs.cmake -@@ -67,7 +67,7 @@ ENDIF (UNIX AND NOT APPLE) +@@ -69,7 +69,7 @@ ENDIF (UNIX AND NOT APPLE) MESSAGE(STATUS "Checking for execinfo") MESSAGE(STATUS "*********************") --FIND_HEADER_AND_LIB(execinfo execinfo.h execinfo backtrace_symbols) +-FIND_HEADER_AND_LIB(EXECINFO execinfo.h c backtrace_symbols) +FIND_HEADER_AND_LIB(EXECINFO execinfo.h execinfo backtrace_symbols) - PRINT_LIBRARY_INFO("execinfo" EXECINFO_FOUND "${LIBEXECINFO_INCLUDE_DIR}" "${LIBEXECINFO_LIBRARY_DIR}") + PRINT_LIBRARY_INFO("execinfo" EXECINFO_FOUND "${EXECINFO_INCLUDE_DIR}" "${EXECINFO_LIBRARY_DIR}") - IF (LIBEXECINFO_INCLUDE_DIR) + IF (EXECINFO_INCLUDE_DIR) Modified: head/multimedia/avidemux/files/patch-cmake_admMainChecks.cmake ============================================================================== --- head/multimedia/avidemux/files/patch-cmake_admMainChecks.cmake Sun Feb 23 08:58:19 2020 (r526906) +++ head/multimedia/avidemux/files/patch-cmake_admMainChecks.cmake Sun Feb 23 09:04:44 2020 (r526907) @@ -1,11 +1,11 @@ ---- cmake/admMainChecks.cmake.orig 2019-06-17 10:41:06 UTC +--- cmake/admMainChecks.cmake.orig 2019-08-15 07:25:40 UTC +++ cmake/admMainChecks.cmake -@@ -81,7 +81,7 @@ ELSE (WIN32) +@@ -117,7 +117,7 @@ ELSE (WIN32) ENDIF (WIN32) if (CMAKE_COMPILER_IS_GNUCC) - add_definitions("-Werror=attributes") + add_definitions("-Wattributes") endif (CMAKE_COMPILER_IS_GNUCC) - # Clang - IF(${CMAKE_CXX_COMPILER} MATCHES ".*[cC]lang.*") + # MacOsX stuff + IF(APPLE) Modified: head/multimedia/avidemux/pkg-plist ============================================================================== --- head/multimedia/avidemux/pkg-plist Sun Feb 23 08:58:19 2020 (r526906) +++ head/multimedia/avidemux/pkg-plist Sun Feb 23 09:04:44 2020 (r526907) @@ -1,14 +1,13 @@ -@mode 0755 -lib/libADM6avcodec.so.56 -lib/libADM6avformat.so.56 -lib/libADM6avutil.so.54 -lib/libADM6postproc.so.53 -lib/libADM6swscale.so.3 -@mode +lib/libADM6avcodec.so.58 +lib/libADM6avformat.so.58 +lib/libADM6avutil.so.56 +lib/libADM6postproc.so.55 +lib/libADM6swscale.so.5 lib/libADM_core6.so lib/libADM_coreAudio6.so lib/libADM_coreImage6.so %%VAAPI%%lib/libADM_coreLibVA6.so +%%VAAPI%%lib/libADM_coreLibVAEnc6.so lib/libADM_coreUI6.so lib/libADM_audioParser6.so lib/libADM_coreAudioDevice6.so @@ -22,49 +21,419 @@ lib/libADM_coreMuxer6.so lib/libADM_coreScript.so lib/libADM_coreSocket6.so lib/libADM_coreSqlLight3.so -lib/libADM_coreSubtitle.so +lib/libADM_coreSubtitles6.so lib/libADM_coreUtils6.so %%VDPAU%%lib/libADM_coreVDPAU6.so lib/libADM_coreVideoCodec6.so lib/libADM_coreVideoEncoder6.so lib/libADM_coreVideoFilter6.so -include/avidemux/2.6/libavutil/buffer.h -include/avidemux/2.6/libavutil/attributes.h -include/avidemux/2.6/libavutil/audioconvert.h -include/avidemux/2.6/libavutil/avconfig.h -include/avidemux/2.6/libavutil/avutil.h -include/avidemux/2.6/libavutil/bswap.h -include/avidemux/2.6/libavutil/channel_layout.h -include/avidemux/2.6/libavutil/common.h -include/avidemux/2.6/libavutil/cpu.h -include/avidemux/2.6/libavutil/dict.h -include/avidemux/2.6/libavutil/error.h -include/avidemux/2.6/libavutil/frame.h -include/avidemux/2.6/libavutil/intfloat.h -include/avidemux/2.6/libavutil/log.h -include/avidemux/2.6/libavutil/macros.h -include/avidemux/2.6/libavutil/mathematics.h -include/avidemux/2.6/libavutil/mem.h -include/avidemux/2.6/libavutil/old_pix_fmts.h -include/avidemux/2.6/libavutil/opt.h -include/avidemux/2.6/libavutil/pixfmt.h -include/avidemux/2.6/libavutil/rational.h -include/avidemux/2.6/libavutil/samplefmt.h -include/avidemux/2.6/libavutil/time.h -include/avidemux/2.6/libavutil/version.h -include/avidemux/2.6/libavcodec/avcodec.h -%%VAAPI%%include/avidemux/2.6/libavcodec/vaapi.h -%%VAAPI%%include/avidemux/2.6/libavcodec/vaapi_internal.h -include/avidemux/2.6/libavcodec/vdpau.h -include/avidemux/2.6/libavcodec/version.h -include/avidemux/2.6/libavcodec/old_codec_ids.h -include/avidemux/2.6/libavformat/avformat.h -include/avidemux/2.6/libavformat/avio.h -include/avidemux/2.6/libavformat/version.h -include/avidemux/2.6/libavformat/flv.h -include/avidemux/2.6/libpostproc/postprocess.h -include/avidemux/2.6/libpostproc/version.h -include/avidemux/2.6/libswscale/swscale.h -include/avidemux/2.6/libswscale/version.h -include/avidemux/2.6/ADM_coreConfig.h -include/avidemux/2.6/ADM_coreConfig.cmake +include/avidemux/2.7/libavutil/buffer.h +include/avidemux/2.7/libavutil/attributes.h +include/avidemux/2.7/libavutil/avconfig.h +include/avidemux/2.7/libavutil/avutil.h +include/avidemux/2.7/libavutil/bswap.h +include/avidemux/2.7/libavutil/channel_layout.h +include/avidemux/2.7/libavutil/common.h +include/avidemux/2.7/libavutil/cpu.h +include/avidemux/2.7/libavutil/dict.h +include/avidemux/2.7/libavutil/error.h +include/avidemux/2.7/libavutil/frame.h +include/avidemux/2.7/libavutil/hwcontext.h +include/avidemux/2.7/libavutil/hwcontext_dxva2.h +include/avidemux/2.7/libavutil/hwcontext_vaapi.h +include/avidemux/2.7/libavutil/hwcontext_vdpau.h +include/avidemux/2.7/libavutil/intfloat.h +include/avidemux/2.7/libavutil/log.h +include/avidemux/2.7/libavutil/macros.h +include/avidemux/2.7/libavutil/mathematics.h +include/avidemux/2.7/libavutil/mem.h +include/avidemux/2.7/libavutil/pixdesc.h +include/avidemux/2.7/libavutil/opt.h +include/avidemux/2.7/libavutil/pixfmt.h +include/avidemux/2.7/libavutil/rational.h +include/avidemux/2.7/libavutil/samplefmt.h +include/avidemux/2.7/libavutil/time.h +include/avidemux/2.7/libavutil/version.h +include/avidemux/2.7/libavcodec/avcodec.h +%%VAAPI%%include/avidemux/2.7/libavcodec/vaapi.h +include/avidemux/2.7/libavcodec/vdpau.h +include/avidemux/2.7/libavcodec/version.h +include/avidemux/2.7/libavcodec/videotoolbox.h +include/avidemux/2.7/libavformat/avformat.h +include/avidemux/2.7/libavformat/avio.h +include/avidemux/2.7/libavformat/version.h +include/avidemux/2.7/libavformat/flv.h +include/avidemux/2.7/libpostproc/postprocess.h +include/avidemux/2.7/libpostproc/version.h +include/avidemux/2.7/libswscale/swscale.h +include/avidemux/2.7/libswscale/version.h +include/avidemux/2.7/ADM_coreConfig.h +include/avidemux/2.7/cmake/ADM_coreConfig.cmake +include/avidemux/2.7/cmake/ADM_coreConfig.h.cmake +include/avidemux/2.7/cmake/DeployQt5.cmake +include/avidemux/2.7/cmake/FindAlsa.cmake +include/avidemux/2.7/cmake/FindArts.cmake +include/avidemux/2.7/cmake/FindBourne.cmake +include/avidemux/2.7/cmake/FindGitSvn.cmake +include/avidemux/2.7/cmake/FindGnuMake.cmake +include/avidemux/2.7/cmake/FindPatch.cmake +include/avidemux/2.7/cmake/FindSDL.cmake +include/avidemux/2.7/cmake/FindSDL2.cmake +include/avidemux/2.7/cmake/FindSubversion.cmake +include/avidemux/2.7/cmake/FindTar.cmake +include/avidemux/2.7/cmake/FindThreads.cmake +include/avidemux/2.7/cmake/Po.cmake +include/avidemux/2.7/cmake/Ts.cmake +include/avidemux/2.7/cmake/_CMakeParseArguments.cmake +include/avidemux/2.7/cmake/_GenerateExportHeader.cmake +include/avidemux/2.7/cmake/ad_plugin.cmake +include/avidemux/2.7/cmake/admAsNeeded.cmake +include/avidemux/2.7/cmake/admCPack.cmake +include/avidemux/2.7/cmake/admCPackRpm.cmake +include/avidemux/2.7/cmake/admCheckAudioDeviceLibs.cmake +include/avidemux/2.7/cmake/admCheckAudioEncoderLibs.cmake +include/avidemux/2.7/cmake/admCheckDca.cmake +include/avidemux/2.7/cmake/admCheckDxva2.cmake +include/avidemux/2.7/cmake/admCheckFaad.cmake +include/avidemux/2.7/cmake/admCheckFdkAac.cmake +include/avidemux/2.7/cmake/admCheckFontConfig.cmake +include/avidemux/2.7/cmake/admCheckFreeType.cmake +include/avidemux/2.7/cmake/admCheckFribidi.cmake +include/avidemux/2.7/cmake/admCheckFtello.cmake +include/avidemux/2.7/cmake/admCheckGettext.cmake +include/avidemux/2.7/cmake/admCheckGtk.cmake +include/avidemux/2.7/cmake/admCheckLibVA.cmake +include/avidemux/2.7/cmake/admCheckLibxml2.cmake +include/avidemux/2.7/cmake/admCheckMiscLibs.cmake +include/avidemux/2.7/cmake/admCheckMiscLibs.cmake.orig +include/avidemux/2.7/cmake/admCheckNvEnc.cmake +include/avidemux/2.7/cmake/admCheckOpenGl.cmake +include/avidemux/2.7/cmake/admCheckOpencore.cmake +include/avidemux/2.7/cmake/admCheckOpus.cmake +include/avidemux/2.7/cmake/admCheckQt.cmake +include/avidemux/2.7/cmake/admCheckQt4.cmake +include/avidemux/2.7/cmake/admCheckQt5.cmake +include/avidemux/2.7/cmake/admCheckRequiredLibs.cmake +include/avidemux/2.7/cmake/admCheckSpiderMonkey.cmake +include/avidemux/2.7/cmake/admCheckVDPAU.cmake +include/avidemux/2.7/cmake/admCheckVapourSynth.cmake +include/avidemux/2.7/cmake/admCheckVideoToolbox.cmake +include/avidemux/2.7/cmake/admCheckVorbisDec.cmake +include/avidemux/2.7/cmake/admCheckVpx.cmake +include/avidemux/2.7/cmake/admCheckX264.cmake +include/avidemux/2.7/cmake/admCheckX265.cmake +include/avidemux/2.7/cmake/admCheckXvba.cmake +include/avidemux/2.7/cmake/admCheckXvid.cmake +include/avidemux/2.7/cmake/admCmakeParseArgument.cmake +include/avidemux/2.7/cmake/admConfigHelper.cmake +include/avidemux/2.7/cmake/admConfigSummary.cmake +include/avidemux/2.7/cmake/admCoreIncludes.cmake +include/avidemux/2.7/cmake/admCoreIncludesExternalBuild.cmake +include/avidemux/2.7/cmake/admCrossCompile.cmake +include/avidemux/2.7/cmake/admCrossQt4.cmake +include/avidemux/2.7/cmake/admDebianUtils.cmake +include/avidemux/2.7/cmake/admDetermineSystem.cmake +include/avidemux/2.7/cmake/admFFmpegBuild.cmake +include/avidemux/2.7/cmake/admFFmpegBuild.cmake.original +include/avidemux/2.7/cmake/admFFmpegBuild_crossMingw.cmake +include/avidemux/2.7/cmake/admFFmpegBuild_helpers.cmake +include/avidemux/2.7/cmake/admFFmpegBuild_native.cmake +include/avidemux/2.7/cmake/admFFmpegBuild_vs.cmake +include/avidemux/2.7/cmake/admFFmpegBuild_vs_import.cmake +include/avidemux/2.7/cmake/admFFmpegPrepareGit.cmake +include/avidemux/2.7/cmake/admFFmpegPrepareSvn.cmake +include/avidemux/2.7/cmake/admFFmpegPrepareTar.cmake +include/avidemux/2.7/cmake/admFFmpegUtil.cmake +include/avidemux/2.7/cmake/admFFmpegVersion.cmake +include/avidemux/2.7/cmake/admGetRevision.cmake +include/avidemux/2.7/cmake/admInstallDir.cmake +include/avidemux/2.7/cmake/admMainChecks.cmake +include/avidemux/2.7/cmake/admMainChecks.cmake.orig +include/avidemux/2.7/cmake/admOpenGl.cmake +include/avidemux/2.7/cmake/admPackager.cmake +include/avidemux/2.7/cmake/admPluginLocation.cmake +include/avidemux/2.7/cmake/admPluginVideoEncoder.cmake +include/avidemux/2.7/cmake/admQtMacro.cmake +include/avidemux/2.7/cmake/admTimeStamp.cmake +include/avidemux/2.7/cmake/admWindRes.cmake +include/avidemux/2.7/cmake/admYasm.cmake +include/avidemux/2.7/cmake/admYasm_gcc.cmake +include/avidemux/2.7/cmake/admYasm_vs.cmake +include/avidemux/2.7/cmake/adm_log.cmake +include/avidemux/2.7/cmake/ae_plugin.cmake +include/avidemux/2.7/cmake/av_plugin.cmake +include/avidemux/2.7/cmake/avidemuxVersion.cmake +include/avidemux/2.7/cmake/cmake_compile_check/CheckFunctionExists.c +include/avidemux/2.7/cmake/cmake_compile_check/check_vdpau.cpp +include/avidemux/2.7/cmake/cmake_compile_check/cpu_arm64_check.cpp +include/avidemux/2.7/cmake/cmake_compile_check/cpu_armel_check.cpp +include/avidemux/2.7/cmake/cmake_compile_check/cpu_x86-64_check.cpp +include/avidemux/2.7/cmake/cmake_compile_check/cpu_x86_check.cpp +include/avidemux/2.7/cmake/cmake_compile_check/dxva2.c +include/avidemux/2.7/cmake/cmake_compile_check/execinfo.cpp +include/avidemux/2.7/cmake/cmake_compile_check/faad_check.cpp +include/avidemux/2.7/cmake/cmake_compile_check/ftello.cpp +include/avidemux/2.7/cmake/cmake_compile_check/gettext.cpp +include/avidemux/2.7/cmake/cmake_compile_check/gtk_x11_check.cpp +include/avidemux/2.7/cmake/cmake_compile_check/iconv_check.cpp +include/avidemux/2.7/cmake/cmake_compile_check/libva.cpp +include/avidemux/2.7/cmake/cmake_compile_check/libva_dummy.cpp +include/avidemux/2.7/cmake/cmake_compile_check/libva_hevcdec.cpp +include/avidemux/2.7/cmake/cmake_compile_check/libva_vp9dec.cpp +include/avidemux/2.7/cmake/cmake_compile_check/os_bsd_check.cpp +include/avidemux/2.7/cmake/commonCmakeApplication.cmake +include/avidemux/2.7/cmake/config.h.cmake +include/avidemux/2.7/cmake/debianArch.cmake +include/avidemux/2.7/cmake/dm_plugin.cmake +include/avidemux/2.7/cmake/ffmpeg_configure.sh.cmake +include/avidemux/2.7/cmake/ffmpeg_make.sh.cmake +include/avidemux/2.7/cmake/mx_plugin.cmake +include/avidemux/2.7/cmake/plugin_cli.cmake +include/avidemux/2.7/cmake/plugin_qt4.cmake +include/avidemux/2.7/cmake/se_plugin.cmake +include/avidemux/2.7/cmake/vd_plugin.cmake +include/avidemux/2.7/cmake/ve_plugin.cmake +include/avidemux/2.7/cmake/ve_plugin_qt4.cmake +include/avidemux/2.7/cmake/ve_settings_plugin.cmake +include/avidemux/2.7/cmake/vf_plugin.cmake +include/avidemux/2.7/cmake/vf_plugin_cli.cmake +include/avidemux/2.7/cmake/vf_plugin_gtk.cmake +include/avidemux/2.7/cmake/vf_plugin_qt4.cmake +include/avidemux/2.7/cmake/vf_plugin_qt4gl.cmake +@dir include/avidemux/2.7/cmake/osx +@dir include/avidemux/2.7/cmake/sql +include/avidemux/2.7/ADM_core/ADM_assert.h +include/avidemux/2.7/ADM_core/ADM_byteBuffer.h +include/avidemux/2.7/ADM_core/ADM_clock.h +include/avidemux/2.7/ADM_core/ADM_core6_export.h +include/avidemux/2.7/ADM_core/ADM_coreTranslator.h +include/avidemux/2.7/ADM_core/ADM_cpp.h +include/avidemux/2.7/ADM_core/ADM_cpuCap.h +include/avidemux/2.7/ADM_core/ADM_crashdump.h +include/avidemux/2.7/ADM_core/ADM_crashdump_apple.h +include/avidemux/2.7/ADM_core/ADM_crashdump_mingw.h +include/avidemux/2.7/ADM_core/ADM_crashdump_other.h +include/avidemux/2.7/ADM_core/ADM_crashdump_unix.h +include/avidemux/2.7/ADM_core/ADM_crashdump_vs.h +include/avidemux/2.7/ADM_core/ADM_default.h +include/avidemux/2.7/ADM_core/ADM_dynamicLoading.h +include/avidemux/2.7/ADM_core/ADM_files.h +include/avidemux/2.7/ADM_core/ADM_inttype.h +include/avidemux/2.7/ADM_core/ADM_mangle.h +include/avidemux/2.7/ADM_core/ADM_mangle_gcc.h +include/avidemux/2.7/ADM_core/ADM_mangle_vs.h +include/avidemux/2.7/ADM_core/ADM_memsupport.h +include/avidemux/2.7/ADM_core/ADM_misc.h +include/avidemux/2.7/ADM_core/ADM_prettyPrint.h +include/avidemux/2.7/ADM_core/ADM_ptrQueue.h +include/avidemux/2.7/ADM_core/ADM_queue.h +include/avidemux/2.7/ADM_core/ADM_threads.h +include/avidemux/2.7/ADM_core/ADM_vidMisc.h +include/avidemux/2.7/ADM_core/ADM_win32.h +include/avidemux/2.7/ADM_core/BVector.h +include/avidemux/2.7/ADM_core/admx86inc.asm +include/avidemux/2.7/ADM_core/admx86util.asm +include/avidemux/2.7/ADM_coreAudio/ADM_audioAccessFile.h +include/avidemux/2.7/ADM_coreAudio/ADM_audioAccessFileAACADTS.h +include/avidemux/2.7/ADM_coreAudio/ADM_audioClock.h +include/avidemux/2.7/ADM_coreAudio/ADM_audioCodecEnum.h +include/avidemux/2.7/ADM_coreAudio/ADM_audioIdentify.h +include/avidemux/2.7/ADM_coreAudio/ADM_audioStream.h *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002230904.01N94iDh084286>