View | Details | Raw Unified | Return to bug 246515
Collapse All | Expand All

(-)Makefile (-14 / +32 lines)
Lines 32-38 Link Here
32
		libtiff.so:graphics/tiff \
32
		libtiff.so:graphics/tiff \
33
		libuuid.so:misc/e2fsprogs-libuuid
33
		libuuid.so:misc/e2fsprogs-libuuid
34
34
35
USES=		gmake iconv jpeg libedit libtool lua:51-52 perl5 \
35
USES=		gmake iconv jpeg libedit libtool lua perl5 \
36
		pkgconfig shebangfix ssl
36
		pkgconfig shebangfix ssl
37
USE_LDCONFIG=	yes
37
USE_LDCONFIG=	yes
38
USE_RC_SUBR=	freeswitch
38
USE_RC_SUBR=	freeswitch
Lines 48-54 Link Here
48
GNU_CONFIGURE=		yes
48
GNU_CONFIGURE=		yes
49
CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
49
CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
50
		--enable-zrtp
50
		--enable-zrtp
51
CFLAGS+=	-Wno-error
51
CFLAGS+=	-Wno-error -I${LUA_INCDIR}
52
52
53
USERS=		${PORTNAME}
53
USERS=		${PORTNAME}
54
GROUPS=		${USERS}
54
GROUPS=		${USERS}
Lines 79-104 Link Here
79
SWEDISH_DESC=		Swedish Language Sounds
79
SWEDISH_DESC=		Swedish Language Sounds
80
80
81
ALL_MODULES_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa \
81
ALL_MODULES_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa \
82
				${LOCALBASE}/bin/aclocal:devel/automake
82
				${LOCALBASE}/bin/aclocal:devel/automake \
83
				${LOCALBASE}/bin/erl:lang/erlang \
84
				${LOCALBASE}/bin/bash:shells/bash \
85
				${LOCALBASE}/bin/mariadb:databases/mariadb104-client
83
ALL_MODULES_CONFLICTS_BUILD=	apr
86
ALL_MODULES_CONFLICTS_BUILD=	apr
84
ALL_MODULES_EXTRA_PATCHES=	${FILESDIR}/extrapatch-modules.conf
87
ALL_MODULES_EXTRA_PATCHES=	${FILESDIR}/extrapatch-modules.conf
85
ALL_MODULES_LIB_DEPENDS=	libopencv_video.so:graphics/opencv \
88
ALL_MODULES_LIB_DEPENDS=	libopencv_video.so:graphics/opencv \
86
				libopencv_core.so:graphics/opencv-core \
89
				libSoundTouch.so:audio/soundtouch \
90
				libasound.so:audio/alsa-lib \
91
				libcodec2.so:audio/codec2 \
92
				libflite.so:audio/flite \
93
				libh2o.so:www/h2o \
94
				libh323.so:net/h323plus \
87
				libhiredis.so:databases/hiredis \
95
				libhiredis.so:databases/hiredis \
96
				libilbc.so:net/ilbc \
88
				libmemcached.so:databases/libmemcached \
97
				libmemcached.so:databases/libmemcached \
89
				libSoundTouch.so:audio/soundtouch \
98
				libmongoc-1.0.so:devel/mongo-c-driver \
90
				libasound.so:audio/alsa-lib \
99
				libmp3lame.so:audio/lame \
91
				libportaudio.so:audio/portaudio \
92
				libmp4v2.so:multimedia/mp4v2 \
100
				libmp4v2.so:multimedia/mp4v2 \
93
				libshout.so:audio/libshout \
94
				libmpg123.so:audio/mpg123 \
101
				libmpg123.so:audio/mpg123 \
95
				libmp3lame.so:audio/lame \
96
				libnetsnmp.so:net-mgmt/net-snmp \
102
				libnetsnmp.so:net-mgmt/net-snmp \
103
				libopencv_core.so:graphics/opencv-core \
104
				libopusfile.so:audio/opusfile \
105
				libportaudio.so:audio/portaudio \
106
				libpt.so:devel/ptlib \
107
				librabbitmq.so:net/rabbitmq-c \
108
				libshout.so:audio/libshout \
109
				libtheora.so:multimedia/libtheora \
110
				libtonezone.so:misc/dahdi \
97
				libvlc.so:multimedia/vlc \
111
				libvlc.so:multimedia/vlc \
98
				libyaml.so:textproc/libyaml
112
				libyaml.so:textproc/libyaml
