Attachment #209953 for bug #242634





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.56:multimedia/avidemux

MASTERDIR=	${.CURDIR}/../avidemux
PLIST=		${.CURDIR}/pkg-plist

Lines 1-4 Link Here

(-)b/multimedia/avidemux-cli/pkg-plist (-1 / +2 lines)
1	bin/avidemux3_cli	1	bin/avidemux3_cli
2	include/avidemux/2.6/cli/config.h	2	include/avidemux/2.7/cli/ADM_UIs/ADM_UI_Cli6_export.h
		3	include/avidemux/2.7/cli/config.h
3	lib/libADM_UI_Cli6.so	4	lib/libADM_UI_Cli6.so
4	lib/libADM_render6_cli.so	5	lib/libADM_render6_cli.so





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.56:multimedia/avidemux

MASTERDIR=	${.CURDIR}/../avidemux
PLIST=		${.CURDIR}/pkg-plist

CMAKE_ARGS+=	-DPLUGIN_UI=ALL

.if ${PORT_OPTIONS:MCLI}
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.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

Lines 1-113 Link Here

(-)b/multimedia/avidemux-plugins/pkg-plist (-75 / +81 lines)
1	lib/ADM_plugins6/audioDecoder/libADM_ad_Mad.so	1	lib/ADM_plugins6/audioDecoder/libADM_ad_Mad.so
2	lib/ADM_plugins6/audioDecoder/libADM_ad_a52.so	2	lib/ADM_plugins6/audioDecoder/libADM_ad_a52.so
3	lib/ADM_plugins6/audioDecoder/libADM_ad_dca.so	3	lib/ADM_plugins6/audioDecoder/libADM_ad_dca.so
		4	%%FAAD%%lib/ADM_plugins6/audioDecoder/libADM_ad_faad.so
		5	lib/ADM_plugins6/audioDecoder/libADM_ad_ima_adpcm.so
4	lib/ADM_plugins6/audioDecoder/libADM_ad_lav.so	6	lib/ADM_plugins6/audioDecoder/libADM_ad_lav.so
		7	lib/ADM_plugins6/audioDecoder/libADM_ad_ms_adpcm.so
		8	%%AMRNB%%lib/ADM_plugins6/audioDecoder/libADM_ad_opencore_amrnb.so
		9	%%AMRWB%%lib/ADM_plugins6/audioDecoder/libADM_ad_opencore_amrwb.so
5	%%OPUS%%lib/ADM_plugins6/audioDecoder/libADM_ad_opus.so	10	%%OPUS%%lib/ADM_plugins6/audioDecoder/libADM_ad_opus.so
6	lib/ADM_plugins6/audioDecoder/libADM_ad_ulaw.so	11	lib/ADM_plugins6/audioDecoder/libADM_ad_ulaw.so
7	lib/ADM_plugins6/audioDecoder/libADM_ad_ms_adpcm.so
8	lib/ADM_plugins6/audioDecoder/libADM_ad_ima_adpcm.so
9	%%VORBIS%%lib/ADM_plugins6/audioDecoder/libADM_ad_vorbis.so	12	%%VORBIS%%lib/ADM_plugins6/audioDecoder/libADM_ad_vorbis.so
		13	%%JACK%%lib/ADM_plugins6/audioDevices/libADM_av_jack.so
10	lib/ADM_plugins6/audioDevices/libADM_av_oss.so	14	lib/ADM_plugins6/audioDevices/libADM_av_oss.so
		15	%%PULSE%%lib/ADM_plugins6/audioDevices/libADM_av_pulseAudioSimple.so
		16	%%FAAC%%lib/ADM_plugins6/audioEncoders/libADM_ae_faac.so
11	%%LAME%%lib/ADM_plugins6/audioEncoders/libADM_ae_lame.so	17	%%LAME%%lib/ADM_plugins6/audioEncoders/libADM_ae_lame.so
		18	lib/ADM_plugins6/audioEncoders/libADM_ae_lav_aac.so
12	lib/ADM_plugins6/audioEncoders/libADM_ae_lav_ac3.so	19	lib/ADM_plugins6/audioEncoders/libADM_ae_lav_ac3.so
13	lib/ADM_plugins6/audioEncoders/libADM_ae_lav_mp2.so	20	lib/ADM_plugins6/audioEncoders/libADM_ae_lav_mp2.so
14	lib/ADM_plugins6/audioEncoders/libADM_ae_lav_aac.so	21	%%OPUS%%lib/ADM_plugins6/audioEncoders/libADM_ae_opus.so
15	lib/ADM_plugins6/audioEncoders/libADM_ae_pcm.so	22	lib/ADM_plugins6/audioEncoders/libADM_ae_pcm.so
16	%%TWOLAME%%lib/ADM_plugins6/audioEncoders/libADM_ae_twolame.so	23	%%TWOLAME%%lib/ADM_plugins6/audioEncoders/libADM_ae_twolame.so
17	lib/ADM_plugins6/videoEncoders/libADM_ve_yv12.so	24	%%VORBIS%%lib/ADM_plugins6/audioEncoders/libADM_ae_vorbis.so
18	lib/ADM_plugins6/videoEncoders/libADM_ve_png.so	25	lib/ADM_plugins6/autoScripts/720p.py
19	lib/ADM_plugins6/videoEncoders/libADM_ve_jpeg.so	26	lib/ADM_plugins6/autoScripts/PSP.py
20	lib/ADM_plugins6/videoEncoders/libADM_ve_huff.so	27	lib/ADM_plugins6/autoScripts/check24fps.py
		28	lib/ADM_plugins6/autoScripts/dvd.py
		29	lib/ADM_plugins6/autoScripts/lib/ADM_image.py
		30	lib/ADM_plugins6/autoScripts/lib/ADM_imageInfo.py
		31	lib/ADM_plugins6/autoScripts/svcd.py
		32	lib/ADM_plugins6/autoScripts/vcd.py
		33	lib/ADM_plugins6/demuxers/libADM_dm_asf.so
		34	lib/ADM_plugins6/demuxers/libADM_dm_avsproxy.so
		35	lib/ADM_plugins6/demuxers/libADM_dm_flv.so
		36	lib/ADM_plugins6/demuxers/libADM_dm_matroska.so
		37	lib/ADM_plugins6/demuxers/libADM_dm_mp4.so
		38	lib/ADM_plugins6/demuxers/libADM_dm_mxf.so
		39	lib/ADM_plugins6/demuxers/libADM_dm_opendml.so
		40	lib/ADM_plugins6/demuxers/libADM_dm_pic.so
		41	lib/ADM_plugins6/demuxers/libADM_dm_ps.so
		42	lib/ADM_plugins6/demuxers/libADM_dm_ts.so
		43	lib/ADM_plugins6/muxers/libADM_mx_Mkv.so
		44	lib/ADM_plugins6/muxers/libADM_mx_Webm.so
		45	lib/ADM_plugins6/muxers/libADM_mx_avi.so
		46	lib/ADM_plugins6/muxers/libADM_mx_dummy.so
		47	lib/ADM_plugins6/muxers/libADM_mx_ffPS.so
		48	lib/ADM_plugins6/muxers/libADM_mx_ffTS.so
		49	lib/ADM_plugins6/muxers/libADM_mx_flv.so
		50	lib/ADM_plugins6/muxers/libADM_mx_mp4.so
		51	lib/ADM_plugins6/muxers/libADM_mx_mp4v2.so
		52	lib/ADM_plugins6/muxers/libADM_mx_raw.so
		53	lib/ADM_plugins6/scriptEngines/libADM_script_tinyPy.so
