diff --git a/multimedia/avidemux-cli/Makefile b/multimedia/avidemux-cli/Makefile index 14c08ffb3823..a75a01af739c 100644 --- a/multimedia/avidemux-cli/Makefile +++ b/multimedia/avidemux-cli/Makefile @@ -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 diff --git a/multimedia/avidemux-cli/pkg-plist b/multimedia/avidemux-cli/pkg-plist index eb43ea139c38..ca38e7a7fe53 100644 --- a/multimedia/avidemux-cli/pkg-plist +++ b/multimedia/avidemux-cli/pkg-plist @@ -1,4 +1,5 @@ bin/avidemux3_cli -include/avidemux/2.6/cli/config.h +include/avidemux/2.7/cli/ADM_UIs/ADM_UI_Cli6_export.h +include/avidemux/2.7/cli/config.h lib/libADM_UI_Cli6.so lib/libADM_render6_cli.so diff --git a/multimedia/avidemux-plugins/Makefile b/multimedia/avidemux-plugins/Makefile index 98297ec75531..f598a2b7c28d 100644 --- a/multimedia/avidemux-plugins/Makefile +++ b/multimedia/avidemux-plugins/Makefile @@ -3,14 +3,13 @@ PORTNAME= avidemux PORTVERSION= ${AVIDEMUX_VERSION} -PORTREVISION= 17 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 @@ -24,13 +23,13 @@ CMAKE_ARGS+= -DAVIDEMUX_SOURCE_DIR=${WRKSRC} -DAVIDEMUX_INSTALL_PREFIX:PATH="${P CMAKE_ARGS+= -DPLUGIN_UI=ALL .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 .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 +BUILD_DEPENDS+= ${LOCALBASE}/include/avidemux/2.7/gtk/config.h:multimedia/avidemux-gtk +RUN_DEPENDS+= ${LOCALBASE}/include/avidemux/2.7/gtk/config.h:multimedia/avidemux-gtk .endif post-configure: post-configure-common diff --git a/multimedia/avidemux-plugins/pkg-plist b/multimedia/avidemux-plugins/pkg-plist index f5c9d2ea83e7..c9318f725798 100644 --- a/multimedia/avidemux-plugins/pkg-plist +++ b/multimedia/avidemux-plugins/pkg-plist @@ -1,113 +1,119 @@ lib/ADM_plugins6/audioDecoder/libADM_ad_Mad.so lib/ADM_plugins6/audioDecoder/libADM_ad_a52.so 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 lib/ADM_plugins6/audioDevices/libADM_av_oss.so +%%PULSE%%lib/ADM_plugins6/audioDevices/libADM_av_pulseAudioSimple.so +%%FAAC%%lib/ADM_plugins6/audioEncoders/libADM_ae_faac.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_png.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 +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 +lib/ADM_plugins6/scriptEngines/libADM_script_tinyPy.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_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 lib/ADM_plugins6/videoEncoders/libADM_ve_null.so +%%CLI%%lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so +%%CLI%%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 +%%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_admIvtc.so +lib/ADM_plugins6/videoFilters/libADM_vf_ascii.so lib/ADM_plugins6/videoFilters/libADM_vf_avsfilter.so -lib/ADM_plugins6/videoFilters/libADM_vf_blackenBorders.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_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%%%%FREETYPE%%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_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_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_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 -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 -%%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 +lib/ADM_plugins6/videoFilters/libADM_vf_unstackField.so +%%VAAPI%%lib/ADM_plugins6/videoFilters/libADM_vf_vaapiFilter.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 -%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_CropCli.so -%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_HueCli.so -%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_chromaShiftCli.so -%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_contrastCli.so -%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_eq2Cli.so -%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_mpdelogoCli.so -%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_swscaleResize_cli.so +lib/ADM_plugins6/videoFilters/libADM_vf_vflip.so +lib/ADM_plugins6/videoFilters/libADM_vf_yadif.so diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile index 236b9f8a44ae..e20241ecc744 100644 --- a/multimedia/avidemux/Makefile +++ b/multimedia/avidemux/Makefile @@ -6,7 +6,6 @@ PORTNAME= avidemux PORTVERSION= ${AVIDEMUX_VERSION} -PORTREVISION= 15 CATEGORIES= multimedia MAINTAINER= multimedia@FreeBSD.org diff --git a/multimedia/avidemux/Makefile.common b/multimedia/avidemux/Makefile.common index 7c3eda6992f8..2e86d13883cc 100644 --- a/multimedia/avidemux/Makefile.common +++ b/multimedia/avidemux/Makefile.common @@ -1,6 +1,6 @@ # $FreeBSD$ -AVIDEMUX_VERSION= 2.6.11 +AVIDEMUX_VERSION= 2.7.4 MASTER_SITES= \ SF/avidemux/avidemux/${PORTVERSION} DISTNAME= avidemux_${PORTVERSION} diff --git a/multimedia/avidemux/distinfo b/multimedia/avidemux/distinfo index 750531a8d8b9..fa66b715b741 100644 --- a/multimedia/avidemux/distinfo +++ b/multimedia/avidemux/distinfo @@ -1,2 +1,3 @@ -SHA256 (avidemux_2.6.11.tar.gz) = 936ff5e10ad0551460c1233c217e4cee642623f2899a8fe48cd7f0144cfd1b3a -SIZE (avidemux_2.6.11.tar.gz) = 17980757 +TIMESTAMP = 1576346096 +SHA256 (avidemux_2.7.4.tar.gz) = 7db0ac01c8255279a2c360ecb2725c27ea8a2c5bd1f38aeafabfed33ea588da9 +SIZE (avidemux_2.7.4.tar.gz) = 23946276 diff --git a/multimedia/avidemux/files/patch-avidemux__core_ADM__coreUtils_src_prefs2__pref.h b/multimedia/avidemux/files/patch-avidemux__core_ADM__coreUtils_src_prefs2__pref.h index e6f3392ba6a6..b5a55df5f638 100644 --- a/multimedia/avidemux/files/patch-avidemux__core_ADM__coreUtils_src_prefs2__pref.h +++ b/multimedia/avidemux/files/patch-avidemux__core_ADM__coreUtils_src_prefs2__pref.h @@ -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(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}, diff --git a/multimedia/avidemux/files/patch-avidemux__core_ADM__coreVideoCodec_include_ADM__ffmp43.h b/multimedia/avidemux/files/patch-avidemux__core_ADM__coreVideoCodec_include_ADM__ffmp43.h deleted file mode 100644 index 4ad148658e39..000000000000 --- a/multimedia/avidemux/files/patch-avidemux__core_ADM__coreVideoCodec_include_ADM__ffmp43.h +++ /dev/null @@ -1,28 +0,0 @@ ---- avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h.orig 2017-05-21 11:18:35 UTC -+++ avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h -@@ -180,7 +180,7 @@ ADM_COREVIDEOCODEC6_EXPORT void ADM_lavD - #define WRAP_Open_Template(funcz,argz,display,codecid,extra) \ - {\ - AVCodec *codec=funcz(argz);\ --if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec"display));ADM_assert(0);} \ -+if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec" display));ADM_assert(0);} \ - codecId=codecid; \ - _context = avcodec_alloc_context3 (codec);\ - ADM_assert (_context);\ -@@ -210,13 +210,13 @@ if(!codec) {GUI_Error_HIG("Codec",QT_TR_ - \ - if (avcodec_open2(_context, codec, NULL) < 0) \ - { \ -- printf("[lavc] Decoder init: "display" video decoder failed!\n"); \ -- GUI_Error_HIG("Codec","Internal error opening "display); \ -+ printf("[lavc] Decoder init: " display " video decoder failed!\n"); \ -+ GUI_Error_HIG("Codec","Internal error opening " display); \ - ADM_assert(0); \ - } \ - else \ - { \ -- printf("[lavc] Decoder init: "display" video decoder initialized! (%s)\n",codec->long_name); \ -+ printf("[lavc] Decoder init: " display " video decoder initialized! (%s)\n",codec->long_name); \ - } \ - } - diff --git a/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__crashdump__unix.cpp b/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__crashdump__unix.cpp new file mode 100644 index 000000000000..1a5856987fca --- /dev/null +++ b/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__crashdump__unix.cpp @@ -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); + diff --git a/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__folder__linux.cpp b/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__folder__linux.cpp new file mode 100644 index 000000000000..2e8995f97555 --- /dev/null +++ b/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__folder__linux.cpp @@ -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("/"); diff --git a/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__memsupport.cpp b/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__memsupport.cpp index 044843cc0f18..827c1d08f985 100644 --- a/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__memsupport.cpp +++ b/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__memsupport.cpp @@ -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 #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); } diff --git a/multimedia/avidemux/files/patch-avidemux__core_ffmpeg__package_patches_config.mak.diff b/multimedia/avidemux/files/patch-avidemux__core_ffmpeg__package_patches_config.mak.diff deleted file mode 100644 index f27ec3b76574..000000000000 --- a/multimedia/avidemux/files/patch-avidemux__core_ffmpeg__package_patches_config.mak.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- avidemux_core/ffmpeg_package/patches/config.mak.diff.orig 2015-05-15 09:19:29 UTC -+++ avidemux_core/ffmpeg_package/patches/config.mak.diff -@@ -1,6 +1,8 @@ ----- config.mak 2011-09-29 06:10:57 UTC --+++ config.mak 2011-09-29 06:11:44.896423943 +0000 --@@ -59,7 +59,7 @@ -+--- config.mak.orig -++++ config.mak -+@@ -93,7 +93,7 @@ -+ EXEOBJS= -+ INSTALL=install - LIBTARGET= - -SLIBNAME=$(SLIBPREF)$(FULLNAME)$(SLIBSUF) - +SLIBNAME=$(SLIBPREF)ADM6$(FULLNAME)$(SLIBSUF) diff --git a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__demuxers_MpegTS_dmxTSPacket.cpp b/multimedia/avidemux/files/patch-avidemux__plugins_ADM__demuxers_MpegTS_dmxTSPacket.cpp deleted file mode 100644 index c491432c5001..000000000000 --- a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__demuxers_MpegTS_dmxTSPacket.cpp +++ /dev/null @@ -1,53 +0,0 @@ ---- avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp.orig 2016-01-29 08:47:25 UTC -+++ avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp -@@ -144,7 +144,7 @@ bool tsPacket::setPos(uint64_t pos) - { - if(!_file->setpos(pos)) - { -- printf("[tsPacket] Cannot seek to %"PRIx64"\n", pos); -+ printf("[tsPacket] Cannot seek to %" PRIx64"\n", pos); - return false; - } - return true; -@@ -387,7 +387,7 @@ nextPack3: - zprintf("[TS Demuxer] Code=0x%x pid=0x%x\n",code,pes->pid); - if((code&0xffffff00)!=0x100) - { -- printf("[Ts Demuxer] No PES startcode at 0x%"PRIx64"\n",pkt.startAt); -+ printf("[Ts Demuxer] No PES startcode at 0x%" PRIx64"\n",pkt.startAt); - printf("0x:%02x %02x %02x %02x\n",pkt.payload[4],pkt.payload[5],pkt.payload[6],pkt.payload[7]); - goto nextPack3; - } -@@ -433,7 +433,7 @@ nextPack3: - /** - \fn decodePesHeader - */ --#define fail(x) {printf("[Ts Demuxer]*********"x"*******\n");return false;} -+#define fail(x) {printf("[Ts Demuxer]*********" x"*******\n");return false;} - bool tsPacket::decodePesHeader(TS_PESpacket *pes) - { - uint8_t *start=pes->payload+6; -@@ -735,7 +735,7 @@ bool tsPacketLinear::read(uint32_t le - */ - bool tsPacketLinear::getInfo(dmxPacketInfo *info) - { --#warning FIXME -+//#warning FIXME - if(pesPacket->offset<4) - { - info->startAt=this->oldStartAt; -@@ -780,12 +780,12 @@ bool tsPacketLinear::seek(uint64_t pa - { - if(!_file->setpos(packetStart)) - { -- printf("[tsPacket] Cannot seek to %"PRIx64"\n",packetStart); -+ printf("[tsPacket] Cannot seek to %" PRIx64"\n",packetStart); - return 0; - } - if(!refill()) - { -- printf("[tsPacketLinear] Seek to %"PRIx64":%"PRIx32" failed\n",packetStart,offset); -+ printf("[tsPacketLinear] Seek to %" PRIx64":%" PRIx32" failed\n",packetStart,offset); - return false; - } - ADM_assert(offsetpayloadSize); diff --git a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__muxers_muxerMp4v2_libmp4v2_src_rtphint.cpp b/multimedia/avidemux/files/patch-avidemux__plugins_ADM__muxers_muxerMp4v2_libmp4v2_src_rtphint.cpp deleted file mode 100644 index 460fe965602e..000000000000 --- a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__muxers_muxerMp4v2_libmp4v2_src_rtphint.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/rtphint.cpp.orig 2016-01-29 09:47:25.000000000 +0100 -+++ avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/rtphint.cpp 2018-08-01 09:39:54.771441000 +0200 -@@ -339,7 +339,7 @@ - pSlash = strchr(pSlash, '/'); - if (pSlash != NULL) { - pSlash++; -- if (pSlash != '\0') { -+ if (*pSlash) { - length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap); - *ppEncodingParams = (char *)MP4Calloc(length + 1); - strncpy(*ppEncodingParams, pSlash, length); diff --git a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffDv_ADM__ffDv.cpp b/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffDv_ADM__ffDv.cpp deleted file mode 100644 index 2592010dc1b2..000000000000 --- a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffDv_ADM__ffDv.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp.orig 2016-01-29 08:47:25 UTC -+++ avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp -@@ -44,7 +44,7 @@ typedef struct - - static const dvProfileClass supportedProfiles[]= - { -- {720,480,29.97,dvColor422}, -+ {720,480,30,dvColor422}, - {720,576,25,dvColor420}, - }; - diff --git a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffFlv1_ADM__ffFlv1.h b/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffFlv1_ADM__ffFlv1.h deleted file mode 100644 index f1fbaddbfa15..000000000000 --- a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffFlv1_ADM__ffFlv1.h +++ /dev/null @@ -1,14 +0,0 @@ ---- avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h.orig 2016-01-29 08:47:25 UTC -+++ avidemux_plugins/ADM_videoEncoder/ffFlv1/ADM_ffFlv1.h -@@ -43,9 +43,9 @@ - 0, /* max_b_frames */ \ - 0, /* mpeg_quant */ \ - 1, /* is_luma_elim_threshold */ \ -- -2, /* luma_elim_threshold */ \ -+ 0, /* luma_elim_threshold */ \ - 1, /* is_chroma_elim_threshold */ \ -- -5, /* chroma_elim_threshold */ \ -+ 0, /* chroma_elim_threshold */ \ - 0.05, /*lumi_masking */ \ - 1, /* is lumi */ \ - 0.01, /*dark_masking */ \ diff --git a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffMpeg2_ADM__ffMpeg2.h b/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffMpeg2_ADM__ffMpeg2.h deleted file mode 100644 index 187d5097aae0..000000000000 --- a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffMpeg2_ADM__ffMpeg2.h +++ /dev/null @@ -1,14 +0,0 @@ ---- avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h.orig 2016-01-29 08:47:25 UTC -+++ avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h -@@ -53,9 +53,9 @@ enum - 2, /* max_b_frames */ \ - 1, /* mpeg_quant */ \ - 1, /* is_luma_elim_threshold */ \ -- -2, /* luma_elim_threshold */ \ -+ 0, /* luma_elim_threshold */ \ - 1, /* is_chroma_elim_threshold */ \ -- -5, /* chroma_elim_threshold */ \ -+ 0, /* chroma_elim_threshold */ \ - 0.05, /*lumi_masking */ \ - 1, /* is lumi */ \ - 0.01, /*dark_masking */ \ diff --git a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffMpeg4_ADM__ffMpeg4.h b/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffMpeg4_ADM__ffMpeg4.h deleted file mode 100644 index 6fb25a5cc719..000000000000 --- a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffMpeg4_ADM__ffMpeg4.h +++ /dev/null @@ -1,14 +0,0 @@ ---- avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.h.orig 2016-01-29 08:47:25 UTC -+++ avidemux_plugins/ADM_videoEncoder/ffMpeg4/ADM_ffMpeg4.h -@@ -43,9 +43,9 @@ - 2, /* max_b_frames */ \ - 0, /* mpeg_quant */ \ - 1, /* is_luma_elim_threshold */ \ -- -2, /* luma_elim_threshold */ \ -+ 0, /* luma_elim_threshold */ \ - 1, /* is_chroma_elim_threshold */ \ -- -5, /* chroma_elim_threshold */ \ -+ 0, /* chroma_elim_threshold */ \ - 0.05, /*lumi_masking */ \ - 1, /* is lumi */ \ - 0.01, /*dark_masking */ \ diff --git a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_ADM__x264.cpp b/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_ADM__x264.cpp deleted file mode 100644 index 844273e06960..000000000000 --- a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_ADM__x264.cpp +++ /dev/null @@ -1,34 +0,0 @@ ---- avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.cpp.orig 2016-01-29 08:47:25 UTC -+++ avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.cpp -@@ -173,7 +173,7 @@ again: - //return false; - }else - { -- //printf("[PPPP] x264 Incoming : %"PRIu64"us \n",image->Pts); -+ //printf("[PPPP] x264 Incoming : %" PRIu64"us \n",image->Pts); - // 2-preamble - if(false==preAmble(image)) - { -@@ -289,11 +289,11 @@ bool x264Encoder::postAmble (ADMBitstrea - } - //------ - aprintf("encoder delay=%d, pic out dts=%d picout pts=%d\n",getEncoderDelay(),picout->i_dts,picout->i_pts); -- aprintf("pts = %"PRIu64", dts=%"PRIu64", pts+delay=%"PRIu64" delta=%"PRIu64"\n",picout->i_pts,out->dts,out->pts, -+ aprintf("pts = %" PRIu64", dts=%" PRIu64", pts+delay=%" PRIu64" delta=%" PRIu64"\n",picout->i_pts,out->dts,out->pts, - out->pts-out->dts); - if(out->dts>out->pts) - { -- ADM_warning("DTS > PTS, that can happen when there are holes in the source (%"PRIu64"/%"PRIu64")\n", -+ ADM_warning("DTS > PTS, that can happen when there are holes in the source (%" PRIu64"/%" PRIu64")\n", - out->dts,out->pts); - if(picout->i_type!=X264_TYPE_B && picout->i_type!=X264_TYPE_BREF) - { -@@ -341,7 +341,7 @@ bool x264Encoder::postAmble (ADMBitstrea - ADM_error ("[x264] Unknown image type: %d\n", picout->i_type); - //ADM_assert(0); - } -- //printf("[OOOO] x264 Outgoing : %"PRIu64"us \n",out->dts); -+ //printf("[OOOO] x264 Outgoing : %" PRIu64"us \n",out->dts); - out->out_quantizer = picout->i_qpplus1; - return true; - } diff --git a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_ADM__x264.h b/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_ADM__x264.h deleted file mode 100644 index 212a5c8bb885..000000000000 --- a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_ADM__x264.h +++ /dev/null @@ -1,11 +0,0 @@ ---- avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h.orig 2016-01-29 08:47:25 UTC -+++ avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h -@@ -108,7 +108,7 @@ extern "C" - 1.0, /* float rate_tolerance; */ \ - 0, /* uint32_t vbv_max_bitrate; */ \ - 0, /* uint32_t vbv_buffer_size; */ \ -- 0.9, /* uint32_t vbv_buffer_init; */ \ -+ 1, /* uint32_t vbv_buffer_init; */ \ - 1.4, /* float ip_factor; */ \ - 1.3, /* float pb_factor; */ \ - 1, /* uint32_t aq_mode; */ \ diff --git a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_qt4_Q__x264.cpp b/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_qt4_Q__x264.cpp deleted file mode 100644 index 511363896c2b..000000000000 --- a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_qt4_Q__x264.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp.orig 2016-01-29 08:47:25 UTC -+++ avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp -@@ -38,7 +38,7 @@ typedef struct - }idcToken; - - static const idcToken listOfIdc[]={ -- {-1,"Auto"}, -+ {(unsigned int)-1,"Auto"}, - {10,"1"}, - {11,"1.1"}, - {12,"1.2"}, diff --git a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_ADM__x265.cpp b/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_ADM__x265.cpp deleted file mode 100644 index d94b9d2e1254..000000000000 --- a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_ADM__x265.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp.orig 2016-01-29 08:47:25 UTC -+++ avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp -@@ -284,11 +284,11 @@ bool x265Encoder::postAmble (ADMBitstrea - } - //------ - aprintf("encoder delay=%d, pic out dts=%d picout pts=%d\n",getEncoderDelay(),picout->i_dts,picout->i_pts); -- aprintf("pts = %"PRIu64", dts=%"PRIu64", pts+delay=%"PRIu64" delta=%"PRIu64"\n",picout->i_pts,out->dts,out->pts, -+ aprintf("pts = %" PRIu64", dts=%" PRIu64", pts+delay=%" PRIu64" delta=%" PRIu64"\n",picout->i_pts,out->dts,out->pts, - out->pts-out->dts); - if(out->dts>out->pts) - { -- ADM_warning("DTS > PTS, that can happen when there are holes in the source (%"PRIu64"/%"PRIu64")\n", -+ ADM_warning("DTS > PTS, that can happen when there are holes in the source (%" PRIu64"/%" PRIu64")\n", - out->dts,out->pts); - if(picout->sliceType!=X265_TYPE_B && picout->sliceType!=X265_TYPE_BREF) - { diff --git a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_ADM__x265.h b/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_ADM__x265.h deleted file mode 100644 index a55b01089886..000000000000 --- a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_ADM__x265.h +++ /dev/null @@ -1,11 +0,0 @@ ---- avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h.orig 2016-01-29 08:47:25 UTC -+++ avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h -@@ -85,7 +85,7 @@ extern "C" - 1.0, /* float rate_tolerance; */ \ - 0, /* uint32_t vbv_max_bitrate; */ \ - 0, /* uint32_t vbv_buffer_size; */ \ -- 0.9, /* uint32_t vbv_buffer_init; */ \ -+ 1, /* uint32_t vbv_buffer_init; */ \ - 1.4, /* float ip_factor; */ \ - 1.3, /* float pb_factor; */ \ - 2, /* uint32_t aq_mode; */ \ diff --git a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_qt4_Q__x265.cpp b/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_qt4_Q__x265.cpp deleted file mode 100644 index cdc0428e494e..000000000000 --- a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_qt4_Q__x265.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp.orig 2016-01-29 08:47:25 UTC -+++ avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp -@@ -38,7 +38,7 @@ typedef struct - }idcToken; - - static const idcToken listOfIdc[]={ -- {-1,"Auto"}, -+ {(unsigned int)-1,"Auto"}, - {10,"1"}, - {20,"2"}, - {21,"2.1"}, diff --git a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_xvid4_ADM__xvid4.cpp b/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_xvid4_ADM__xvid4.cpp deleted file mode 100644 index eb4d83e242ef..000000000000 --- a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_xvid4_ADM__xvid4.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp.orig 2016-01-29 08:47:25 UTC -+++ avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp -@@ -54,7 +54,7 @@ typedef enum - RD_SQUARE = RD_HPEL_QPEL_8 | XVID_ME_EXTSEARCH_RD - } RateDistortionMode; - --uint32_t rdMode[5]= -+int32_t rdMode[5]= - { - RD_NONE, - RD_DCT_ME, -@@ -332,7 +332,7 @@ again: - // Store Pts/DTS - ADM_timeMapping map; // Store real PTS <->lav value mapping - map.realTS=image->Pts+getEncoderDelay(); -- aprintf("Pushing fn=%d Time=%"PRIu64"\n",frameNum,map.realTS); -+ aprintf("Pushing fn=%d Time=%" PRIu64"\n",frameNum,map.realTS); - - map.internalTS=frameNum++; - mapper.push_back(map); diff --git a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoFilters6_telecide_Telecide__getFrame.cpp b/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoFilters6_telecide_Telecide__getFrame.cpp deleted file mode 100644 index edfcece21b58..000000000000 --- a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoFilters6_telecide_Telecide__getFrame.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp.orig 2016-01-29 08:47:25 UTC -+++ avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp -@@ -240,7 +240,7 @@ teleCide *_param=&configuration; - { - // The chosen frame doesn't match the prediction. - if (predicted_metric == 0) mismatch = 0.0; -- else mismatch = (100.0*abs(predicted_metric - lowest))/predicted_metric; -+ else mismatch = (100.0*abs((int)predicted_metric - (int)lowest))/predicted_metric; - if (mismatch < gthresh) - { - // It's close enough, so use the predicted one. -@@ -283,7 +283,7 @@ teleCide *_param=&configuration; - { - // The chosen frame doesn't match the prediction. - if (predicted_metric == 0) mismatch = 0.0; -- else mismatch = (100.0*abs(predicted_metric - lowest))/predicted_metric; -+ else mismatch = (100.0*abs((int)predicted_metric - (int)lowest))/predicted_metric; - if ((int) mismatch <= gthresh) - { - // It's close enough, so use the predicted one. -@@ -394,7 +394,7 @@ teleCide *_param=&configuration; - { - unsigned char *dstpp, *dstpn; - int v1, v2, z; -- #warning blend in place is wrong! -+ //#warning blend in place is wrong! - final=dst; - // MeanX:We should copy here as we blend from source and destination - // for the moment we do it in place, it is wrong. diff --git a/multimedia/avidemux/files/patch-avidemux__plugins_CMakeLists.txt b/multimedia/avidemux/files/patch-avidemux__plugins_CMakeLists.txt deleted file mode 100644 index 7ad4f749e4a4..000000000000 --- a/multimedia/avidemux/files/patch-avidemux__plugins_CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- avidemux_plugins/CMakeLists.txt.orig 2016-01-31 19:06:53 UTC -+++ avidemux_plugins/CMakeLists.txt -@@ -203,7 +203,6 @@ ADD_SUBDIRECTORY(ADM_videoEncoder) - ADD_SUBDIRECTORY(ADM_videoFilters6) - IF(DO_QT4) - add_subdirectory(ADM_demuxers/VapourSynth) -- add_subdirectory(ADM_scriptEngines) - #IF(USE_OPENGL AND NOT WIN32) - IF(USE_OPENGL ) - ADD_SUBDIRECTORY(ADM_videoFilters6_openGl) diff --git a/multimedia/avidemux/files/patch-avidemux_qt4_ADM__jobs_src_ADM__jobControl.cpp b/multimedia/avidemux/files/patch-avidemux_qt4_ADM__jobs_src_ADM__jobControl.cpp deleted file mode 100644 index a9ad7bdca569..000000000000 --- a/multimedia/avidemux/files/patch-avidemux_qt4_ADM__jobs_src_ADM__jobControl.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp.orig 2016-01-29 08:47:25 UTC -+++ avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp -@@ -112,7 +112,7 @@ void jobWindow::refreshList(void) - QTableWidgetItem *endItem=fromText (end,i); - QTableWidgetItem *durItem=fromText (dur,i); - --#define MX(x,y) case ADM_JOB_##x: status->setIcon(QIcon(":/jobs/"y));break; -+#define MX(x,y) case ADM_JOB_##x: status->setIcon(QIcon(":/jobs/" y));break; - switch(listOfJob[i].status) - { - MX(KO,"gtk-no.png"); diff --git a/multimedia/avidemux/files/patch-cmake_admCheckMiscLibs.cmake b/multimedia/avidemux/files/patch-cmake_admCheckMiscLibs.cmake index 2f1debddab21..5ee0c5084789 100644 --- a/multimedia/avidemux/files/patch-cmake_admCheckMiscLibs.cmake +++ b/multimedia/avidemux/files/patch-cmake_admCheckMiscLibs.cmake @@ -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) diff --git a/multimedia/avidemux/files/patch-cmake_admCheckX265.cmake b/multimedia/avidemux/files/patch-cmake_admCheckX265.cmake deleted file mode 100644 index 77c23fab0265..000000000000 --- a/multimedia/avidemux/files/patch-cmake_admCheckX265.cmake +++ /dev/null @@ -1,12 +0,0 @@ ---- cmake/admCheckX265.cmake.orig 2016-01-29 08:47:25 UTC -+++ cmake/admCheckX265.cmake -@@ -19,9 +19,6 @@ MACRO(checkX265) - MESSAGE("WARNING: x265 core version is too old. At least version 9 is required.") - SET(X265_FOUND 0) - ELSE (x265_version LESS 9) -- IF(NOT WIN32) -- SET(DL dl) -- ENDIF(NOT WIN32) - FIND_HEADER_AND_LIB(X265 x265.h x265 x265_encoder_open_${x265_version} ${DL}) - ENDIF (x265_version LESS 9) - ELSE (_X265_FOUND AND _X265_CONFIG_FOUND) diff --git a/multimedia/avidemux/files/patch-cmake_admMainChecks.cmake b/multimedia/avidemux/files/patch-cmake_admMainChecks.cmake index dbeec250637c..35af0cdfeea7 100644 --- a/multimedia/avidemux/files/patch-cmake_admMainChecks.cmake +++ b/multimedia/avidemux/files/patch-cmake_admMainChecks.cmake @@ -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) diff --git a/multimedia/avidemux/pkg-plist b/multimedia/avidemux/pkg-plist index 00c73bf570d8..159dfee88959 100644 --- a/multimedia/avidemux/pkg-plist +++ b/multimedia/avidemux/pkg-plist @@ -1,70 +1,439 @@ -@mode 0755 -lib/libADM6avcodec.so.56 -lib/libADM6avformat.so.56 -lib/libADM6avutil.so.54 -lib/libADM6postproc.so.53 -lib/libADM6swscale.so.3 -@mode +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 +include/avidemux/2.7/ADM_coreAudio/ADM_audioStreamAC3.h +include/avidemux/2.7/ADM_coreAudio/ADM_audioStreamBuffered.h +include/avidemux/2.7/ADM_coreAudio/ADM_audioStreamConstantChunk.h +include/avidemux/2.7/ADM_coreAudio/ADM_audioStreamDCA.h +include/avidemux/2.7/ADM_coreAudio/ADM_audioStreamEac3.h +include/avidemux/2.7/ADM_coreAudio/ADM_audioStreamMP3.h +include/avidemux/2.7/ADM_coreAudio/ADM_audioStreamPCM.h +include/avidemux/2.7/ADM_coreAudio/ADM_audioWrite.h +include/avidemux/2.7/ADM_coreAudio/ADM_audioWriteAAC.h +include/avidemux/2.7/ADM_coreAudio/ADM_audioWriteWav.h +include/avidemux/2.7/ADM_coreAudio/ADM_audioXiphUtils.h +include/avidemux/2.7/ADM_coreAudio/ADM_audiodef.h +include/avidemux/2.7/ADM_coreAudio/ADM_baseAudioStream.h +include/avidemux/2.7/ADM_coreAudio/ADM_coreAudio.h +include/avidemux/2.7/ADM_coreAudio/ADM_coreAudio6_export.h +include/avidemux/2.7/ADM_coreAudioCodec/ADM_ad_plugin.h +include/avidemux/2.7/ADM_coreAudioCodec/ADM_audiocodec.h +include/avidemux/2.7/ADM_coreAudioCodec/ADM_audiocodeclist.h +include/avidemux/2.7/ADM_coreAudioCodec/adm_ogg.h +include/avidemux/2.7/ADM_coreAudioDevice/ADM_audioDeviceInternal.h +include/avidemux/2.7/ADM_coreAudioDevice/ADM_audiodevice.h +include/avidemux/2.7/ADM_coreAudioDevice/ADM_coreAudioDevice6_export.h +include/avidemux/2.7/ADM_coreAudioDevice/audio_out.h +include/avidemux/2.7/ADM_coreAudioEncoder/ADM_coreAudioEncoder6_export.h +include/avidemux/2.7/ADM_coreAudioEncoder/audioencoder.h +include/avidemux/2.7/ADM_coreAudioEncoder/audioencoderInternal.h +include/avidemux/2.7/ADM_coreAudioFilter/ADM_audioFilter.h +include/avidemux/2.7/ADM_coreAudioFilter/ADM_audioResample.h +include/avidemux/2.7/ADM_coreAudioFilter/ADM_coreAudioFilterAPI6_export.h +include/avidemux/2.7/ADM_coreAudioFilter/audioEncoderApi.h +include/avidemux/2.7/ADM_coreAudioFilter/audio_encoderPlugin.h +include/avidemux/2.7/ADM_coreAudioFilter/audiofilter.h +include/avidemux/2.7/ADM_coreAudioFilter/audiofilter_SRC.h +include/avidemux/2.7/ADM_coreAudioFilter/audiofilter_bridge.h +include/avidemux/2.7/ADM_coreAudioFilter/audiofilter_conf.h +include/avidemux/2.7/ADM_coreAudioFilter/audiofilter_dolby.h +include/avidemux/2.7/ADM_coreAudioFilter/audiofilter_film2pal.h +include/avidemux/2.7/ADM_coreAudioFilter/audiofilter_internal.h +include/avidemux/2.7/ADM_coreAudioFilter/audiofilter_limiter.h +include/avidemux/2.7/ADM_coreAudioFilter/audiofilter_limiter_param.h +include/avidemux/2.7/ADM_coreAudioFilter/audiofilter_mixer.h +include/avidemux/2.7/ADM_coreAudioFilter/audiofilter_normalize.h +include/avidemux/2.7/ADM_coreAudioFilter/audiofilter_normalize_param.h +include/avidemux/2.7/ADM_coreAudioParser/ADM_a52info.h +include/avidemux/2.7/ADM_coreAudioParser/ADM_aacLatm.h +include/avidemux/2.7/ADM_coreAudioParser/ADM_aacadts.h +include/avidemux/2.7/ADM_coreAudioParser/ADM_aacinfo.h +include/avidemux/2.7/ADM_coreAudioParser/ADM_audioParser6_export.h +include/avidemux/2.7/ADM_coreAudioParser/ADM_dcainfo.h +include/avidemux/2.7/ADM_coreAudioParser/ADM_eac3info.h +include/avidemux/2.7/ADM_coreAudioParser/ADM_mp3info.h +include/avidemux/2.7/ADM_coreConfig.h +include/avidemux/2.7/ADM_coreDemuxer/ADM_Video.h +include/avidemux/2.7/ADM_coreDemuxer/ADM_bitmap.h +include/avidemux/2.7/ADM_coreDemuxer/ADM_coreDemuxer.h +include/avidemux/2.7/ADM_coreDemuxer/ADM_coreDemuxer6_export.h +include/avidemux/2.7/ADM_coreDemuxer/ADM_coreDemuxerMpeg.h +include/avidemux/2.7/ADM_coreDemuxer/ADM_coreDemuxerMpegTemplate.cpp.h +include/avidemux/2.7/ADM_coreDemuxer/ADM_demuxerInternal.h +include/avidemux/2.7/ADM_coreDemuxer/avifmt2.h +include/avidemux/2.7/ADM_coreDemuxer/unix/avifmt.h +include/avidemux/2.7/ADM_coreDemuxerMpeg/ADM_coreDemuxerMpeg6_export.h +include/avidemux/2.7/ADM_coreDemuxerMpeg/ADM_indexFile.h +include/avidemux/2.7/ADM_coreDemuxerMpeg/dmxPSPacket.h +include/avidemux/2.7/ADM_coreDemuxerMpeg/dmxPacket.h +include/avidemux/2.7/ADM_coreDemuxerMpeg/dmx_demuxer.h +include/avidemux/2.7/ADM_coreDemuxerMpeg/dmx_demuxerEs.h +include/avidemux/2.7/ADM_coreDemuxerMpeg/dmx_demuxerMSDVR.h +include/avidemux/2.7/ADM_coreDemuxerMpeg/dmx_demuxerPS.h +include/avidemux/2.7/ADM_coreDemuxerMpeg/dmx_demuxerTS.h +include/avidemux/2.7/ADM_coreDemuxerMpeg/dmx_identify.h +include/avidemux/2.7/ADM_coreDemuxerMpeg/dmx_indexer.h +include/avidemux/2.7/ADM_coreDemuxerMpeg/dmx_io.h +include/avidemux/2.7/ADM_coreDemuxerMpeg/dmx_mpegstartcode.h +include/avidemux/2.7/ADM_coreImage/ADM_colorspace.h +include/avidemux/2.7/ADM_coreImage/ADM_coreImage6_export.h +include/avidemux/2.7/ADM_coreImage/ADM_image.h +include/avidemux/2.7/ADM_coreImage/ADM_imageFlags.h +include/avidemux/2.7/ADM_coreImage/ADM_imageResizer.h +include/avidemux/2.7/ADM_coreImage/ADM_interlaced.h +include/avidemux/2.7/ADM_coreImage/ADM_pp.h +include/avidemux/2.7/ADM_coreImage/ADM_print_priv.h +include/avidemux/2.7/ADM_coreImage/ADM_rgb.h +include/avidemux/2.7/ADM_coreImage/ADM_vidField.h +include/avidemux/2.7/ADM_coreImage/ADM_vidFieldUtil.h +include/avidemux/2.7/ADM_coreImage/ADM_videoFilterDynamic.h +include/avidemux/2.7/ADM_coreImage/ADM_videoFilter_iface.h +include/avidemux/2.7/ADM_coreImage/ADM_videoFilter_internal.h +include/avidemux/2.7/ADM_coreImageLoader/ADM_coreImageLoader6_export.h +include/avidemux/2.7/ADM_coreImageLoader/ADM_imageLoader.h +include/avidemux/2.7/ADM_coreJobs/ADM_coreJobs.h +include/avidemux/2.7/ADM_coreJobs/ADM_coreJobs_export.h +include/avidemux/2.7/ADM_coreJobs/sqlJobs.h +%%VAAPI%%include/avidemux/2.7/ADM_coreLibVA/ADM_coreLibVA.h +%%VAAPI%%include/avidemux/2.7/ADM_coreLibVA/ADM_coreLibVA_internal.h +%%VAAPI%%include/avidemux/2.7/ADM_coreLibVAEnc/ADM_coreLibVA_bitstream.h +%%VAAPI%%include/avidemux/2.7/ADM_coreLibVAEnc/ADM_coreLibVA_buffer.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 +include/avidemux/2.7/ADM_coreMuxer/ADM_muxerInternal.h +include/avidemux/2.7/ADM_coreMuxer/ADM_muxerProto.h +include/avidemux/2.7/ADM_coreMuxer/ADM_muxerUtils.h +include/avidemux/2.7/ADM_coreScript/ADM_ScriptEngineLoader.h +include/avidemux/2.7/ADM_coreScript/ADM_coreScript_export.h +include/avidemux/2.7/ADM_coreScript/ADM_scriptDF.h +include/avidemux/2.7/ADM_coreScript/ADM_scriptDFInteger.h +include/avidemux/2.7/ADM_coreScript/ADM_scriptDFMenu.h +include/avidemux/2.7/ADM_coreScript/ADM_scriptDFTimeStamp.h +include/avidemux/2.7/ADM_coreScript/ADM_scriptDFToggle.h +include/avidemux/2.7/ADM_coreScript/ADM_scriptDialogFactory.h +include/avidemux/2.7/ADM_coreScript/IScriptEngine.h +include/avidemux/2.7/ADM_coreScript/IScriptWriter.h +include/avidemux/2.7/ADM_coreScript/ScriptShell.h +include/avidemux/2.7/ADM_coreSocket/ADM_coreAvsProtocol.h +include/avidemux/2.7/ADM_coreSocket/ADM_coreCommandSocket.h +include/avidemux/2.7/ADM_coreSocket/ADM_coreSocket.h +include/avidemux/2.7/ADM_coreSocket/ADM_coreSocket6_export.h +include/avidemux/2.7/ADM_coreSqlLight3/ADM_coreSqlLight3_export.h +include/avidemux/2.7/ADM_coreSqlLight3/Database.h +include/avidemux/2.7/ADM_coreSqlLight3/IError.h +include/avidemux/2.7/ADM_coreSqlLight3/Query.h +include/avidemux/2.7/ADM_coreSqlLight3/StderrLog.h +include/avidemux/2.7/ADM_coreSqlLight3/SysLog2.h +include/avidemux/2.7/ADM_coreSqlLight3/libsqlitewrapped.h +include/avidemux/2.7/ADM_coreSubtitles/ADM_coreSubtitles.h +include/avidemux/2.7/ADM_coreSubtitles/ADM_coreSubtitles_export.h +include/avidemux/2.7/ADM_coreUI/ADM_coreUI6_export.h +include/avidemux/2.7/ADM_coreUI/ADM_windowInfo.h +include/avidemux/2.7/ADM_coreUI/DIA_audioTracks.h +include/avidemux/2.7/ADM_coreUI/DIA_coreToolkit.h +include/avidemux/2.7/ADM_coreUI/DIA_coreUI_internal.h +include/avidemux/2.7/ADM_coreUI/DIA_encoding.h +include/avidemux/2.7/ADM_coreUI/DIA_enter.h +include/avidemux/2.7/ADM_coreUI/DIA_factory.h +include/avidemux/2.7/ADM_coreUI/DIA_factoryStubs.h +include/avidemux/2.7/ADM_coreUI/DIA_fileSel.h +include/avidemux/2.7/ADM_coreUI/DIA_processing.h +include/avidemux/2.7/ADM_coreUI/DIA_uiTypes.h +include/avidemux/2.7/ADM_coreUI/DIA_working.h +include/avidemux/2.7/ADM_coreUtils/ADM_bitstream.h +include/avidemux/2.7/ADM_coreUtils/ADM_codecType.h +include/avidemux/2.7/ADM_coreUtils/ADM_compressedImage.h +include/avidemux/2.7/ADM_coreUtils/ADM_confCouple.h +include/avidemux/2.7/ADM_coreUtils/ADM_coreCodecMapping.h +include/avidemux/2.7/ADM_coreUtils/ADM_coreJson.h +include/avidemux/2.7/ADM_coreUtils/ADM_coreUtils.h +include/avidemux/2.7/ADM_coreUtils/ADM_coreUtils6_export.h +include/avidemux/2.7/ADM_coreUtils/ADM_fileio.h +include/avidemux/2.7/ADM_coreUtils/ADM_frameType.h +include/avidemux/2.7/ADM_coreUtils/ADM_getbits.h +include/avidemux/2.7/ADM_coreUtils/ADM_h264_tag.h +include/avidemux/2.7/ADM_coreUtils/ADM_h265_tag.h +include/avidemux/2.7/ADM_coreUtils/ADM_iso639.h +include/avidemux/2.7/ADM_coreUtils/ADM_last.h +include/avidemux/2.7/ADM_coreUtils/ADM_memio.h +include/avidemux/2.7/ADM_coreUtils/ADM_paramList.h +include/avidemux/2.7/ADM_coreUtils/ADM_quota.h +include/avidemux/2.7/ADM_coreUtils/ADM_string.h +include/avidemux/2.7/ADM_coreUtils/ADM_threadQueue.h +include/avidemux/2.7/ADM_coreUtils/ADM_videoInfoExtractor.h +include/avidemux/2.7/ADM_coreUtils/ADM_writeRiff.h +include/avidemux/2.7/ADM_coreUtils/FFcodecContext_param.h +include/avidemux/2.7/ADM_coreUtils/fourcc.h +include/avidemux/2.7/ADM_coreUtils/prefs.h +include/avidemux/2.7/ADM_coreUtils/prefs2_list.h +include/avidemux/2.7/ADM_coreVdpau/ADM_coreVdpau.h +include/avidemux/2.7/ADM_coreVdpau/ADM_coreVdpauInternal.h +include/avidemux/2.7/ADM_coreVideoCodec/ADM_codec.h +include/avidemux/2.7/ADM_coreVideoCodec/ADM_codecEmpty.h +include/avidemux/2.7/ADM_coreVideoCodec/ADM_codecFFVP9.h +include/avidemux/2.7/ADM_coreVideoCodec/ADM_codecFFsimple.h +include/avidemux/2.7/ADM_coreVideoCodec/ADM_codecNull.h +include/avidemux/2.7/ADM_coreVideoCodec/ADM_coreVideoCodec6_export.h +include/avidemux/2.7/ADM_coreVideoCodec/ADM_coreVideoDecoderInternal.h +include/avidemux/2.7/ADM_coreVideoCodec/ADM_ffmp43.h +include/avidemux/2.7/ADM_coreVideoCodec/ADM_hwAccel.h +include/avidemux/2.7/ADM_coreVideoCodec/ADM_rgb16.h +include/avidemux/2.7/ADM_coreVideoCodec/ADM_uyvy.h +include/avidemux/2.7/ADM_coreVideoEncoder/ADM_coreVideoEncoder.h +include/avidemux/2.7/ADM_coreVideoEncoder/ADM_coreVideoEncoder6_export.h +include/avidemux/2.7/ADM_coreVideoEncoder/ADM_coreVideoEncoderFFmpeg.h +include/avidemux/2.7/ADM_coreVideoEncoder/ADM_coreVideoEncoderFFmpeg_param.h +include/avidemux/2.7/ADM_coreVideoEncoder/ADM_coreVideoEncoderInternal.h +include/avidemux/2.7/ADM_coreVideoEncoder/ADM_encoderConf.h +include/avidemux/2.7/ADM_coreVideoEncoder/FFcodecContext.h +include/avidemux/2.7/ADM_coreVideoEncoder/FFcodecSettings.h +include/avidemux/2.7/ADM_coreVideoEncoder/FFcodecSettings_desc.cpp.h +include/avidemux/2.7/ADM_coreVideoFilter/ADM_coreVideoFilter.h +include/avidemux/2.7/ADM_coreVideoFilter/ADM_coreVideoFilter6_export.h +include/avidemux/2.7/ADM_coreVideoFilter/ADM_coreVideoFilterFunc.h +include/avidemux/2.7/ADM_coreVideoFilter/ADM_coreVideoFilterInternal.h +include/avidemux/2.7/ADM_coreVideoFilter/ADM_filterCategory.h +include/avidemux/2.7/ADM_coreVideoFilter/ADM_videoFilterBridge.h +include/avidemux/2.7/ADM_coreVideoFilter/ADM_videoFilterCache.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 +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/flv.h +include/avidemux/2.7/libavformat/version.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/buffer.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/opt.h +include/avidemux/2.7/libavutil/pixdesc.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/libpostproc/postprocess.h +include/avidemux/2.7/libpostproc/version.h +include/avidemux/2.7/libswscale/swscale.h +include/avidemux/2.7/libswscale/version.h +lib/libADM6avcodec.so.58 +lib/libADM6avformat.so.58 +lib/libADM6avutil.so.56 +lib/libADM6postproc.so.55 +lib/libADM6swscale.so.5 +lib/libADM_audioParser6.so lib/libADM_core6.so lib/libADM_coreAudio6.so -lib/libADM_coreImage6.so -%%VAAPI%%lib/libADM_coreLibVA6.so -lib/libADM_coreUI6.so -lib/libADM_audioParser6.so lib/libADM_coreAudioDevice6.so lib/libADM_coreAudioEncoder6.so lib/libADM_coreAudioFilterAPI6.so lib/libADM_coreDemuxer6.so lib/libADM_coreDemuxerMpeg6.so +lib/libADM_coreImage6.so lib/libADM_coreImageLoader6.so lib/libADM_coreJobs.so +%%VAAPI%%lib/libADM_coreLibVA6.so +%%VAAPI%%lib/libADM_coreLibVAEnc6.so 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_coreUI6.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 +@dir include/avidemux/2.7/cmake/osx +@dir include/avidemux/2.7/cmake/sql