99
ALL_MODULES_RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
113
ALL_MODULES_RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
100
ALL_MODULES_USE=		XORG=x11 OPENLDAP=yes
114
ALL_MODULES_USE=		XORG=x11 OPENLDAP=yes JAVA=yes
101
ALL_MODULES_USES=		autoreconf xorg # required by mod_unimrcp
115
ALL_MODULES_USES=		autoreconf python:2.7 xorg # required by mod_unimrcp
116
ALL_MODULES_CFLAGS=		-I${LOCALBASE}/include/openh323/ \
117
				-I${JAVA_HOME}/include/ \
118
				-I${JAVA_HOME}/include/freebsd
119
JAVA_VERSION=			11
102
120
103
8K_VARS=	BITRATES+=8000
121
8K_VARS=	BITRATES+=8000
104
16K_VARS=	BITRATES+=16000
122
16K_VARS=	BITRATES+=16000
Lines 163-171 Link Here
163
.endfor
181
.endfor
164
182
165
# Patch out mod_signalwire as it requires libks that isn't available, yet.
183
# Patch out mod_signalwire as it requires libks that isn't available, yet.
166
post-patch:
184
#post-patch:
167
		${REINPLACE_CMD} -Ee 's|^(applications/mod_signalwire)|#\1|' \
185
#		${REINPLACE_CMD} -Ee 's|^(applications/mod_signalwire)|#\1|' \
168
			${WRKSRC}/modules.conf
186
#			${WRKSRC}/modules.conf
169
187
170
post-patch-PGSQL-off:
188
post-patch-PGSQL-off:
171
		${REINPLACE_CMD} -Ee 's|^(databases/mod_pgsql)|#\1|' ${WRKSRC}/modules.conf
189
		${REINPLACE_CMD} -Ee 's|^(databases/mod_pgsql)|#\1|' ${WRKSRC}/modules.conf
(-)files/extrapatch-modules.conf (-25 / +46 lines)
Lines 1-8 Link Here
1
--- modules.conf.orig	2019-07-02 21:01:14 UTC
1
--- modules.conf.orig	2020-05-12 12:19:16.000000000 +0200
2
+++ modules.conf
2
+++ modules.conf	2020-05-23 20:50:32.788487000 +0200
3
@@ -1,167 +1,167 @@
3
@@ -1,174 +1,174 @@
4
-#applications/mod_abstraction
4
-#applications/mod_abstraction
5
-#applications/mod_av
5
+applications/mod_abstraction
6
 applications/mod_av
6
-#applications/mod_avmd
7
-#applications/mod_avmd
7
-#applications/mod_bert
8
-#applications/mod_bert
8
-#applications/mod_blacklist
9
-#applications/mod_blacklist
Lines 9-16 Link Here
9
-#applications/mod_callcenter
10
-#applications/mod_callcenter
10
-#applications/mod_cidlookup
11
-#applications/mod_cidlookup
11
-#applications/mod_cluechoo
12
-#applications/mod_cluechoo
12
+applications/mod_abstraction
13
+applications/mod_av
14
+applications/mod_avmd
13
+applications/mod_avmd
15
+applications/mod_bert
14
+applications/mod_bert
16
+applications/mod_blacklist
15
+applications/mod_blacklist
Lines 48-63 Link Here
48
-#applications/mod_ladspa
47
-#applications/mod_ladspa
49
-#applications/mod_lcr
48
-#applications/mod_lcr
50
-#applications/mod_memcache
49
-#applications/mod_memcache
50
-#applications/mod_mongo
51
-#applications/mod_mp4
52
-#applications/mod_mp4v2
53
-#applications/mod_nibblebill
54
-#applications/mod_oreka
51
+applications/mod_http_cache
55
+applications/mod_http_cache
52
+applications/mod_ladspa
56
+applications/mod_ladspa
53
+applications/mod_lcr
57
+applications/mod_lcr
54
+applications/mod_memcache
58
+applications/mod_memcache
55
 #applications/mod_mongo
59
+applications/mod_mongo
56
-#applications/mod_mp4
57
+applications/mod_mp4
60
+applications/mod_mp4
58
 #applications/mod_mp4v2
61
+applications/mod_mp4v2
59
-#applications/mod_nibblebill
60
-#applications/mod_oreka
61
+applications/mod_nibblebill
62
+applications/mod_nibblebill
62
+applications/mod_oreka
63
+applications/mod_oreka
63
 #applications/mod_osp
64
 #applications/mod_osp
Lines 66-74 Link Here
66
 #applications/mod_rad_auth
67
 #applications/mod_rad_auth