21	lib/ADM_plugins6/videoEncoders/libADM_ve_ffDv.so	54	lib/ADM_plugins6/videoEncoders/libADM_ve_ffDv.so
22	lib/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg4.so
23	lib/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg2.so
24	lib/ADM_plugins6/videoEncoders/libADM_ve_ffFlv1.so	55	lib/ADM_plugins6/videoEncoders/libADM_ve_ffFlv1.so
		56	lib/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg2.so
		57	lib/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg4.so
		58	%%VAAPI%%lib/ADM_plugins6/videoEncoders/libADM_ve_ffVaEncH264.so
		59	%%VAAPI%%lib/ADM_plugins6/videoEncoders/libADM_ve_ffVaEncHEVC.so
		60	lib/ADM_plugins6/videoEncoders/libADM_ve_huff.so
		61	lib/ADM_plugins6/videoEncoders/libADM_ve_jpeg.so
		62	%%VAAPI%%lib/ADM_plugins6/videoEncoders/libADM_ve_libva.so
25	lib/ADM_plugins6/videoEncoders/libADM_ve_null.so	63	lib/ADM_plugins6/videoEncoders/libADM_ve_null.so
		64	%%CLI%%lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so
		65	%%CLI%%lib/ADM_plugins6/videoEncoders/libADM_ve_x265_other.so
		66	%%XVID%%lib/ADM_plugins6/videoEncoders/libADM_ve_xvid4.so
		67	lib/ADM_plugins6/videoEncoders/libADM_ve_yv12.so
		68	%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_CropCli.so
		69	%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_HueCli.so
		70	%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_blackenBordersCli.so
		71	%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_chromaShiftCli.so
		72	%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_contrastCli.so
		73	%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_eq2Cli.so
		74	%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_logoCli.so
		75	%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_mpdelogoCli.so
		76	%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_msharpenCli.so
		77	%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_swscaleResize_cli.so
		78	lib/ADM_plugins6/videoFilters/libADM_vf_DgBob.so
		79	lib/ADM_plugins6/videoFilters/libADM_vf_FluxSmooth.so
26	lib/ADM_plugins6/videoFilters/libADM_vf_addBorders.so	80	lib/ADM_plugins6/videoFilters/libADM_vf_addBorders.so
		81	lib/ADM_plugins6/videoFilters/libADM_vf_admIvtc.so
		82	lib/ADM_plugins6/videoFilters/libADM_vf_ascii.so
27	lib/ADM_plugins6/videoFilters/libADM_vf_avsfilter.so	83	lib/ADM_plugins6/videoFilters/libADM_vf_avsfilter.so
28	lib/ADM_plugins6/videoFilters/libADM_vf_blackenBorders.so
29	lib/ADM_plugins6/videoFilters/libADM_vf_black.so	84	lib/ADM_plugins6/videoFilters/libADM_vf_black.so
30	lib/ADM_plugins6/videoFilters/libADM_vf_changeFps.so	85	lib/ADM_plugins6/videoFilters/libADM_vf_changeFps.so
31	lib/ADM_plugins6/videoFilters/libADM_vf_colorYuv.so	86	lib/ADM_plugins6/videoFilters/libADM_vf_colorYuv.so
32	lib/ADM_plugins6/videoFilters/libADM_vf_decimate.so	87	lib/ADM_plugins6/videoFilters/libADM_vf_denoise3d.so
33	lib/ADM_plugins6/videoFilters/libADM_vf_DgBob.so	88	lib/ADM_plugins6/videoFilters/libADM_vf_denoise3dhq.so
34	lib/ADM_plugins6/videoFilters/libADM_vf_dummy.so	89	lib/ADM_plugins6/videoFilters/libADM_vf_dummy.so
35	lib/ADM_plugins6/videoFilters/libADM_vf_fadeTo.so	90	lib/ADM_plugins6/videoFilters/libADM_vf_fadeTo.so
36	lib/ADM_plugins6/videoFilters/libADM_vf_fadeToBlack.so	91	lib/ADM_plugins6/videoFilters/libADM_vf_fadeToBlack.so
37	lib/ADM_plugins6/videoFilters/libADM_vf_mean.so
38	lib/ADM_plugins6/videoFilters/libADM_vf_gauss.so	92	lib/ADM_plugins6/videoFilters/libADM_vf_gauss.so
39	lib/ADM_plugins6/videoFilters/libADM_vf_median.so	93	lib/ADM_plugins6/videoFilters/libADM_vf_hflip.so
40	lib/ADM_plugins6/videoFilters/libADM_vf_sharpen.so	94	lib/ADM_plugins6/videoFilters/libADM_vf_hzstackField.so
41	lib/ADM_plugins6/videoFilters/libADM_vf_separateField.so	95	lib/ADM_plugins6/videoFilters/libADM_vf_ivtcDupeRemover.so
42	%%FRIBIDI%%%%FREETYPE%%lib/ADM_plugins6/videoFilters/libADM_vf_ssa.so
43	lib/ADM_plugins6/videoFilters/libADM_vf_mergeField.so
44	lib/ADM_plugins6/videoFilters/libADM_vf_FluxSmooth.so
45	lib/ADM_plugins6/videoFilters/libADM_hf_hflip.so
46	lib/ADM_plugins6/videoFilters/libADM_vf_kernelDeint.so	96	lib/ADM_plugins6/videoFilters/libADM_vf_kernelDeint.so
47	lib/ADM_plugins6/videoFilters/libADM_vf_largeMedian.so	97	lib/ADM_plugins6/videoFilters/libADM_vf_largeMedian.so
48	lib/ADM_plugins6/videoFilters/libADM_vf_lavDeint.so	98	lib/ADM_plugins6/videoFilters/libADM_vf_lavDeint.so
49	lib/ADM_plugins6/videoFilters/libADM_vf_logo.so
50	lib/ADM_plugins6/videoFilters/libADM_vf_lumaOnly.so	99	lib/ADM_plugins6/videoFilters/libADM_vf_lumaOnly.so
51	lib/ADM_plugins6/videoFilters/libADM_vf_denoise3dhq.so	100	lib/ADM_plugins6/videoFilters/libADM_vf_mean.so
52	lib/ADM_plugins6/videoFilters/libADM_vf_denoise3d.so	101	lib/ADM_plugins6/videoFilters/libADM_vf_median.so
53	lib/ADM_plugins6/videoFilters/libADM_vf_msharpen.so	102	lib/ADM_plugins6/videoFilters/libADM_vf_mergeField.so
54	lib/ADM_plugins6/videoFilters/libADM_vf_printInfo.so	103	lib/ADM_plugins6/videoFilters/libADM_vf_printInfo.so
55	lib/ADM_plugins6/videoFilters/libADM_vf_removePlane.so	104	lib/ADM_plugins6/videoFilters/libADM_vf_removePlane.so
56	lib/ADM_plugins6/videoFilters/libADM_vf_resampleFps.so	105	lib/ADM_plugins6/videoFilters/libADM_vf_resampleFps.so
57	lib/ADM_plugins6/videoFilters/libADM_vf_rotate.so	106	lib/ADM_plugins6/videoFilters/libADM_vf_rotate.so
		107	lib/ADM_plugins6/videoFilters/libADM_vf_separateField.so
		108	lib/ADM_plugins6/videoFilters/libADM_vf_sharpen.so
		109	%%FRIBIDI%%lib/ADM_plugins6/videoFilters/libADM_vf_ssa.so
