summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2020-09-27 17:49:35 +0000
committerTobias C. Berner <tcberner@FreeBSD.org>2020-09-27 17:49:35 +0000
commit60f6f7f6a93a72935c96df4ca6e2cba25f90dbba (patch)
treef607758b130ddecd0398317f6341d994a15ef883
parentPrint the name of the problematic archive on failed extraction (diff)
multimedia/avidemux: update to 2.7.6
2020-07-07: 2.7.6: Another nice release, completely done by Euma * New Feature:Detect and warn when cut points in HEVC video streams may result in grave playback issues despite being on keyframes * New Video Decoder:Add libaom-based AV1 decoder * New Video Encoder:Add libvpx-based VP9 encoder * New Video Filter:Add hardware accelerated deinterlacer and resizer based on VA-API (Linux only) * FFmpeg:Update to the 4.2.3 release * Core:Increase maximum supported resolution to 4096x4096 * Core:Fix crash on macOS with HW accel. decoding enabled and H.264 video streams containing both frame- and field-encoded slices * Encoder:Extend configuration options for NVENC-based H.264 and HEVC encoders, add 2-pass mode * Demuxer:Support MPEG-TS files with duration in excess of 13:15:36 * Demuxer:Use DTS core from DTS XLL audio in MPEG-TS files instead of rejecting the track * Demuxer:Fix mono MP3 audio tracks in MP4 files misdetected as stereo * Demuxer:Try to correct timestamp jitter in MP4 files produced by older Avidemux versions * Muxer:Fix timestamp rounding which caused pseudo-VFR output from CFR sources * Muxer:Fix saving to network shares on Windows using the Mp4 muxer when index should be moved to the start of the file * Muxer:Support LPCM audio in the Mp4 muxer by silently switching to the MOV muxing mode * Muxer:Add support for Vorbis audio to the Mp4 muxer * Filter:Fix "Fade" and "Fade to black", broken on macOS * Filter:Allow to toggle rubber band visibility in "Crop" and "Blacken Borders" video filters * Filter:Fix keyboard input in "Resize" video filter by recalculating values only on moving focus to another field or on accepting dialog * Audio:Add HE-AAC and HE-AACv2 profiles to the FDK AAC encoder plugin * Audio:Support external audio tracks in DTS format * UI:Fix navigation slider with RTL locales * UI:Restore the shutdown option in encoding dialog on Windows * Scripting:Add PTS query and keyframe seek methods to Python interface * Miscellaneous:Allow user-defined fragment size for auto-append of chunked MPEG-TS files * Miscellaneous:Improve handling of field-encoded video streams throughout the chain * Miscellaneous:Improve handling of H.264 video streams with parameter sets changing on the fly * Miscellaneous:Try to keep track of video time base throughout the chain * Miscellaneous:Numerous other fixes and polish PR: 249241 Submitted by: Lars Herschke <lhersch@dssgmbh.de>, VVD <vvd@unislabs.com>
Notes
Notes: svn path=/head/; revision=550292
-rw-r--r--multimedia/avidemux-plugins/Makefile2
-rw-r--r--multimedia/avidemux-plugins/pkg-plist192
-rw-r--r--multimedia/avidemux-qt5/Makefile4
-rw-r--r--multimedia/avidemux-qt5/pkg-plist1
-rw-r--r--multimedia/avidemux/Makefile2
-rw-r--r--multimedia/avidemux/Makefile.common18
-rw-r--r--multimedia/avidemux/distinfo8
-rw-r--r--multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch29
-rw-r--r--multimedia/avidemux/pkg-plist9
9 files changed, 136 insertions, 129 deletions
diff --git a/multimedia/avidemux-plugins/Makefile b/multimedia/avidemux-plugins/Makefile
index 2f49d7226e9a..165ead88754b 100644
--- a/multimedia/avidemux-plugins/Makefile
+++ b/multimedia/avidemux-plugins/Makefile
@@ -3,7 +3,7 @@
PORTNAME= avidemux
PORTVERSION= ${AVIDEMUX_VERSION}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= multimedia
PKGNAMESUFFIX= -plugins
diff --git a/multimedia/avidemux-plugins/pkg-plist b/multimedia/avidemux-plugins/pkg-plist
index 16dd02c57dc0..e6b49ee77488 100644
--- a/multimedia/avidemux-plugins/pkg-plist
+++ b/multimedia/avidemux-plugins/pkg-plist
@@ -1,128 +1,142 @@
+%%VAPOURSYNTH%%bin/vsProxy
+%%VAPOURSYNTH%%%%QT5%%bin/vsProxy_gui_qt5
lib/ADM_plugins6/audioDecoder/libADM_ad_Mad.so
lib/ADM_plugins6/audioDecoder/libADM_ad_a52.so
%%DCA%%lib/ADM_plugins6/audioDecoder/libADM_ad_dca.so
+%%FAAD%%lib/ADM_plugins6/audioDecoder/libADM_ad_faad.so
+lib/ADM_plugins6/audioDecoder/libADM_ad_ima_adpcm.so
lib/ADM_plugins6/audioDecoder/libADM_ad_lav.so
+lib/ADM_plugins6/audioDecoder/libADM_ad_ms_adpcm.so
+%%AMRNB%%lib/ADM_plugins6/audioDecoder/libADM_ad_opencore_amrnb.so
+%%AMRWB%%lib/ADM_plugins6/audioDecoder/libADM_ad_opencore_amrwb.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
+%%JACK%%lib/ADM_plugins6/audioDevices/libADM_av_jack.so
%%OSS%%lib/ADM_plugins6/audioDevices/libADM_av_oss.so
-%%OPUS%%lib/ADM_plugins6/audioEncoders/libADM_ae_opus.so
+%%PULSEAUDIO%%lib/ADM_plugins6/audioDevices/libADM_av_pulseAudioSimple.so
+%%FAAC%%lib/ADM_plugins6/audioEncoders/libADM_ae_faac.so
+%%FDK%%lib/ADM_plugins6/audioEncoders/libADM_ae_fdk_aac.so
%%LAME%%lib/ADM_plugins6/audioEncoders/libADM_ae_lame.so
+lib/ADM_plugins6/audioEncoders/libADM_ae_lav_aac.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
+%%OPUS%%lib/ADM_plugins6/audioEncoders/libADM_ae_opus.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_jpeg.so
-lib/ADM_plugins6/videoEncoders/libADM_ve_huff.so
+%%VORBIS%%lib/ADM_plugins6/audioEncoders/libADM_ae_vorbis.so
+lib/ADM_plugins6/autoScripts/720p.py
+lib/ADM_plugins6/autoScripts/PSP.py
+lib/ADM_plugins6/autoScripts/check24fps.py
+lib/ADM_plugins6/autoScripts/dvd.py
+lib/ADM_plugins6/autoScripts/lib/ADM_image.py
+lib/ADM_plugins6/autoScripts/lib/ADM_imageInfo.py
+lib/ADM_plugins6/autoScripts/svcd.py
+lib/ADM_plugins6/autoScripts/vcd.py
+lib/ADM_plugins6/demuxers/libADM_dm_asf.so
+lib/ADM_plugins6/demuxers/libADM_dm_avsproxy.so
+lib/ADM_plugins6/demuxers/libADM_dm_flv.so
+lib/ADM_plugins6/demuxers/libADM_dm_matroska.so
+lib/ADM_plugins6/demuxers/libADM_dm_mp4.so
+lib/ADM_plugins6/demuxers/libADM_dm_mxf.so
+lib/ADM_plugins6/demuxers/libADM_dm_opendml.so
+lib/ADM_plugins6/demuxers/libADM_dm_pic.so
+lib/ADM_plugins6/demuxers/libADM_dm_ps.so
+lib/ADM_plugins6/demuxers/libADM_dm_ts.so
+%%VAPOURSYNTH%%lib/ADM_plugins6/demuxers/libADM_dm_vapoursynth.so
+lib/ADM_plugins6/muxers/libADM_mx_Mkv.so
+lib/ADM_plugins6/muxers/libADM_mx_Webm.so
+lib/ADM_plugins6/muxers/libADM_mx_avi.so
+lib/ADM_plugins6/muxers/libADM_mx_dummy.so
+lib/ADM_plugins6/muxers/libADM_mx_ffPS.so
+lib/ADM_plugins6/muxers/libADM_mx_ffTS.so
+lib/ADM_plugins6/muxers/libADM_mx_flv.so
+lib/ADM_plugins6/muxers/libADM_mx_mp4.so
+lib/ADM_plugins6/muxers/libADM_mx_mp4v2.so
+lib/ADM_plugins6/muxers/libADM_mx_raw.so
+%%X264%%lib/ADM_plugins6/pluginSettings/x264/3/PSP.json
+%%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/ultraFast.json
+%%X264%%lib/ADM_plugins6/pluginSettings/x264/3/veryFast.json
+%%TINYPY%%lib/ADM_plugins6/scriptEngines/libADM_script_tinyPy.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
+%%AOM%%lib/ADM_plugins6/videoDecoders/libADM_vd_aom.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/videoEncoders/libADM_ve_ffMpeg2.so
+lib/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg4.so
%%VAAPI%%lib/ADM_plugins6/videoEncoders/libADM_ve_ffVaEncH264.so
%%VAAPI%%lib/ADM_plugins6/videoEncoders/libADM_ve_ffVaEncHEVC.so
+lib/ADM_plugins6/videoEncoders/libADM_ve_huff.so
+lib/ADM_plugins6/videoEncoders/libADM_ve_jpeg.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/videoEncoders/libADM_ve_null.so
+%%VPX%%lib/ADM_plugins6/videoEncoders/libADM_ve_vp9.so
+%%X264%%lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so
+%%X265%%lib/ADM_plugins6/videoEncoders/libADM_ve_x265_other.so
+%%XVID%%lib/ADM_plugins6/videoEncoders/libADM_ve_xvid4.so
+lib/ADM_plugins6/videoEncoders/libADM_ve_yv12.so
+%%X264%%%%QT5%%lib/ADM_plugins6/videoEncoders/qt5/libADM_ve_x264_QT5.so
+%%X265%%%%QT5%%lib/ADM_plugins6/videoEncoders/qt5/libADM_ve_x265_QT5.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_blackenBordersCli.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_logoCli.so
+%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_mpdelogoCli.so
+%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_msharpenCli.so
+%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_swscaleResize_cli.so
+lib/ADM_plugins6/videoFilters/libADM_vf_DgBob.so
+lib/ADM_plugins6/videoFilters/libADM_vf_FluxSmooth.so
lib/ADM_plugins6/videoFilters/libADM_vf_addBorders.so
-lib/ADM_plugins6/videoFilters/libADM_vf_avsfilter.so
lib/ADM_plugins6/videoFilters/libADM_vf_admIvtc.so
+lib/ADM_plugins6/videoFilters/libADM_vf_ascii.so
+lib/ADM_plugins6/videoFilters/libADM_vf_avsfilter.so
lib/ADM_plugins6/videoFilters/libADM_vf_black.so
+lib/ADM_plugins6/videoFilters/libADM_vf_blend.so
lib/ADM_plugins6/videoFilters/libADM_vf_changeFps.so
lib/ADM_plugins6/videoFilters/libADM_vf_colorYuv.so
-lib/ADM_plugins6/videoFilters/libADM_vf_ascii.so
-lib/ADM_plugins6/videoFilters/libADM_vf_DgBob.so
+lib/ADM_plugins6/videoFilters/libADM_vf_denoise3d.so
+lib/ADM_plugins6/videoFilters/libADM_vf_denoise3dhq.so
lib/ADM_plugins6/videoFilters/libADM_vf_dummy.so
lib/ADM_plugins6/videoFilters/libADM_vf_fadeTo.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
-%%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_vf_hflip.so
+lib/ADM_plugins6/videoFilters/libADM_vf_hzstackField.so
+lib/ADM_plugins6/videoFilters/libADM_vf_ivtcDupeRemover.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_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_stillimage.so
+lib/ADM_plugins6/videoFilters/libADM_vf_mean.so
+lib/ADM_plugins6/videoFilters/libADM_vf_median.so
+lib/ADM_plugins6/videoFilters/libADM_vf_mergeField.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_separateField.so
+lib/ADM_plugins6/videoFilters/libADM_vf_sharpen.so
+%%FRIBIDI%%lib/ADM_plugins6/videoFilters/libADM_vf_ssa.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_stillimage.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
-%%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
-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
-%%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
-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
-%%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
-%%PULSEAUDIO%%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
+lib/ADM_plugins6/videoFilters/libADM_vf_unstackField.so
+%%VAAPI%%lib/ADM_plugins6/videoFilters/libADM_vf_vaapiFilter.so
+%%VAAPI%%lib/ADM_plugins6/videoFilters/libADM_vf_vaapiFilterDeint.so
%%VDPAU%%lib/ADM_plugins6/videoFilters/libADM_vf_vdpauFilter.so
%%VDPAU%%lib/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.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_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
+lib/ADM_plugins6/videoFilters/libADM_vf_vflip.so
+lib/ADM_plugins6/videoFilters/libADM_vf_yadif.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
@@ -131,6 +145,7 @@ lib/ADM_plugins6/autoScripts/lib/ADM_image.py
%%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_logoQT5.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
@@ -138,16 +153,5 @@ lib/ADM_plugins6/autoScripts/lib/ADM_image.py
%%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
diff --git a/multimedia/avidemux-qt5/Makefile b/multimedia/avidemux-qt5/Makefile
index d092a49fcd81..f490de13c452 100644
--- a/multimedia/avidemux-qt5/Makefile
+++ b/multimedia/avidemux-qt5/Makefile
@@ -5,10 +5,6 @@ PORTVERSION= ${AVIDEMUX_VERSION}
CATEGORIES= multimedia
PKGNAMESUFFIX= -qt5
-# Prepare for Qt5.15
-PATCH_SITES= https://github.com/mean00/${PORTNAME}2/commit/
-PATCHFILES= 1a8bb36c5a03.patch:-p1
-
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Simple GUI based video editor (QT5 UI)
diff --git a/multimedia/avidemux-qt5/pkg-plist b/multimedia/avidemux-qt5/pkg-plist
index 860407fa2222..4cf57811feaa 100644
--- a/multimedia/avidemux-qt5/pkg-plist
+++ b/multimedia/avidemux-qt5/pkg-plist
@@ -29,6 +29,7 @@ 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_sk.qm
share/avidemux6/qt5/i18n/avidemux_sr.qm
share/avidemux6/qt5/i18n/avidemux_sr@latin.qm
share/avidemux6/qt5/i18n/avidemux_tr.qm
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index 8314bb06cb0e..ebf8fedd60a1 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -6,7 +6,7 @@
PORTNAME= avidemux
PORTVERSION= ${AVIDEMUX_VERSION}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= multimedia
MAINTAINER= multimedia@FreeBSD.org
diff --git a/multimedia/avidemux/Makefile.common b/multimedia/avidemux/Makefile.common
index 859100f0e373..bbb9c52501bc 100644
--- a/multimedia/avidemux/Makefile.common
+++ b/multimedia/avidemux/Makefile.common
@@ -1,6 +1,6 @@
# $FreeBSD$
-AVIDEMUX_VERSION= 2.7.4
+AVIDEMUX_VERSION= 2.7.6
MASTER_SITES= \
SF/avidemux/avidemux/${PORTVERSION}
DISTNAME= avidemux_${PORTVERSION}
@@ -35,13 +35,14 @@ MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
OPTIONS_DEFINE= CLI FREETYPE FONTCONFIG OSS JACK PULSEAUDIO \
XVIDEO FAAC FRIBIDI OPUS TWOLAME \
- FAAD X264 X265 VPX XVID AMR VORBIS NLS LAME VAAPI VDPAU \
+ FAAD X264 X265 VPX AOM XVID AMR VORBIS NLS LAME VAAPI VDPAU \
DCA FDK QT5 TINYPY VAPOURSYNTH
OPTIONS_DEFAULT= FREETYPE FONTCONFIG OSS XVIDEO VPX XVID \
FAAD VDPAU VORBIS DCA FDK QT5 TINYPY VAPOURSYNTH \
PULSEAUDIO
OPTIONS_SUB= yes
+AOM_DESC= AOM AV1 decoder support
CLI_DESC= Build CLI tool
FDK_DESC= FDK AAC codec support
TINYPY_DESC= Python scripting support via TinyPy
@@ -196,8 +197,18 @@ PLIST_SUB+= X265="@comment "
.if ${PORT_OPTIONS:MVPX}
LIB_DEPENDS+= libvpx.so:multimedia/libvpx
+PLIST_SUB+= VPX=""
.else
-CMAKE_ARGS+= -DVPXDEC:BOOL=OFF
+CMAKE_ARGS+= -DVPXDEC:BOOL=OFF -DVPXENC:BOOL=OFF
+PLIST_SUB+= VPX="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MAOM}
+LIB_DEPENDS+= libaom.so:multimedia/aom
+PLIST_SUB+= AOM=""
+.else
+CMAKE_ARGS+= -DAOMDEC:BOOL=OFF
+PLIST_SUB+= AOM="@comment "
.endif
.if ${PORT_OPTIONS:MXVID}
@@ -284,6 +295,7 @@ post-patch:
@${MKDIR} ${CONFIGURE_WRKSRC}/config
@${LN} -s ${LOCALBASE}/include/iconv.h ${CONFIGURE_WRKSRC}/config
@${REINPLACE_CMD} 's|-ldl||' ${WRKSRC}/avidemux_core/CMakeLists.txt
+ @${FIND} ${WRKSRC}/cmake -name '*.cmake.orig' -delete
post-configure-common:
@${FIND} ${CONFIGURE_WRKSRC} -name link.txt -print0 | \
diff --git a/multimedia/avidemux/distinfo b/multimedia/avidemux/distinfo
index 687f5e128335..3b24b461d0a8 100644
--- a/multimedia/avidemux/distinfo
+++ b/multimedia/avidemux/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1592902649
-SHA256 (avidemux_2.7.4.tar.gz) = 7db0ac01c8255279a2c360ecb2725c27ea8a2c5bd1f38aeafabfed33ea588da9
-SIZE (avidemux_2.7.4.tar.gz) = 23946276
-SHA256 (1a8bb36c5a03.patch) = 46e03497445281b11a405fa446f0021c4a9eadeaa5b1e4970fda689d9b4160fc
-SIZE (1a8bb36c5a03.patch) = 753
+TIMESTAMP = 1599091359
+SHA256 (avidemux_2.7.6.tar.gz) = 9a88741f3535443d4bde35d4207ca2ff96d3b136db2e7232cb50dd6b4eb293cf
+SIZE (avidemux_2.7.6.tar.gz) = 24372770
diff --git a/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch b/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch
index 180e870986ea..fd41b543cc23 100644
--- a/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch
+++ b/multimedia/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch
@@ -1,19 +1,14 @@
---- avidemux_core/ffmpeg_package/patches/configure.patch.orig 2015-06-01 05:59:45 UTC
+--- avidemux_core/ffmpeg_package/patches/configure.patch.orig
+++ avidemux_core/ffmpeg_package/patches/configure.patch
-@@ -0,0 +1,16 @@
-+--- configure.orig 2015-03-16 20:26:04.000000000 +0100
+@@ -0,0 +1,11 @@
++--- configure.orig
++++ configure
-+@@ -2733,12 +2733,7 @@
-+ host_os=$target_os_default
-+
-+ # machine
-+-if test "$target_os_default" = aix; then
-+- arch_default=$(uname -p)
-+- strip_default="strip -X32_64"
-+-else
-+- arch_default=$(uname -m)
-+-fi
-++arch_default=$(uname -p)
-+ cpu="generic"
-+ intrinsics="none"
-+
++@@ -3671,6 +3671,8 @@
++ arch_default=$(uname -p)
++ strip_default="strip -X32_64"
++ nm_default="nm -g -X32_64"
+++elif test "$target_os_default" = freebsd; then
+++ arch_default=$(uname -p)
++ else
++ arch_default=$(uname -m)
++ fi
diff --git a/multimedia/avidemux/pkg-plist b/multimedia/avidemux/pkg-plist
index 14f219117fad..824cfbe6d8a5 100644
--- a/multimedia/avidemux/pkg-plist
+++ b/multimedia/avidemux/pkg-plist
@@ -83,13 +83,13 @@ 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/admCheckAom.cmake
include/avidemux/2.7/cmake/admCheckAudioDeviceLibs.cmake
include/avidemux/2.7/cmake/admCheckAudioEncoderLibs.cmake
include/avidemux/2.7/cmake/admCheckDca.cmake
@@ -105,7 +105,6 @@ 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
@@ -115,6 +114,7 @@ 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/admCheckSqlLite.cmake
include/avidemux/2.7/cmake/admCheckVDPAU.cmake
include/avidemux/2.7/cmake/admCheckVapourSynth.cmake
include/avidemux/2.7/cmake/admCheckVideoToolbox.cmake
@@ -148,7 +148,6 @@ 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
@@ -181,6 +180,9 @@ 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/cmake_win32_rc/VersionInfo.in
+include/avidemux/2.7/cmake/cmake_win32_rc/VersionResource.rc
+include/avidemux/2.7/cmake/cmake_win32_rc/generate_product_version.cmake
include/avidemux/2.7/cmake/commonCmakeApplication.cmake
include/avidemux/2.7/cmake/config.h.cmake
include/avidemux/2.7/cmake/debianArch.cmake
@@ -338,7 +340,6 @@ include/avidemux/2.7/ADM_coreJobs/sqlJobs.h
%%VAAPI%%include/avidemux/2.7/ADM_coreLibVAEnc/ADM_coreLibVA_encodingContext.h
%%VAAPI%%include/avidemux/2.7/ADM_coreLibVAEnc/ADM_coreLibVA_h264Encoding.h
%%VAAPI%%include/avidemux/2.7/ADM_coreLibVAEnc/ADM_coreLibVA_hevcEncoding.h
-include/avidemux/2.7/ADM_coreMuxer/.ADM_muxer.h.swp
include/avidemux/2.7/ADM_coreMuxer/ADM_coreMuxer6_export.h
include/avidemux/2.7/ADM_coreMuxer/ADM_coreMuxerFfmpeg.h
include/avidemux/2.7/ADM_coreMuxer/ADM_muxer.h