67
-#applications/mod_redis
68
-#applications/mod_redis
68
-#applications/mod_rss
69
-#applications/mod_rss
70
-applications/mod_signalwire
69
+applications/mod_redis
71
+applications/mod_redis
70
+applications/mod_rss
72
+applications/mod_rss
71
 applications/mod_signalwire
73
+#applications/mod_signalwire
72
 applications/mod_sms
74
 applications/mod_sms
73
 #applications/mod_sms_flowroute
75
 #applications/mod_sms_flowroute
74
-#applications/mod_snapshot
76
-#applications/mod_snapshot
Lines 95-101 Link Here
95
-#applications/mod_voicemail_ivr
97
-#applications/mod_voicemail_ivr
96
+applications/mod_voicemail_ivr
98
+applications/mod_voicemail_ivr
97
 #asr_tts/mod_cepstral
99
 #asr_tts/mod_cepstral
98
 #asr_tts/mod_flite
100
-#asr_tts/mod_flite
101
+asr_tts/mod_flite
99
 #asr_tts/mod_pocketsphinx
102
 #asr_tts/mod_pocketsphinx
100
-#asr_tts/mod_tts_commandline
103
-#asr_tts/mod_tts_commandline
101
-#asr_tts/mod_unimrcp
104
-#asr_tts/mod_unimrcp
Lines 107-117 Link Here
107
 codecs/mod_b64
110
 codecs/mod_b64
108
 #codecs/mod_bv
111
 #codecs/mod_bv
109
-#codecs/mod_clearmode
112
-#codecs/mod_clearmode
113
-#codecs/mod_codec2
114
-#codecs/mod_com_g729
115
-#codecs/mod_dahdi_codec
110
+codecs/mod_clearmode
116
+codecs/mod_clearmode
111
 #codecs/mod_codec2
117
+codecs/mod_codec2
112
-#codecs/mod_com_g729
113
+codecs/mod_com_g729
118
+codecs/mod_com_g729
114
 #codecs/mod_dahdi_codec
119
+codecs/mod_dahdi_codec
115
 codecs/mod_g723_1
120
 codecs/mod_g723_1
116
 codecs/mod_g729
121
 codecs/mod_g729
117
 codecs/mod_h26x
122
 codecs/mod_h26x
Lines 125-131 Link Here
125
 #codecs/mod_silk
130
 #codecs/mod_silk
126
 #codecs/mod_siren
131
 #codecs/mod_siren
127
-#codecs/mod_theora
132
-#codecs/mod_theora
133
-#databases/mod_mariadb
128
+codecs/mod_theora
134
+codecs/mod_theora
135
+databases/mod_mariadb
136
 databases/mod_pgsql
129
 dialplans/mod_dialplan_asterisk
137
 dialplans/mod_dialplan_asterisk
130
-#dialplans/mod_dialplan_directory
138
-#dialplans/mod_dialplan_directory
131
+dialplans/mod_dialplan_directory
139
+dialplans/mod_dialplan_directory
Lines 149-159 Link Here
149
 endpoints/mod_skinny
157
 endpoints/mod_skinny
150
 endpoints/mod_sofia
158
 endpoints/mod_sofia
151
 endpoints/mod_verto
159
 endpoints/mod_verto
152
 #event_handlers/mod_amqp
160
-#event_handlers/mod_amqp
161
+event_handlers/mod_amqp
153
 event_handlers/mod_cdr_csv
162
 event_handlers/mod_cdr_csv
154
-#event_handlers/mod_cdr_mongodb
163
-#event_handlers/mod_cdr_mongodb
164
-#event_handlers/mod_cdr_pg_csv
155
+event_handlers/mod_cdr_mongodb
165
+event_handlers/mod_cdr_mongodb
156
 #event_handlers/mod_cdr_pg_csv
166
+event_handlers/mod_cdr_pg_csv
157
 event_handlers/mod_cdr_sqlite
167
 event_handlers/mod_cdr_sqlite
158
 #event_handlers/mod_erlang_event
168
 #event_handlers/mod_erlang_event
159
-#event_handlers/mod_event_multicast
169
-#event_handlers/mod_event_multicast
Lines 167-175 Link Here
167
+event_handlers/mod_json_cdr
177
+event_handlers/mod_json_cdr
168
 #event_handlers/mod_radius_cdr
178
 #event_handlers/mod_radius_cdr
169
-#event_handlers/mod_odbc_cdr
179
-#event_handlers/mod_odbc_cdr
180
-#event_handlers/mod_kazoo
181
-#event_handlers/mod_rayo
170
+event_handlers/mod_odbc_cdr
182
+event_handlers/mod_odbc_cdr
171
 #event_handlers/mod_kazoo