58	lib/ADM_plugins6/videoFilters/libADM_vf_stackField.so	110	lib/ADM_plugins6/videoFilters/libADM_vf_stackField.so
59	lib/ADM_plugins6/videoFilters/libADM_vf_unstackField.so	111	lib/ADM_plugins6/videoFilters/libADM_vf_stillimage.so
60	lib/ADM_plugins6/videoFilters/libADM_vf_hzstackField.so
61	lib/ADM_plugins6/videoFilters/libADM_vf_swapUV.so	112	lib/ADM_plugins6/videoFilters/libADM_vf_swapUV.so
62	lib/ADM_plugins6/videoFilters/libADM_vf_telecide.so	113	lib/ADM_plugins6/videoFilters/libADM_vf_telecide.so
63	lib/ADM_plugins6/videoFilters/libADM_vf_yadif.so	114	lib/ADM_plugins6/videoFilters/libADM_vf_unstackField.so
64	lib/ADM_plugins6/videoFilters/libADM_vf_vflip.so	115	%%VAAPI%%lib/ADM_plugins6/videoFilters/libADM_vf_vaapiFilter.so
65	lib/ADM_plugins6/scriptEngines/libADM_script_spiderMonkey.so
66	lib/ADM_plugins6/scriptEngines/libADM_script_tinyPy.so
67	lib/ADM_plugins6/demuxers/libADM_dm_flv.so
68	lib/ADM_plugins6/demuxers/libADM_dm_pic.so
69	lib/ADM_plugins6/demuxers/libADM_dm_mp4.so
70	lib/ADM_plugins6/demuxers/libADM_dm_matroska.so
71	lib/ADM_plugins6/demuxers/libADM_dm_opendml.so
72	lib/ADM_plugins6/demuxers/libADM_dm_ps.so
73	lib/ADM_plugins6/demuxers/libADM_dm_ts.so
74	lib/ADM_plugins6/demuxers/libADM_dm_asf.so
75	lib/ADM_plugins6/demuxers/libADM_dm_avsproxy.so
76	lib/ADM_plugins6/demuxers/libADM_dm_mxf.so
77	lib/ADM_plugins6/muxers/libADM_mx_dummy.so
78	lib/ADM_plugins6/muxers/libADM_mx_mp4v2.so
79	lib/ADM_plugins6/muxers/libADM_mx_avi.so
80	lib/ADM_plugins6/muxers/libADM_mx_raw.so
81	lib/ADM_plugins6/muxers/libADM_mx_flv.so
82	lib/ADM_plugins6/muxers/libADM_mx_mp4.so
83	lib/ADM_plugins6/muxers/libADM_mx_Mkv.so
84	lib/ADM_plugins6/muxers/libADM_mx_ffPS.so
85	lib/ADM_plugins6/muxers/libADM_mx_ffTS.so
86	lib/ADM_plugins6/autoScripts/720p.py
87	lib/ADM_plugins6/autoScripts/PSP.py
88	lib/ADM_plugins6/autoScripts/check24fps.py
89	lib/ADM_plugins6/autoScripts/svcd.py
90	lib/ADM_plugins6/autoScripts/vcd.py
91	lib/ADM_plugins6/autoScripts/dvd.py
92	lib/ADM_plugins6/autoScripts/lib/ADM_imageInfo.py
93	lib/ADM_plugins6/autoScripts/lib/ADM_image.py
94	%%VPX%%lib/ADM_plugins6/videoDecoders/libADM_vd_vpx.so
95	%%FAAC%%lib/ADM_plugins6/audioEncoders/libADM_ae_faac.so
96	%%FAAD%%lib/ADM_plugins6/audioDecoder/libADM_ad_faad.so
97	%%JACK%%lib/ADM_plugins6/audioDevices/libADM_av_jack.so
98	%%PULSE%%lib/ADM_plugins6/audioDevices/libADM_av_pulseAudioSimple.so
99	%%XVID%%lib/ADM_plugins6/videoEncoders/libADM_ve_xvid4.so
100	%%VORBIS%%lib/ADM_plugins6/audioEncoders/libADM_ae_vorbis.so
101	%%AMRNB%%lib/ADM_plugins6/audioDecoder/libADM_ad_opencore_amrnb.so
102	%%AMRWB%%lib/ADM_plugins6/audioDecoder/libADM_ad_opencore_amrwb.so
103	%%VDPAU%%lib/ADM_plugins6/videoFilters/libADM_vf_vdpauFilter.so	116	%%VDPAU%%lib/ADM_plugins6/videoFilters/libADM_vf_vdpauFilter.so
104	%%VDPAU%%lib/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.so	117	%%VDPAU%%lib/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.so
105	%%CLI%%%%X264%%lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so	118	lib/ADM_plugins6/videoFilters/libADM_vf_vflip.so
106	%%CLI%%%%X265%%lib/ADM_plugins6/videoEncoders/libADM_ve_x265_other.so	119	lib/ADM_plugins6/videoFilters/libADM_vf_yadif.so
107	%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_CropCli.so
108	%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_HueCli.so
109	%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_chromaShiftCli.so
110	%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_contrastCli.so
111	%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_eq2Cli.so
112	%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_mpdelogoCli.so
113	%%CLI%%lib/ADM_plugins6/videoFilters/cli/libADM_vf_swscaleResize_cli.so

