View | Details | Raw Unified | Return to bug 238231 | Differences between
and this patch

Collapse All | Expand All

(-)net/freeswitch/Makefile (-15 / +46 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	freeswitch
4
PORTNAME=	freeswitch
5
PORTVERSION=	1.8.1
5
PORTVERSION=	1.8.5
6
PORTREVISION=	2
7
CATEGORIES=	net
6
CATEGORIES=	net
8
MASTER_SITES=	http://files.freeswitch.org/releases/freeswitch/ \
7
MASTER_SITES=	http://files.freeswitch.org/releases/freeswitch/ \
9
		http://files.freeswitch.org/releases/sounds/:sounds
8
		http://files.freeswitch.org/releases/sounds/:sounds
Lines 29-37 Link Here
29
		libjbig.so:graphics/jbigkit \
28
		libjbig.so:graphics/jbigkit \
30
		libtiff.so:graphics/tiff
29
		libtiff.so:graphics/tiff
31
30
32
USES=		gmake iconv jpeg libedit libtool lua perl5 pkgconfig shebangfix ssl tar:xz
31
#Add autoreconf for mod_unimrcp
32
USES=		autoreconf gmake iconv jpeg libedit libtool lua perl5 pkgconfig shebangfix ssl tar:xz
33
USE_LDCONFIG=	yes
33
USE_LDCONFIG=	yes
34
USE_RC_SUBR=	freeswitch
34
USE_RC_SUBR=	freeswitch
35
35
SHEBANG_FILES=	scripts/fsxs.in
36
SHEBANG_FILES=	scripts/fsxs.in
36
37
37
CONFLICTS_BUILD=	xmlrpc-c-*
38
CONFLICTS_BUILD=	xmlrpc-c-*
Lines 46-68 Link Here
46
47
47
SUB_FILES=	pkg-message
48
SUB_FILES=	pkg-message
48
49
49
OPTIONS_DEFINE=		ALL_MODULES X11 EXAMPLES
50
OPTIONS_DEFINE=		ALL_MODULES X11 EXAMPLES PGSQL
50
OPTIONS_DEFAULT=	8K 16K ENGLISH
51
OPTIONS_DEFAULT=	8K 16K ENGLISH PGSQL
51
OPTIONS_MULTI=		BITRATE LANGUAGE
52
OPTIONS_MULTI=		BITRATE LANGUAGE
52
OPTIONS_MULTI_BITRATE=	8K 16K 32K 48K
53
OPTIONS_MULTI_BITRATE=	8K 16K 32K 48K
53
OPTIONS_MULTI_LANGUAGE=	ENGLISH FRENCH RUSSIAN
54
OPTIONS_MULTI_LANGUAGE=	CHINESE_HK CHINESE_SIM BRAZILIAN ENGLISH ENGLISH_CA FRENCH_CA RUSSIAN SWEDISH
54
OPTIONS_SUB=		yes
55
OPTIONS_SUB=		yes
55
NO_OPTIONS_SORT=	yes
56
NO_OPTIONS_SORT=	yes
56
57
57
ALL_MODULES_DESC=	Build all modules
58
ALL_MODULES_DESC=	Build all modules
58
X11_DESC=	graphics/ImageMagick[-nox11] dependency
59
X11_DESC=		graphics/ImageMagick[-nox11] dependency
59
8K_DESC=	8kHz Audio Files
60
8K_DESC=		8kHz Audio Files
60
16K_DESC=	16kHz Audio Files
61
16K_DESC=		16kHz Audio Files
61
32K_DESC=	32kHz Audio Files
62
32K_DESC=		32kHz Audio Files
62
48K_DESC=	48kHz Audio Files
63
48K_DESC=		48kHz Audio Files
63
ENGLISH_DESC=	US English Language Sounds
64
BRAZILIAN_DESC=		Brazilian Portuguese Language Sounds
64
FRENCH_DESC=	French Canadian Language Sounds
65
CHINESE_HK_DESC=	Chinese Traditional Hong Kong
65
RUSSIAN_DESC=	Russian Language Sounds
66
CHINESE_SIM_DESC=	Chinese Simplified Language Sounds
67
ENGLISH_DESC=		US English Language Sounds
68
ENGLISH_CA_DESC=	Canadian English Language Sounds
69
FRENCH_CA_DESC=		French Canadian Language Sounds
70
RUSSIAN_DESC=		Russian Language Sounds
71
SWEDISH_DESC=		Swedish Language Sounds
66
72
67
ALL_MODULES_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa \
73
ALL_MODULES_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa \
68
				${LOCALBASE}/bin/aclocal:devel/automake
74
				${LOCALBASE}/bin/aclocal:devel/automake
Lines 91-96 Link Here
91
32K_VARS=	BITRATES+=32000
97
32K_VARS=	BITRATES+=32000
92
48K_VARS=	BITRATES+=48000
98
48K_VARS=	BITRATES+=48000
93
99
100
PGSQL_USES=	pgsql
101
PGSQL_CONFIGURE_ENABLE=	core-pgsql-support
102
94
# install-strip causes `make stage' to fail:
103
# install-strip causes `make stage' to fail:
95
# libtool: install: strip --strip-debug /wrkdirs/usr/ports/net/freeswitch/work/stage/usr/local/lib/libfreeswitch.a
104
# libtool: install: strip --strip-debug /wrkdirs/usr/ports/net/freeswitch/work/stage/usr/local/lib/libfreeswitch.a
96
# strip: file format not recognized
105
# strip: file format not recognized
Lines 108-126 Link Here
108
117
109
EDPRE=	freeswitch-sounds
118
EDPRE=	freeswitch-sounds
110
EDPOST=	1.0.51.tar.gz
119
EDPOST=	1.0.51.tar.gz
120
#Swedish lang sounds are older/lower version.
121
EDPOST_SV=	1.0.50.tar.gz
111
EDPOST_MUSIC=	1.0.52.tar.gz
122
EDPOST_MUSIC=	1.0.52.tar.gz
112
123
113
.for rate in ${BITRATES}
124
.for rate in ${BITRATES}
114
EXTRADISTFILES+=	${EDPRE}-music-${rate}-${EDPOST_MUSIC}
125
EXTRADISTFILES+=	${EDPRE}-music-${rate}-${EDPOST_MUSIC}
126
.if ${PORT_OPTIONS:MBRAZILIAN}
127
EXTRADISTFILES+=	${EDPRE}-pt-BR-karina-${rate}-${EDPOST}
128
.endif
129
.if ${PORT_OPTIONS:MCHINESE_SIM}
130
EXTRADISTFILES+=	${EDPRE}-zh-cn-sinmei-${rate}-${EDPOST}
131
.endif
132
.if ${PORT_OPTIONS:MCHINESE_HK}
133
EXTRADISTFILES+=	${EDPRE}-zh-hk-sinmei-${rate}-${EDPOST}
134
.endif
115
.if ${PORT_OPTIONS:MENGLISH}
135
.if ${PORT_OPTIONS:MENGLISH}
116
EXTRADISTFILES+=	${EDPRE}-en-us-callie-${rate}-${EDPOST}
136
EXTRADISTFILES+=	${EDPRE}-en-us-callie-${rate}-${EDPOST}
117
.endif
137
.endif
118
.if ${PORT_OPTIONS:MFRENCH}
138
.if ${PORT_OPTIONS:MENGLISH_CA}
139
EXTRADISTFILES+=	${EDPRE}-en-ca-june-${rate}-${EDPOST}
140
.endif
141
.if ${PORT_OPTIONS:MFRENCH_CA}
119
EXTRADISTFILES+=	${EDPRE}-fr-ca-june-${rate}-${EDPOST}
142
EXTRADISTFILES+=	${EDPRE}-fr-ca-june-${rate}-${EDPOST}
120
.endif
143
.endif
121
.if ${PORT_OPTIONS:MRUSSIAN}
144
.if ${PORT_OPTIONS:MRUSSIAN}
122
EXTRADISTFILES+=	${EDPRE}-ru-RU-elena-${rate}-${EDPOST}
145
EXTRADISTFILES+=	${EDPRE}-ru-RU-elena-${rate}-${EDPOST}
123
.endif
146
.endif
147
.if ${PORT_OPTIONS:MSWEDISH}
148
EXTRADISTFILES+=	${EDPRE}-sv-se-jakob-${rate}-${EDPOST_SV}
149
.endif
124
.endfor
150
.endfor
125
151
126
.for distfile in ${EXTRADISTFILES}
152
.for distfile in ${EXTRADISTFILES}
Lines 127-132 Link Here
127
DISTFILES+=	${distfile}:sounds
153
DISTFILES+=	${distfile}:sounds
128
.endfor
154
.endfor
129
155
156
# Patch out mod_signalwire as it requires libks that isn't available, yet.
157
post-patch:
158
		${REINPLACE_CMD} -Ee 's|^(applications/mod_signalwire)|#\1|' \
159
			${WRKSRC}/modules.conf
160
130
post-install:
161
post-install:
131
		${MKDIR} ${STAGEDIR}${DATADIR}/sounds
162
		${MKDIR} ${STAGEDIR}${DATADIR}/sounds
132
.for distfile in ${EXTRADISTFILES}
163
.for distfile in ${EXTRADISTFILES}
(-)net/freeswitch/distinfo (-11 / +51 lines)
Lines 1-35 Link Here
1
TIMESTAMP = 1536503355
1
TIMESTAMP = 1552339873
2
SHA256 (freeswitch-1.8.1.tar.xz) = f606de858e2df09a752f890e8f0fc41dae8dd888e3fe952e17a90e9ff9ed270e
2
SHA256 (freeswitch-1.8.5.tar.xz) = 503a551be5d6df06162ea9d98a952b6fb524852ce2352fe3ca3a36a76995b046
3
SIZE (freeswitch-1.8.1.tar.xz) = 28449552
3
SIZE (freeswitch-1.8.5.tar.xz) = 28816680
4
SHA256 (freeswitch-sounds-music-8000-1.0.52.tar.gz) = 2491dcb92a69c629b03ea070d2483908a52e2c530dd77791f49a45a4d70aaa07
5
SIZE (freeswitch-sounds-music-8000-1.0.52.tar.gz) = 14620675
6
SHA256 (freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = e48a63bd69e6253d294ce43a941d603b02467feb5d92ee57a536ccc5f849a4a8
7
SIZE (freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = 18657031
8
SHA256 (freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz) = eada67c61bd62ec420eb017df7524d10de286fba0c2da4800516b9f62c00e78c
9
SIZE (freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz) = 13460178
10
SHA256 (freeswitch-sounds-ru-RU-elena-8000-1.0.51.tar.gz) = d2679503eb1f4dc1716df5f8c4b5a7b721f087b17e96a02b1a92480311074c66
11
SIZE (freeswitch-sounds-ru-RU-elena-8000-1.0.51.tar.gz) = 12678200
12
SHA256 (freeswitch-sounds-music-16000-1.0.52.tar.gz) = 93e0bf31797f4847dc19a94605c039ad4f0763616b6d819f5bddbfb6dd09718a
4
SHA256 (freeswitch-sounds-music-16000-1.0.52.tar.gz) = 93e0bf31797f4847dc19a94605c039ad4f0763616b6d819f5bddbfb6dd09718a
13
SIZE (freeswitch-sounds-music-16000-1.0.52.tar.gz) = 27991592
5
SIZE (freeswitch-sounds-music-16000-1.0.52.tar.gz) = 27991592
14
SHA256 (freeswitch-sounds-en-us-callie-16000-1.0.51.tar.gz) = 324b1ab5ab754db5697963e9bf6a2f9c7aeb1463755e86bbb6dc4d6a77329da2
6
SHA256 (freeswitch-sounds-en-us-callie-16000-1.0.51.tar.gz) = 324b1ab5ab754db5697963e9bf6a2f9c7aeb1463755e86bbb6dc4d6a77329da2
15
SIZE (freeswitch-sounds-en-us-callie-16000-1.0.51.tar.gz) = 37171776
7
SIZE (freeswitch-sounds-en-us-callie-16000-1.0.51.tar.gz) = 37171776
8
SHA256 (freeswitch-sounds-en-ca-june-16000-1.0.51.tar.gz) = 8d0091a2c98e5e06afea6bdd9f6cf2942e937786016037207b85757218b0f7a7
9
SIZE (freeswitch-sounds-en-ca-june-16000-1.0.51.tar.gz) = 9417564
16
SHA256 (freeswitch-sounds-fr-ca-june-16000-1.0.51.tar.gz) = f942980ad359951ef3f69a324a3299ef86cdb4f8d2c62adaf73a1b95fb39fcc6
10
SHA256 (freeswitch-sounds-fr-ca-june-16000-1.0.51.tar.gz) = f942980ad359951ef3f69a324a3299ef86cdb4f8d2c62adaf73a1b95fb39fcc6
17
SIZE (freeswitch-sounds-fr-ca-june-16000-1.0.51.tar.gz) = 26591167
11
SIZE (freeswitch-sounds-fr-ca-june-16000-1.0.51.tar.gz) = 26591167
18
SHA256 (freeswitch-sounds-ru-RU-elena-16000-1.0.51.tar.gz) = e5a354cd10401208291f1d0e668a8cf8215d3cdcb93f2cbd4b83dd134425e60b
12
SHA256 (freeswitch-sounds-ru-RU-elena-16000-1.0.51.tar.gz) = e5a354cd10401208291f1d0e668a8cf8215d3cdcb93f2cbd4b83dd134425e60b
19
SIZE (freeswitch-sounds-ru-RU-elena-16000-1.0.51.tar.gz) = 25072831
13
SIZE (freeswitch-sounds-ru-RU-elena-16000-1.0.51.tar.gz) = 25072831
14
SHA256 (freeswitch-sounds-pt-BR-karina-16000-1.0.51.tar.gz) = 80432c1027f57e464cd899ed92216936cf48a3993dc1c168b1be2545b8f97aed
15
SIZE (freeswitch-sounds-pt-BR-karina-16000-1.0.51.tar.gz) = 27665896
16
SHA256 (freeswitch-sounds-sv-se-jakob-16000-1.0.50.tar.gz) = 52da670c651ff598815aed655644b44b891ee158f4c67d048da90056a36ddcf6
17
SIZE (freeswitch-sounds-sv-se-jakob-16000-1.0.50.tar.gz) = 5391972
18
SHA256 (freeswitch-sounds-zh-cn-sinmei-16000-1.0.51.tar.gz) = d849a5818ac6630d7c572d728dcd48176a6877defd8c239cb12011528e95c2cd
19
SIZE (freeswitch-sounds-zh-cn-sinmei-16000-1.0.51.tar.gz) = 596908
20
SHA256 (freeswitch-sounds-zh-hk-sinmei-16000-1.0.51.tar.gz) = 0950e1d971b4f2ba4decd949406ccd0198fe9c686f246e175c70aafdf9783f30
21
SIZE (freeswitch-sounds-zh-hk-sinmei-16000-1.0.51.tar.gz) = 553051
20
SHA256 (freeswitch-sounds-music-32000-1.0.52.tar.gz) = 4129788a638b77c5f85ff35abfcd69793d8aeb9d7833a75c74ec77355b2657a9
22
SHA256 (freeswitch-sounds-music-32000-1.0.52.tar.gz) = 4129788a638b77c5f85ff35abfcd69793d8aeb9d7833a75c74ec77355b2657a9
21
SIZE (freeswitch-sounds-music-32000-1.0.52.tar.gz) = 53007947
23
SIZE (freeswitch-sounds-music-32000-1.0.52.tar.gz) = 53007947
22
SHA256 (freeswitch-sounds-en-us-callie-32000-1.0.51.tar.gz) = 06fd6b8aec937556bf5303ab19a212c60daf00546d395cf269dfe324ac9c6838
24
SHA256 (freeswitch-sounds-en-us-callie-32000-1.0.51.tar.gz) = 06fd6b8aec937556bf5303ab19a212c60daf00546d395cf269dfe324ac9c6838
23
SIZE (freeswitch-sounds-en-us-callie-32000-1.0.51.tar.gz) = 73012907
25
SIZE (freeswitch-sounds-en-us-callie-32000-1.0.51.tar.gz) = 73012907
26
SHA256 (freeswitch-sounds-en-ca-june-32000-1.0.51.tar.gz) = 8720b363995724792ff4723e1c8218ef95b27cb36208b7258f93bdda72123387
27
SIZE (freeswitch-sounds-en-ca-june-32000-1.0.51.tar.gz) = 18422131
24
SHA256 (freeswitch-sounds-fr-ca-june-32000-1.0.51.tar.gz) = 8966a0c4daf666018cca6d8ba0f7708e251bed952b015d0ca6a0792341fe531b
28
SHA256 (freeswitch-sounds-fr-ca-june-32000-1.0.51.tar.gz) = 8966a0c4daf666018cca6d8ba0f7708e251bed952b015d0ca6a0792341fe531b
25
SIZE (freeswitch-sounds-fr-ca-june-32000-1.0.51.tar.gz) = 52040064
29
SIZE (freeswitch-sounds-fr-ca-june-32000-1.0.51.tar.gz) = 52040064
26
SHA256 (freeswitch-sounds-ru-RU-elena-32000-1.0.51.tar.gz) = a2b43f20246f376d55dd73d269eb238cbeb6a961a40716d2f79a5835344aabfc
30
SHA256 (freeswitch-sounds-ru-RU-elena-32000-1.0.51.tar.gz) = a2b43f20246f376d55dd73d269eb238cbeb6a961a40716d2f79a5835344aabfc
27
SIZE (freeswitch-sounds-ru-RU-elena-32000-1.0.51.tar.gz) = 49276482
31
SIZE (freeswitch-sounds-ru-RU-elena-32000-1.0.51.tar.gz) = 49276482
32
SHA256 (freeswitch-sounds-pt-BR-karina-32000-1.0.51.tar.gz) = e80a8653585cf9a4fe9cf1c0004279602542d15894ba13f2104d990cefdee567
33
SIZE (freeswitch-sounds-pt-BR-karina-32000-1.0.51.tar.gz) = 53420983
34
SHA256 (freeswitch-sounds-sv-se-jakob-32000-1.0.50.tar.gz) = 160de01069afa827c830595e521b53d95de4b415b48061fb843a1c4025fa17f2
35
SIZE (freeswitch-sounds-sv-se-jakob-32000-1.0.50.tar.gz) = 10018608
36
SHA256 (freeswitch-sounds-zh-cn-sinmei-32000-1.0.51.tar.gz) = 903fda016d2ac053ffe6bc2d4eaf816a66c8043ddc3383d48b7b14335d9ea98e
37
SIZE (freeswitch-sounds-zh-cn-sinmei-32000-1.0.51.tar.gz) = 1153330
38
SHA256 (freeswitch-sounds-zh-hk-sinmei-32000-1.0.51.tar.gz) = 97d846ab06b5c84d2c46bec64560556acbfc88eb2080bd325b2c5259a5ae80d0
39
SIZE (freeswitch-sounds-zh-hk-sinmei-32000-1.0.51.tar.gz) = 1061068
28
SHA256 (freeswitch-sounds-music-48000-1.0.52.tar.gz) = cc31cdb5b1bd653850bf6e054d963314bcf7c1706a9bf05f5a69bcbd00858d2a
40
SHA256 (freeswitch-sounds-music-48000-1.0.52.tar.gz) = cc31cdb5b1bd653850bf6e054d963314bcf7c1706a9bf05f5a69bcbd00858d2a
29
SIZE (freeswitch-sounds-music-48000-1.0.52.tar.gz) = 75551487
41
SIZE (freeswitch-sounds-music-48000-1.0.52.tar.gz) = 75551487
30
SHA256 (freeswitch-sounds-en-us-callie-48000-1.0.51.tar.gz) = cfc50f1d9b5d43cb87a9a2c0ce136c37ee85ac3b0e5be930d8dc2c913c4495aa
42
SHA256 (freeswitch-sounds-en-us-callie-48000-1.0.51.tar.gz) = cfc50f1d9b5d43cb87a9a2c0ce136c37ee85ac3b0e5be930d8dc2c913c4495aa
31
SIZE (freeswitch-sounds-en-us-callie-48000-1.0.51.tar.gz) = 105319388
43
SIZE (freeswitch-sounds-en-us-callie-48000-1.0.51.tar.gz) = 105319388
44
SHA256 (freeswitch-sounds-en-ca-june-48000-1.0.51.tar.gz) = d2fce478a95b8d9500a544a00253c81d7e9f639e21980bd689910fac87f30871
45
SIZE (freeswitch-sounds-en-ca-june-48000-1.0.51.tar.gz) = 27088410
32
SHA256 (freeswitch-sounds-fr-ca-june-48000-1.0.51.tar.gz) = abaea558fb5485abdd01d0b1186e03cf508f96ac90492814cc7ed4475e99a1e0
46
SHA256 (freeswitch-sounds-fr-ca-june-48000-1.0.51.tar.gz) = abaea558fb5485abdd01d0b1186e03cf508f96ac90492814cc7ed4475e99a1e0
33
SIZE (freeswitch-sounds-fr-ca-june-48000-1.0.51.tar.gz) = 76666642
47
SIZE (freeswitch-sounds-fr-ca-june-48000-1.0.51.tar.gz) = 76666642
34
SHA256 (freeswitch-sounds-ru-RU-elena-48000-1.0.51.tar.gz) = ffd7d34907f6b6ac861e7898d2237ad763f242a17cd23811da28fd7745d3350d
48
SHA256 (freeswitch-sounds-ru-RU-elena-48000-1.0.51.tar.gz) = ffd7d34907f6b6ac861e7898d2237ad763f242a17cd23811da28fd7745d3350d
35
SIZE (freeswitch-sounds-ru-RU-elena-48000-1.0.51.tar.gz) = 72438142
49
SIZE (freeswitch-sounds-ru-RU-elena-48000-1.0.51.tar.gz) = 72438142
50
SHA256 (freeswitch-sounds-pt-BR-karina-48000-1.0.51.tar.gz) = 51ef9cac2dc4dd70d81c18f8e65bfd11de44207e8fac9961a68aa0d50d539870
51
SIZE (freeswitch-sounds-pt-BR-karina-48000-1.0.51.tar.gz) = 78609528
52
SHA256 (freeswitch-sounds-sv-se-jakob-48000-1.0.50.tar.gz) = 059889d75926b8e1f39e8d2c33f0e8f744a43c094bbe213a1caa9f26ae9a2799
53
SIZE (freeswitch-sounds-sv-se-jakob-48000-1.0.50.tar.gz) = 14125474
54
SHA256 (freeswitch-sounds-zh-cn-sinmei-48000-1.0.51.tar.gz) = 95b9064acec13a0a32b15ea0b44dc408094b4d9dee84b183c5d9150a77e9bb23
55
SIZE (freeswitch-sounds-zh-cn-sinmei-48000-1.0.51.tar.gz) = 1680437
56
SHA256 (freeswitch-sounds-zh-hk-sinmei-48000-1.0.51.tar.gz) = bd605be7e536e11f8f67229a95513ef3f177263587c5bca75ccae647f43962a1
57
SIZE (freeswitch-sounds-zh-hk-sinmei-48000-1.0.51.tar.gz) = 1552162
58
SHA256 (freeswitch-sounds-music-8000-1.0.52.tar.gz) = 2491dcb92a69c629b03ea070d2483908a52e2c530dd77791f49a45a4d70aaa07
59
SIZE (freeswitch-sounds-music-8000-1.0.52.tar.gz) = 14620675
60
SHA256 (freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = e48a63bd69e6253d294ce43a941d603b02467feb5d92ee57a536ccc5f849a4a8
61
SIZE (freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = 18657031
62
SHA256 (freeswitch-sounds-en-ca-june-8000-1.0.51.tar.gz) = 9aaa9d73cfecfdab7a1fa2d63d65b922b86a405ebb9a31b09b15e58a2af9260a
63
SIZE (freeswitch-sounds-en-ca-june-8000-1.0.51.tar.gz) = 4754438
64
SHA256 (freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz) = eada67c61bd62ec420eb017df7524d10de286fba0c2da4800516b9f62c00e78c
65
SIZE (freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz) = 13460178
66
SHA256 (freeswitch-sounds-ru-RU-elena-8000-1.0.51.tar.gz) = d2679503eb1f4dc1716df5f8c4b5a7b721f087b17e96a02b1a92480311074c66
67
SIZE (freeswitch-sounds-ru-RU-elena-8000-1.0.51.tar.gz) = 12678200
68
SHA256 (freeswitch-sounds-pt-BR-karina-8000-1.0.51.tar.gz) = ba9b5d7f97675c560823a6f94804a6716dac66efe203dd1779952518c3944a77
69
SIZE (freeswitch-sounds-pt-BR-karina-8000-1.0.51.tar.gz) = 14142676
70
SHA256 (freeswitch-sounds-sv-se-jakob-8000-1.0.50.tar.gz) = aa81c97b2954b36d5625d556d2c6764ee79d0c925284ba5ff4c60cb479936b48
71
SIZE (freeswitch-sounds-sv-se-jakob-8000-1.0.50.tar.gz) = 2800728
72
SHA256 (freeswitch-sounds-zh-cn-sinmei-8000-1.0.51.tar.gz) = 764985f39313426ef4a0ea4dd848f05faaced37b91b2c9a22f17d3f77235fae3
73
SIZE (freeswitch-sounds-zh-cn-sinmei-8000-1.0.51.tar.gz) = 302713
74
SHA256 (freeswitch-sounds-zh-hk-sinmei-8000-1.0.51.tar.gz) = 917d08c80969bdaf30f2a63a3b69f542b143614d42c6241503ac655d13864eb0
75
SIZE (freeswitch-sounds-zh-hk-sinmei-8000-1.0.51.tar.gz) = 282597
(-)net/freeswitch/files/extrapatch-modules.conf (-3 / +4 lines)
Lines 1-6 Link Here
1
--- modules.conf.orig	2018-09-07 17:29:48.000000000 +0000
1
--- modules.conf.orig	2019-01-25 00:17:59 UTC
2
+++ modules.conf	2018-09-10 16:55:17.869385000 +0000
2
+++ modules.conf
3
@@ -1,165 +1,165 @@
3
@@ -1,166 +1,166 @@
4
-#applications/mod_abstraction
4
-#applications/mod_abstraction
5
-#applications/mod_av
5
-#applications/mod_av
6
-#applications/mod_avmd
6
-#applications/mod_avmd
Lines 66-71 Link Here
66
 #applications/mod_rad_auth
66
 #applications/mod_rad_auth
67
-#applications/mod_redis
67
-#applications/mod_redis
68
-#applications/mod_rss
68
-#applications/mod_rss
69
 applications/mod_signalwire
69
+applications/mod_redis
70
+applications/mod_redis
70
+applications/mod_rss
71
+applications/mod_rss
71
 applications/mod_sms
72
 applications/mod_sms
(-)net/freeswitch/files/patch-ffmpeg4 (-63 lines)
Lines 1-63 Link Here
1
avcodec.c:194:40: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE'
2
static uint8_t ff_input_buffer_padding[FF_INPUT_BUFFER_PADDING_SIZE] = { 0 };
3
                                       ^
4
avformat.c:471:14: error: use of undeclared identifier 'CODEC_FLAG_LOOP_FILTER'
5
                        c->flags|=CODEC_FLAG_LOOP_FILTER;   // flags=+loop
6
                                  ^
7
avformat.c:477:47: error: use of undeclared identifier 'ME_HEX'
8
                        av_opt_set_int(c->priv_data, "motion_est", ME_HEX, 0);
9
                                                                   ^
10
avformat.c:553:15: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER'
11
                c->flags |= CODEC_FLAG_GLOBAL_HEADER;
12
                            ^
13
avformat.c:638:31: error: use of undeclared identifier 'CODEC_CAP_VARIABLE_FRAME_SIZE'
14
        if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
15
                                     ^
16
17
--- src/mod/applications/mod_av/avcodec.c.orig	2017-07-13 12:07:30 UTC
18
+++ src/mod/applications/mod_av/avcodec.c
19
@@ -191,7 +191,7 @@ typedef struct h264_codec_context_s {
20
 	int hw_encoder;
21
 } h264_codec_context_t;
22
 
23
-static uint8_t ff_input_buffer_padding[FF_INPUT_BUFFER_PADDING_SIZE] = { 0 };
24
+static uint8_t ff_input_buffer_padding[AV_INPUT_BUFFER_PADDING_SIZE] = { 0 };
25
 
26
 static switch_status_t buffer_h264_nalu(h264_codec_context_t *context, switch_frame_t *frame)
27
 {
28
--- src/mod/applications/mod_av/avformat.c.orig	2017-07-13 12:07:30 UTC
29
+++ src/mod/applications/mod_av/avformat.c
30
@@ -479,13 +479,13 @@
31
 			c->ticks_per_frame = 2;
32
 
33
 
34
-			c->flags|=CODEC_FLAG_LOOP_FILTER;   // flags=+loop
35
+			c->flags|=AV_CODEC_FLAG_LOOP_FILTER;   // flags=+loop
36
 			c->me_cmp|= 1;  // cmp=+chroma, where CHROMA = 1
37
 			c->me_range = 16;   // me_range=16
38
 			c->max_b_frames = 3;    // bf=3
39
 
40
 			av_opt_set_int(c->priv_data, "b_strategy", 1, 0);
41
-			av_opt_set_int(c->priv_data, "motion_est", ME_HEX, 0);
42
+			av_opt_set(c->priv_data, "motion_est", "hex", 0);
43
 			av_opt_set_int(c->priv_data, "coder", 1, 0);
44
 
45
 			switch (mm->vprofile) {
46
@@ -568,7 +568,7 @@
47
 
48
 	/* Some formats want stream headers to be separate. */
49
 	if (fc->oformat->flags & AVFMT_GLOBALHEADER) {
50
-		c->flags |= CODEC_FLAG_GLOBAL_HEADER;
51
+		c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
52
 	}
53
 
54
 	mst->active = 1;
55
@@ -660,7 +660,7 @@
56
 	mst->frame->format         = AV_SAMPLE_FMT_S16;
57
 	mst->frame->channel_layout = c->channel_layout;
58
 
59
-	if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
60
+	if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) {
61
 		//mst->frame->nb_samples = 10000;
62
 		mst->frame->nb_samples = (mst->frame->sample_rate / 50) * c->channels;
63
 	} else {
(-)net/freeswitch/files/patch-src_switch__utils.c (+11 lines)
Line 0 Link Here
1
--- src/switch_utils.c.orig	2019-05-26 01:06:48 UTC
2
+++ src/switch_utils.c
3
@@ -1847,7 +1847,7 @@ SWITCH_DECLARE(switch_status_t) switch_f
4
 				goto doh;
5
 			}
6
 
7
-			switch_copy_string(buf, get_addr(abuf, sizeof(abuf), (struct sockaddr *) &iface_out, sizeof(struct sockaddr_storage)), len);
8
+			switch_copy_string(buf, get_addr(abuf, sizeof(abuf), (struct sockaddr *) &iface_out, sizeof(iface_out)), len);
9
 			if (mask) {
10
 				get_netmask((struct sockaddr_in *) &iface_out, mask);
11
 			}
(-)net/freeswitch/pkg-plist (+14 lines)
Lines 4-9 Link Here
4
bin/fs_ivrd
4
bin/fs_ivrd
5
bin/fsxs
5
bin/fsxs
6
bin/gentls_cert
6
bin/gentls_cert
7
bin/switch_core
8
bin/switch_event
9
bin/switch_hash
10
bin/switch_ivr_originate
11
bin/switch_utils
12
%%ALL_MODULES%%bin/test_avformat
13
%%ALL_MODULES%%bin/test_iks
14
%%ALL_MODULES%%bin/test_mod_av
15
%%ALL_MODULES%%bin/test_nlsml
16
%%ALL_MODULES%%bin/test_srgs
7
bin/tone2wav
17
bin/tone2wav
8
include/freeswitch/libteletone.h
18
include/freeswitch/libteletone.h
9
include/freeswitch/libteletone_detect.h
19
include/freeswitch/libteletone_detect.h
Lines 57-62 Link Here
57
include/freeswitch/switch_vpx.h
67
include/freeswitch/switch_vpx.h
58
include/freeswitch/switch_xml.h
68
include/freeswitch/switch_xml.h
59
include/freeswitch/switch_xml_config.h
69
include/freeswitch/switch_xml_config.h
70
include/freeswitch/test/switch_fct.h
71
include/freeswitch/test/switch_test.h
60
include/freeswitch/tpl.h
72
include/freeswitch/tpl.h
61
%%ALL_MODULES%%lib/freeswitch/mod/mod_abstraction.so
73
%%ALL_MODULES%%lib/freeswitch/mod/mod_abstraction.so
62
%%ALL_MODULES%%lib/freeswitch/mod/mod_alsa.so
74
%%ALL_MODULES%%lib/freeswitch/mod/mod_alsa.so
Lines 643-648 Link Here
643
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/amqp.conf.xml
655
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/amqp.conf.xml
644
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/amr.conf.xml
656
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/amr.conf.xml
645
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/amrwb.conf.xml
657
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/amrwb.conf.xml
658
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/av.conf.xml
646
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/avmd.conf.xml
659
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/avmd.conf.xml
647
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/blacklist.conf.xml
660
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/blacklist.conf.xml
648
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/callcenter.conf.xml
661
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/callcenter.conf.xml
Lines 655-660 Link Here
655
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/conference.conf.xml
668
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/conference.conf.xml
656
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/conference_layouts.conf.xml
669
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/conference_layouts.conf.xml
657
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/console.conf.xml
670
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/console.conf.xml
671
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/curl.conf.xml
658
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/db.conf.xml
672
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/db.conf.xml
659
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/dialplan_directory.conf.xml
673
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/dialplan_directory.conf.xml
660
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/dingaling.conf.xml
674
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/dingaling.conf.xml

Return to bug 238231