183
+event_handlers/mod_kazoo
172
-#event_handlers/mod_rayo
173
+event_handlers/mod_rayo
184
+event_handlers/mod_rayo
174
 #event_handlers/mod_smpp
185
 #event_handlers/mod_smpp
175
-#event_handlers/mod_snmp
186
-#event_handlers/mod_snmp
Lines 191-205 Link Here
191
+formats/mod_ssml
202
+formats/mod_ssml
192
 formats/mod_tone_stream
203
 formats/mod_tone_stream
193
-#formats/mod_vlc
204
-#formats/mod_vlc
205
-#formats/mod_opusfile
206
-#languages/mod_basic
207
-#languages/mod_java
194
+formats/mod_vlc
208
+formats/mod_vlc
195
 #formats/mod_opusfile
209
+formats/mod_opusfile
196
-#languages/mod_basic
197
+languages/mod_basic
210
+languages/mod_basic
198
 #languages/mod_java
211
+languages/mod_java
199
 languages/mod_lua
212
 languages/mod_lua
200
 #languages/mod_managed
213
 #languages/mod_managed
201
 #languages/mod_perl
214
-#languages/mod_perl
202
 #languages/mod_python
215
-#languages/mod_python
216
+languages/mod_perl
217
+languages/mod_python
203
 #languages/mod_v8
218
 #languages/mod_v8
204
-#languages/mod_yaml
219
-#languages/mod_yaml
205
+languages/mod_yaml
220
+languages/mod_yaml
Lines 256-258 Link Here
256
 #xml_int/mod_xml_radius
271
 #xml_int/mod_xml_radius
257
 xml_int/mod_xml_rpc
272
 xml_int/mod_xml_rpc
258
 xml_int/mod_xml_scgi
273
 xml_int/mod_xml_scgi
274
 
275
 #../../libs/freetdm/mod_freetdm
276
 
277
-## Experimental Modules (don't cry if they're broken)
278
+# Experimental Modules (don't cry if they're broken)
279
 #../../contrib/mod/xml_int/mod_xml_odbc
(-)files/patch-build_Makefile.in (-2 / +2 lines)
Lines 1-6 Link Here
1
--- build/Makefile.in.orig	2017-06-13 13:22:10 UTC
1
--- build/Makefile.in.orig	2020-05-12 10:20:11 UTC
2
+++ build/Makefile.in
2
+++ build/Makefile.in
3
@@ -594,76 +594,9 @@ uninstall-am:
3
@@ -706,76 +706,9 @@ uninstall-am:
4
 
4
 
5
 all:
5
 all:
6
 	@echo " +---------- FreeSWITCH Build Complete ----------+"
6
 	@echo " +---------- FreeSWITCH Build Complete ----------+"
(-)files/patch-configure.ac (+11 lines)
Line 0 Link Here
1
--- configure.ac.orig	2020-05-12 10:19:16 UTC
2
+++ configure.ac
3
@@ -582,7 +582,7 @@ AC_SUBST(SYS_XMLRPC_CFLAGS)
4
 AC_SUBST(SYS_XMLRPC_LDFLAGS)
5
 AM_CONDITIONAL([SYSTEM_XMLRPCC],[test "${enable_xmlrpcc}" = "yes"])
6
 
7
-for luaversion in luajit lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do
8
+for luaversion in luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do
9
   PKG_CHECK_MODULES([LUA],[${luaversion}],[have_lua=yes],[have_lua=no])
10
   if test ${have_lua} = yes; then
11
     break
(-)files/patch-src_mod_codecs_mod__dahdi__codec_mod__dahdi__codec.c (+14 lines)
Line 0 Link Here
1
--- src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c.orig	2020-05-12 10:19:16 UTC
2
+++ src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c
3
@@ -33,7 +33,11 @@
4
 #include <switch.h>
5
 #include <g711.h>
6
 #include <poll.h>
7
+#if defined(__FreeBSD__)
8
+#include <dahdi/compat/types.h>
9
+#else
10
 #include <linux/types.h>		/* __u32 */
11
+#endif
12
 #include <sys/ioctl.h>
13
 #include <unistd.h>
14
 #include <fcntl.h>