Lines 6-12 Link Here

(-)b/multimedia/avidemux/Makefile (-1 lines)
6		6
7	PORTNAME= avidemux	7	PORTNAME= avidemux
8	PORTVERSION= ${AVIDEMUX_VERSION}	8	PORTVERSION= ${AVIDEMUX_VERSION}
9	PORTREVISION= 15
10	CATEGORIES= multimedia	9	CATEGORIES= multimedia
11		10
12	MAINTAINER= multimedia@FreeBSD.org	11	MAINTAINER= multimedia@FreeBSD.org

Lines 1-6 Link Here

(-)b/multimedia/avidemux/Makefile.common (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	AVIDEMUX_VERSION= 2.6.11	3	AVIDEMUX_VERSION= 2.7.4
4	MASTER_SITES= \	4	MASTER_SITES= \
5	SF/avidemux/avidemux/${PORTVERSION}	5	SF/avidemux/avidemux/${PORTVERSION}
6	DISTNAME= avidemux_${PORTVERSION}	6	DISTNAME= avidemux_${PORTVERSION}

Lines 1-2 Link Here

(-)b/multimedia/avidemux/distinfo (-2 / +3 lines)
1	SHA256 (avidemux_2.6.11.tar.gz) = 936ff5e10ad0551460c1233c217e4cee642623f2899a8fe48cd7f0144cfd1b3a	1	TIMESTAMP = 1576346096
2	SIZE (avidemux_2.6.11.tar.gz) = 17980757	2	SHA256 (avidemux_2.7.4.tar.gz) = 7db0ac01c8255279a2c360ecb2725c27ea8a2c5bd1f38aeafabfed33ea588da9
		3	SIZE (avidemux_2.7.4.tar.gz) = 23946276




--- avidemux_core/ADM_coreUtils/src/prefs2_pref.h.orig	2019-08-15 07:25:39 UTC
+++ avidemux_core/ADM_coreUtils/src/prefs2_pref.h
@@ -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_DXVA2,"features.dxva2"                                     ,ADM_param_bool    	,"0",	0,	1},
 { FEATURES_VDPAU,"features.vdpau"                                     ,ADM_param_bool    	,"0",	0,	1},




--- 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); \
                                 } \
 }
 




--- 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 Link Here

(-)b/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__folder__linux.cpp (+11 lines)
1	--- avidemux_core/ADM_core/src/ADM_folder_linux.cpp.orig 2019-12-14 18:28:33 UTC
2	+++ avidemux_core/ADM_core/src/ADM_folder_linux.cpp
3	@@ -39,7 +39,7 @@ static std::string ADM_i18nDir;
4	static std::string canonize(const std::string &in)
5	{
6	std::string out;
7	- char *simple2=canonicalize_file_name(in.c_str());
8	+ char *simple2=realpath(in.c_str(),nullptr);
9	if(simple2)
10	{
11	out=std::string(simple2)+std::string("/");

Lines 1-4 Link Here

(-)b/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__memsupport.cpp (-2 / +2 lines)
1	--- avidemux_core/ADM_core/src/ADM_memsupport.cpp.orig 2015-05-15 09:19:29 UTC	1	--- avidemux_core/ADM_core/src/ADM_memsupport.cpp.orig 2019-08-15 07:25:39 UTC
2	+++ avidemux_core/ADM_core/src/ADM_memsupport.cpp	2	+++ avidemux_core/ADM_core/src/ADM_memsupport.cpp
3	@@ -23,7 +23,7 @@	3	@@ -23,7 +23,7 @@
4	* (at your option) any later version. *	4	* (at your option) any later version. *
Lines 9-15 Link Here
9	#include <malloc.h>	9	#include <malloc.h>
10	#endif	10	#endif
11	#include "ADM_default.h"	11	#include "ADM_default.h"
12	@@ -79,7 +79,7 @@ void ADM_dezalloc(void *ptr)	12	@@ -74,7 +74,7 @@ void ADM_dezalloc(void *ptr)
13		13
14	ADM_aligned_free(ptr);	14	ADM_aligned_free(ptr);
15	}	15	}




--- 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)




--- 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(offset<pesPacket->payloadSize);

Removed Link Here

(-)a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__muxers_muxerMp4v2_libmp4v2_src_rtphint.cpp (-11 lines)
1	--- avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/rtphint.cpp.orig 2016-01-29 09:47:25.000000000 +0100
2	+++ avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2/src/rtphint.cpp 2018-08-01 09:39:54.771441000 +0200
3	@@ -339,7 +339,7 @@
4	pSlash = strchr(pSlash, '/');
5	if (pSlash != NULL) {
6	pSlash++;
7	- if (pSlash != '\0') {
8	+ if (*pSlash) {
9	length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap);
10	ppEncodingParams = (char )MP4Calloc(length + 1);
11	strncpy(*ppEncodingParams, pSlash, length);

Removed Link Here

(-)a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_ffDv_ADM__ffDv.cpp (-11 lines)
1	--- avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp.orig 2016-01-29 08:47:25 UTC
2	+++ avidemux_plugins/ADM_videoEncoder/ffDv/ADM_ffDv.cpp
3	@@ -44,7 +44,7 @@ typedef struct
4
5	static const dvProfileClass supportedProfiles[]=
6	{
7	- {720,480,29.97,dvColor422},
8	+ {720,480,30,dvColor422},
9	{720,576,25,dvColor420},
10	};
11




--- 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 */ \




--- 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 */ \




--- 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 */ \




--- 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;
 }

Removed Link Here

(-)a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_ADM__x264.h (-11 lines)
1	--- avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h.orig 2016-01-29 08:47:25 UTC
2	+++ avidemux_plugins/ADM_videoEncoder/x264/ADM_x264.h
3	@@ -108,7 +108,7 @@ extern "C"
4	1.0, /* float rate_tolerance; */ \
5	0, /* uint32_t vbv_max_bitrate; */ \
6	0, /* uint32_t vbv_buffer_size; */ \
7	- 0.9, /* uint32_t vbv_buffer_init; */ \
8	+ 1, /* uint32_t vbv_buffer_init; */ \
9	1.4, /* float ip_factor; */ \
10	1.3, /* float pb_factor; */ \
11	1, /* uint32_t aq_mode; */ \

Removed Link Here

(-)a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x264_qt4_Q__x264.cpp (-11 lines)
1	--- avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp.orig 2016-01-29 08:47:25 UTC
2	+++ avidemux_plugins/ADM_videoEncoder/x264/qt4/Q_x264.cpp
3	@@ -38,7 +38,7 @@ typedef struct
4	}idcToken;
5
6	static const idcToken listOfIdc[]={
7	- {-1,"Auto"},
8	+ {(unsigned int)-1,"Auto"},
9	{10,"1"},
10	{11,"1.1"},
11	{12,"1.2"},




--- 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)
             {

Removed Link Here

(-)a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_ADM__x265.h (-11 lines)
1	--- avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h.orig 2016-01-29 08:47:25 UTC
2	+++ avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h
3	@@ -85,7 +85,7 @@ extern "C"
4	1.0, /* float rate_tolerance; */ \
5	0, /* uint32_t vbv_max_bitrate; */ \
6	0, /* uint32_t vbv_buffer_size; */ \
7	- 0.9, /* uint32_t vbv_buffer_init; */ \
8	+ 1, /* uint32_t vbv_buffer_init; */ \
9	1.4, /* float ip_factor; */ \
10	1.3, /* float pb_factor; */ \
11	2, /* uint32_t aq_mode; */ \

Removed Link Here

(-)a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_x265_qt4_Q__x265.cpp (-11 lines)
1	--- avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp.orig 2016-01-29 08:47:25 UTC
2	+++ avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.cpp
3	@@ -38,7 +38,7 @@ typedef struct
4	}idcToken;
5
6	static const idcToken listOfIdc[]={
7	- {-1,"Auto"},
8	+ {(unsigned int)-1,"Auto"},
9	{10,"1"},
10	{20,"2"},
11	{21,"2.1"},




--- 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);




--- 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.

Removed Link Here

(-)a/multimedia/avidemux/files/patch-avidemux__plugins_CMakeLists.txt (-10 lines)
1	--- avidemux_plugins/CMakeLists.txt.orig 2016-01-31 19:06:53 UTC
2	+++ avidemux_plugins/CMakeLists.txt
3	@@ -203,7 +203,6 @@ ADD_SUBDIRECTORY(ADM_videoEncoder)
4	ADD_SUBDIRECTORY(ADM_videoFilters6)
5	IF(DO_QT4)
6	add_subdirectory(ADM_demuxers/VapourSynth)
7	- add_subdirectory(ADM_scriptEngines)
8	#IF(USE_OPENGL AND NOT WIN32)
9	IF(USE_OPENGL )
10	ADD_SUBDIRECTORY(ADM_videoFilters6_openGl)

Removed Link Here

(-)a/multimedia/avidemux/files/patch-avidemux_qt4_ADM__jobs_src_ADM__jobControl.cpp (-11 lines)
1	--- avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp.orig 2016-01-29 08:47:25 UTC
2	+++ avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
3	@@ -112,7 +112,7 @@ void jobWindow::refreshList(void)
4	QTableWidgetItem *endItem=fromText (end,i);
5	QTableWidgetItem *durItem=fromText (dur,i);
6
7	-#define MX(x,y) case ADM_JOB_##x: status->setIcon(QIcon(":/jobs/"y));break;
8	+#define MX(x,y) case ADM_JOB_##x: status->setIcon(QIcon(":/jobs/" y));break;
9	switch(listOfJob[i].status)
10	{
11	MX(KO,"gtk-no.png");

Lines 1-11 Link Here

(-)b/multimedia/avidemux/files/patch-cmake_admCheckMiscLibs.cmake (-5 / +5 lines)
1	--- cmake/admCheckMiscLibs.cmake.orig 2015-05-30 14:09:29 UTC	1	--- cmake/admCheckMiscLibs.cmake.orig 2019-12-14 18:40:01 UTC
2	+++ cmake/admCheckMiscLibs.cmake	2	+++ cmake/admCheckMiscLibs.cmake
3	@@ -67,7 +67,7 @@ ENDIF (UNIX AND NOT APPLE)	3	@@ -69,7 +69,7 @@ ENDIF (UNIX AND NOT APPLE)
4	MESSAGE(STATUS "Checking for execinfo")	4	MESSAGE(STATUS "Checking for execinfo")
5	MESSAGE(STATUS "*********************")	5	MESSAGE(STATUS "*********************")
6		6
7	-FIND_HEADER_AND_LIB(execinfo execinfo.h execinfo backtrace_symbols)	7	-FIND_HEADER_AND_LIB(EXECINFO execinfo.h c backtrace_symbols)
8	+FIND_HEADER_AND_LIB(EXECINFO execinfo.h execinfo backtrace_symbols)	8	+FIND_HEADER_AND_LIB(EXECINFO execinfo.h execinfo backtrace_symbols)
9	PRINT_LIBRARY_INFO("execinfo" EXECINFO_FOUND "${LIBEXECINFO_INCLUDE_DIR}" "${LIBEXECINFO_LIBRARY_DIR}")	9	PRINT_LIBRARY_INFO("execinfo" EXECINFO_FOUND "${EXECINFO_INCLUDE_DIR}" "${EXECINFO_LIBRARY_DIR}")
10		10
11	IF (LIBEXECINFO_INCLUDE_DIR)	11	IF (EXECINFO_INCLUDE_DIR)




--- 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)