(-)files/patch-src_switch__utils.c (-2 / +2 lines)
Lines 1-6 Link Here
1
--- src/switch_utils.c.orig	2019-05-26 01:06:48 UTC
1
--- src/switch_utils.c.orig	2020-05-12 10:19:16 UTC
2
+++ src/switch_utils.c
2
+++ src/switch_utils.c
3
@@ -1847,7 +1847,7 @@ SWITCH_DECLARE(switch_status_t) switch_f
3
@@ -1945,7 +1945,7 @@ SWITCH_DECLARE(switch_status_t) switch_find_local_ip(c
4
 				goto doh;
4
 				goto doh;
5
 			}
5
 			}
6
 
6
 
(-)pkg-plist (-5 / +18 lines)
Lines 1-15 Link Here
1
bin/freeswitch
1
bin/freeswitch
2
bin/fs_cli
2
bin/fs_cli
3
bin/fs_encode
3
bin/fs_encode
4
bin/fs_epmd
4
bin/fs_ivrd
5
bin/fs_ivrd
5
bin/fs_tts
6
bin/fs_tts
6
bin/fsxs
7
bin/fsxs
7
bin/gentls_cert
8
bin/gentls_cert
8
%%ALL_MODULES%%bin/test_avformat
9
%%ALL_MODULES%%bin/test_iks
10
%%ALL_MODULES%%bin/test_mod_av
11
%%ALL_MODULES%%bin/test_nlsml
12
%%ALL_MODULES%%bin/test_srgs
13
bin/tone2wav
9
bin/tone2wav
14
include/freeswitch/libteletone.h
10
include/freeswitch/libteletone.h
15
include/freeswitch/libteletone_detect.h
11
include/freeswitch/libteletone_detect.h
Lines 200-206 Link Here
200
lib/libfreeswitch.so.1
196
lib/libfreeswitch.so.1
201
lib/libfreeswitch.so.1.0.0
197
lib/libfreeswitch.so.1.0.0
202
%%PGSQL%%%%LUA_LIBDIR%%/freeswitch/mod/mod_pgsql.so
198
%%PGSQL%%%%LUA_LIBDIR%%/freeswitch/mod/mod_pgsql.so
199
%%LUA_LIBDIR%%/freeswitch/mod/mod_amqp.so
200
%%LUA_LIBDIR%%/freeswitch/mod/mod_cdr_pg_csv.so
201
%%LUA_LIBDIR%%/freeswitch/mod/mod_codec2.so
202
%%LUA_LIBDIR%%/freeswitch/mod/mod_dahdi_codec.so
203
%%LUA_LIBDIR%%/freeswitch/mod/mod_flite.so
204
%%LUA_LIBDIR%%/freeswitch/mod/mod_java.so
205
%%LUA_LIBDIR%%/freeswitch/mod/mod_kazoo.so
206
%%LUA_LIBDIR%%/freeswitch/mod/mod_mariadb.so
207
%%LUA_LIBDIR%%/freeswitch/mod/mod_mongo.so
208
%%LUA_LIBDIR%%/freeswitch/mod/mod_mp4v2.so
209
%%LUA_LIBDIR%%/freeswitch/mod/mod_opusfile.so
210
%%LUA_LIBDIR%%/freeswitch/mod/mod_perl.so
211
%%LUA_LIBDIR%%/freeswitch/mod/mod_python.so
203
libdata/pkgconfig/freeswitch.pc
212
libdata/pkgconfig/freeswitch.pc
213
%%PYTHON_SITELIBDIR%%/freeswitch.py
214
perl/freeswitch.pm
215
perl/freeswitch.so
204
%%DATADIR%%/fonts/FreeMono.ttf
216
%%DATADIR%%/fonts/FreeMono.ttf
205
%%DATADIR%%/fonts/FreeMonoBold.ttf
217
%%DATADIR%%/fonts/FreeMonoBold.ttf
206
%%DATADIR%%/fonts/FreeMonoBoldOblique.ttf
218
%%DATADIR%%/fonts/FreeMonoBoldOblique.ttf
Lines 872-877 Link Here
872
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/web-vm.tpl
884
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/web-vm.tpl
873
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/yaml/extensions.yaml
885
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/yaml/extensions.yaml
874
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/yaml/mod_yaml.yaml
886
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/yaml/mod_yaml.yaml
887
%%DATADIR%%/scripts/freeswitch.jar
875
/var/lib/freeswitch/images/default-avatar.png
888
/var/lib/freeswitch/images/default-avatar.png
876
/var/lib/freeswitch/images/default-mute.png
889
/var/lib/freeswitch/images/default-mute.png
877
@dir %%DATADIR%%/grammar
890
@dir %%DATADIR%%/grammar

Return to bug 246515