Lines 1-11 Link Here

(-)b/multimedia/avidemux/files/patch-cmake_admMainChecks.cmake (-4 / +4 lines)
1	--- cmake/admMainChecks.cmake.orig 2019-06-17 10:41:06 UTC	1	--- cmake/admMainChecks.cmake.orig 2019-08-15 07:25:40 UTC
2	+++ cmake/admMainChecks.cmake	2	+++ cmake/admMainChecks.cmake
3	@@ -81,7 +81,7 @@ ELSE (WIN32)	3	@@ -117,7 +117,7 @@ ELSE (WIN32)
4	ENDIF (WIN32)	4	ENDIF (WIN32)
5		5
6	if (CMAKE_COMPILER_IS_GNUCC)	6	if (CMAKE_COMPILER_IS_GNUCC)
7	- add_definitions("-Werror=attributes")	7	- add_definitions("-Werror=attributes")
8	+ add_definitions("-Wattributes")	8	+ add_definitions("-Wattributes")
9	endif (CMAKE_COMPILER_IS_GNUCC)	9	endif (CMAKE_COMPILER_IS_GNUCC)
10	# Clang	10	# MacOsX stuff
11	IF(${CMAKE_CXX_COMPILER} MATCHES ".[cC]lang.")	11	IF(APPLE)




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_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
@dir include/avidemux/2.7/cmake/osx
@dir include/avidemux/2.7/cmake/sql
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

Return to bug 242634

Lines 2-15 Link Here

(-)b/multimedia/avidemux-cli/Makefile (-2 / +1 lines)
2		2
3	PORTNAME= avidemux	3	PORTNAME= avidemux
4	PORTVERSION= ${AVIDEMUX_VERSION}	4	PORTVERSION= ${AVIDEMUX_VERSION}
5	PORTREVISION= 9
6	CATEGORIES= multimedia	5	CATEGORIES= multimedia
7	PKGNAMESUFFIX= -cli	6	PKGNAMESUFFIX= -cli
8		7
9	MAINTAINER= multimedia@FreeBSD.org	8	MAINTAINER= multimedia@FreeBSD.org
10	COMMENT= Simple GUI based video editor (cli)	9	COMMENT= Simple GUI based video editor (cli)
11		10
12	LIB_DEPENDS= libADM6avutil.so.54:multimedia/avidemux	11	LIB_DEPENDS= libADM6avutil.so.56:multimedia/avidemux
13		12
14	MASTERDIR= ${.CURDIR}/../avidemux	13	MASTERDIR= ${.CURDIR}/../avidemux
15	PLIST= ${.CURDIR}/pkg-plist	14	PLIST= ${.CURDIR}/pkg-plist

Lines 3-16 Link Here

(-)b/multimedia/avidemux-plugins/Makefile (-6 / +5 lines)
3		3
4	PORTNAME= avidemux	4	PORTNAME= avidemux
5	PORTVERSION= ${AVIDEMUX_VERSION}	5	PORTVERSION= ${AVIDEMUX_VERSION}
6	PORTREVISION= 17
7	CATEGORIES= multimedia	6	CATEGORIES= multimedia
8	PKGNAMESUFFIX= -plugins	7	PKGNAMESUFFIX= -plugins
9		8
10	MAINTAINER= multimedia@FreeBSD.org	9	MAINTAINER= multimedia@FreeBSD.org
11	COMMENT= Simple GUI based video editor (Plugins)	10	COMMENT= Simple GUI based video editor (Plugins)
12		11
13	LIB_DEPENDS= libADM6avutil.so.54:multimedia/avidemux	12	LIB_DEPENDS= libADM6avutil.so.56:multimedia/avidemux
14		13
15	MASTERDIR= ${.CURDIR}/../avidemux	14	MASTERDIR= ${.CURDIR}/../avidemux
16	PLIST= ${.CURDIR}/pkg-plist	15	PLIST= ${.CURDIR}/pkg-plist
Lines 24-36 CMAKE_ARGS+= -DAVIDEMUX_SOURCE_DIR=${WRKSRC} -DAVIDEMUX_INSTALL_PREFIX:PATH="${P Link Here
24	CMAKE_ARGS+= -DPLUGIN_UI=ALL	23	CMAKE_ARGS+= -DPLUGIN_UI=ALL
25		24
26	.if ${PORT_OPTIONS:MCLI}	25	.if ${PORT_OPTIONS:MCLI}
27	BUILD_DEPENDS+= ${LOCALBASE}/include/avidemux/2.6/cli/config.h:multimedia/avidemux-cli	26	BUILD_DEPENDS+= ${LOCALBASE}/include/avidemux/2.7/cli/config.h:multimedia/avidemux-cli
28	RUN_DEPENDS+= ${LOCALBASE}/include/avidemux/2.6/cli/config.h:multimedia/avidemux-cli	27	RUN_DEPENDS+= ${LOCALBASE}/include/avidemux/2.7/cli/config.h:multimedia/avidemux-cli
29	.endif	28	.endif
30		29
31	.if ${PORT_OPTIONS:MGTK3}	30	.if ${PORT_OPTIONS:MGTK3}
32	BUILD_DEPENDS+= ${LOCALBASE}/include/avidemux/2.6/gtk/config.h:multimedia/avidemux-gtk	31	BUILD_DEPENDS+= ${LOCALBASE}/include/avidemux/2.7/gtk/config.h:multimedia/avidemux-gtk
33	RUN_DEPENDS+= ${LOCALBASE}/include/avidemux/2.6/gtk/config.h:multimedia/avidemux-gtk	32	RUN_DEPENDS+= ${LOCALBASE}/include/avidemux/2.7/gtk/config.h:multimedia/avidemux-gtk
34	.endif	33	.endif
35		34
36	post-configure: post-configure-common	35	post-configure: post-configure-common

Lines 1-11 Link Here

(-)b/multimedia/avidemux/files/patch-avidemux__core_ADM__coreUtils_src_prefs2__pref.h (-4 / +4 lines)
1	--- avidemux_core/ADM_coreUtils/src/prefs2_pref.h.orig 2016-01-29 08:47:25 UTC	1	--- avidemux_core/ADM_coreUtils/src/prefs2_pref.h.orig 2019-08-15 07:25:39 UTC
2	+++ avidemux_core/ADM_coreUtils/src/prefs2_pref.h	2	+++ avidemux_core/ADM_coreUtils/src/prefs2_pref.h
3	@@ -19,7 +19,7 @@ static optionDesc myOptions[]={	3	@@ -18,7 +18,7 @@ static optionDesc myOptions[]={
4	{ FEATURES_REUSE_2PASS_LOG,"features.reuse_2pass_log" ,ADM_param_bool ,"0", 0, 1},	4	{ FEATURES_REUSE_2PASS_LOG,"features.reuse_2pass_log" ,ADM_param_bool ,"0", 0, 1},
5	{ FEATURES_AUDIOBAR_USES_MASTER,"features.audiobar_uses_master" ,ADM_param_bool ,"0", 0, 1},	5	{ FEATURES_AUDIOBAR_USES_MASTER,"features.audiobar_uses_master" ,ADM_param_bool ,"0", 0, 1},
6	{ FEATURES_THREADING_LAVC,"features.threading_lavc" ,ADM_param_uint32_t ,"0", 0, 32},	6	{ FEATURES_THREADING_LAVC,"features.threading_lavc" ,ADM_param_uint32_t ,"0", 0, 32},
7	-{ FEATURES_CPU_CAPS,"features.cpu_caps" ,ADM_param_uint32_t ,"4294967295", 0, 4294967295},	7	-{ FEATURES_CPU_CAPS,"features.cpu_caps" ,ADM_param_uint32_t ,"4294967295", 0, 4294967295},
8	+{ FEATURES_CPU_CAPS,"features.cpu_caps" ,ADM_param_uint32_t ,"4294967295", 0, static_cast<float>(4294967295)},	8	+{ FEATURES_CPU_CAPS,"features.cpu_caps" ,ADM_param_uint32_t ,"4294967295", 0, static_cast<float>(4294967295)},
		9	{ FEATURES_CACHE_SIZE,"features.cache_size" ,ADM_param_uint32_t ,"16", 8, 16},
9	{ FEATURES_MPEG_NO_LIMIT,"features.mpeg_no_limit" ,ADM_param_bool ,"0", 0, 1},	10	{ FEATURES_MPEG_NO_LIMIT,"features.mpeg_no_limit" ,ADM_param_bool ,"0", 0, 1},
10	{ FEATURES_ALTERNATE_MP3_TAG,"features.alternate_mp3_tag" ,ADM_param_bool ,"1", 0, 1},	11	{ FEATURES_DXVA2,"features.dxva2" ,ADM_param_bool ,"0", 0, 1},
11	{ FEATURES_VDPAU,"features.vdpau" ,ADM_param_bool ,"0", 0, 1},

Removed Link Here

(-)a/multimedia/avidemux/files/patch-avidemux__core_ADM__coreVideoCodec_include_ADM__ffmp43.h (-28 lines)
1	--- avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h.orig 2017-05-21 11:18:35 UTC
2	+++ avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h
3	@@ -180,7 +180,7 @@ ADM_COREVIDEOCODEC6_EXPORT void ADM_lavD
4	#define WRAP_Open_Template(funcz,argz,display,codecid,extra) \
5	{\
6	AVCodec *codec=funcz(argz);\
7	-if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec"display));ADM_assert(0);} \
8	+if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec" display));ADM_assert(0);} \
9	codecId=codecid; \
10	_context = avcodec_alloc_context3 (codec);\
11	ADM_assert (_context);\
12	@@ -210,13 +210,13 @@ if(!codec) {GUI_Error_HIG("Codec",QT_TR_
13	\
14	if (avcodec_open2(_context, codec, NULL) < 0) \
15	{ \
16	- printf("[lavc] Decoder init: "display" video decoder failed!\n"); \
17	- GUI_Error_HIG("Codec","Internal error opening "display); \
18	+ printf("[lavc] Decoder init: " display " video decoder failed!\n"); \
19	+ GUI_Error_HIG("Codec","Internal error opening " display); \
20	ADM_assert(0); \
21	} \
22	else \
23	{ \
24	- printf("[lavc] Decoder init: "display" video decoder initialized! (%s)\n",codec->long_name); \
25	+ printf("[lavc] Decoder init: " display " video decoder initialized! (%s)\n",codec->long_name); \
26	} \
27	}
28

Added Link Here

(-)b/multimedia/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__crashdump__unix.cpp (+13 lines)
1	--- avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp.orig 2019-08-15 07:25:39 UTC
2	+++ avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp
3	@@ -40,8 +40,8 @@
4	static ADM_saveFunction *mysaveFunction=NULL;
5	static ADM_fatalFunction *myFatalFunction=NULL;
6	static ADM_sigIntFunction *mySigIntFunction=NULL;
7	-static sighandler_t oldSignalHandlerSigInt;
8	-static sighandler_t oldSignalHandlerSigSev;
9	+static sig_t oldSignalHandlerSigInt;
10	+static sig_t oldSignalHandlerSigSev;
11	void sig_segfault_handler(int signo);
12	void sig_sigint_handler(int signo);
13

Removed Link Here

(-)a/multimedia/avidemux/files/patch-avidemux__core_ffmpeg__package_patches_config.mak.diff (-14 lines)
1	--- avidemux_core/ffmpeg_package/patches/config.mak.diff.orig 2015-05-15 09:19:29 UTC
2	+++ avidemux_core/ffmpeg_package/patches/config.mak.diff
3	@@ -1,6 +1,8 @@
4	---- config.mak 2011-09-29 06:10:57 UTC
5	-+++ config.mak 2011-09-29 06:11:44.896423943 +0000
6	-@@ -59,7 +59,7 @@
7	+--- config.mak.orig
8	++++ config.mak
9	+@@ -93,7 +93,7 @@
10	+ EXEOBJS=
11	+ INSTALL=install
12	LIBTARGET=
13	-SLIBNAME=$(SLIBPREF)$(FULLNAME)$(SLIBSUF)
14	+SLIBNAME=$(SLIBPREF)ADM6$(FULLNAME)$(SLIBSUF)

Removed Link Here

(-)a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__demuxers_MpegTS_dmxTSPacket.cpp (-53 lines)
1	--- avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp.orig 2016-01-29 08:47:25 UTC
2	+++ avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp
3	@@ -144,7 +144,7 @@ bool tsPacket::setPos(uint64_t pos)
4	{
5	if(!_file->setpos(pos))
6	{
7	- printf("[tsPacket] Cannot seek to %"PRIx64"\n", pos);
8	+ printf("[tsPacket] Cannot seek to %" PRIx64"\n", pos);
9	return false;
10	}
11	return true;
12	@@ -387,7 +387,7 @@ nextPack3:
13	zprintf("[TS Demuxer] Code=0x%x pid=0x%x\n",code,pes->pid);
14	if((code&0xffffff00)!=0x100)
15	{
16	- printf("[Ts Demuxer] No PES startcode at 0x%"PRIx64"\n",pkt.startAt);
17	+ printf("[Ts Demuxer] No PES startcode at 0x%" PRIx64"\n",pkt.startAt);
18	printf("0x:%02x %02x %02x %02x\n",pkt.payload[4],pkt.payload[5],pkt.payload[6],pkt.payload[7]);
19	goto nextPack3;
20	}
21	@@ -433,7 +433,7 @@ nextPack3:
22	/**
23	\fn decodePesHeader
24	*/
25	-#define fail(x) {printf("[Ts Demuxer]*******"x"*****\n");return false;}
26	+#define fail(x) {printf("[Ts Demuxer]*******" x"*****\n");return false;}
27	bool tsPacket::decodePesHeader(TS_PESpacket *pes)
28	{
29	uint8_t *start=pes->payload+6;
30	@@ -735,7 +735,7 @@ bool tsPacketLinear::read(uint32_t le
31	*/
32	bool tsPacketLinear::getInfo(dmxPacketInfo *info)
33	{
34	-#warning FIXME
35	+//#warning FIXME
36	if(pesPacket->offset<4)
37	{
38	info->startAt=this->oldStartAt;
39	@@ -780,12 +780,12 @@ bool tsPacketLinear::seek(uint64_t pa
40	{
41	if(!_file->setpos(packetStart))
42	{
43	- printf("[tsPacket] Cannot seek to %"PRIx64"\n",packetStart);
44	+ printf("[tsPacket] Cannot seek to %" PRIx64"\n",packetStart);
45	return 0;
46	}
47	if(!refill())
48	{
49	- printf("[tsPacketLinear] Seek to %"PRIx64":%"PRIx32" failed\n",packetStart,offset);
50	+ printf("[tsPacketLinear] Seek to %" PRIx64":%" PRIx32" failed\n",packetStart,offset);
51	return false;
52	}
53	ADM_assert(offset<pesPacket->payloadSize);

Removed Link Here

(-)a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoEncoder_xvid4_ADM__xvid4.cpp (-20 lines)
1	--- avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp.orig 2016-01-29 08:47:25 UTC
2	+++ avidemux_plugins/ADM_videoEncoder/xvid4/ADM_xvid4.cpp
3	@@ -54,7 +54,7 @@ typedef enum
4	RD_SQUARE = RD_HPEL_QPEL_8 \| XVID_ME_EXTSEARCH_RD
5	} RateDistortionMode;
6
7	-uint32_t rdMode[5]=
8	+int32_t rdMode[5]=
9	{
10	RD_NONE,
11	RD_DCT_ME,
12	@@ -332,7 +332,7 @@ again:
13	// Store Pts/DTS
14	ADM_timeMapping map; // Store real PTS <->lav value mapping
15	map.realTS=image->Pts+getEncoderDelay();
16	- aprintf("Pushing fn=%d Time=%"PRIu64"\n",frameNum,map.realTS);
17	+ aprintf("Pushing fn=%d Time=%" PRIu64"\n",frameNum,map.realTS);
18
19	map.internalTS=frameNum++;
20	mapper.push_back(map);

Removed Link Here

(-)a/multimedia/avidemux/files/patch-avidemux__plugins_ADM__videoFilters6_telecide_Telecide__getFrame.cpp (-29 lines)
1	--- avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp.orig 2016-01-29 08:47:25 UTC
2	+++ avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp
3	@@ -240,7 +240,7 @@ teleCide *_param=&configuration;
4	{
5	// The chosen frame doesn't match the prediction.
6	if (predicted_metric == 0) mismatch = 0.0;
7	- else mismatch = (100.0*abs(predicted_metric - lowest))/predicted_metric;
8	+ else mismatch = (100.0*abs((int)predicted_metric - (int)lowest))/predicted_metric;
9	if (mismatch < gthresh)
10	{
11	// It's close enough, so use the predicted one.
12	@@ -283,7 +283,7 @@ teleCide *_param=&configuration;
13	{
14	// The chosen frame doesn't match the prediction.
15	if (predicted_metric == 0) mismatch = 0.0;
16	- else mismatch = (100.0*abs(predicted_metric - lowest))/predicted_metric;
17	+ else mismatch = (100.0*abs((int)predicted_metric - (int)lowest))/predicted_metric;
18	if ((int) mismatch <= gthresh)
19	{
20	// It's close enough, so use the predicted one.
21	@@ -394,7 +394,7 @@ teleCide *_param=&configuration;
22	{
23	unsigned char dstpp, dstpn;
24	int v1, v2, z;
25	- #warning blend in place is wrong!
26	+ //#warning blend in place is wrong!
27	final=dst;
28	// MeanX:We should copy here as we blend from source and destination
29	// for the moment we do it in place, it is wrong.

Removed Link Here

(-)a/multimedia/avidemux/files/patch-cmake_admCheckX265.cmake (-12 lines)
1	--- cmake/admCheckX265.cmake.orig 2016-01-29 08:47:25 UTC
2	+++ cmake/admCheckX265.cmake
3	@@ -19,9 +19,6 @@ MACRO(checkX265)
4	MESSAGE("WARNING: x265 core version is too old. At least version 9 is required.")
5	SET(X265_FOUND 0)
6	ELSE (x265_version LESS 9)
7	- IF(NOT WIN32)
8	- SET(DL dl)
9	- ENDIF(NOT WIN32)
10	FIND_HEADER_AND_LIB(X265 x265.h x265 x265_encoder_open_${x265_version} ${DL})
11	ENDIF (x265_version LESS 9)
12	ELSE (_X265_FOUND AND _X265_CONFIG_FOUND)