mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 09:49:18 -04:00
net/freeswitch: fix build with ALL_MODULES selected
- files/extrapatch-modules.conf needed adjustments after the move to 1.10.x PR: 246515 Reported by: rnoll.bsd@gmail.com
This commit is contained in:
Kurt Jaeger
parent
b8bb297012
commit
7cd2ac3d5d
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=536367
6 changed files with 106 additions and 41 deletions
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
PORTNAME= freeswitch
|
||||
PORTVERSION= 1.10.3
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= https://files.freeswitch.org/releases/freeswitch/ \
|
||||
https://files.freeswitch.org/releases/sounds/:sounds
|
||||
|
|
@ -32,7 +33,7 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \
|
|||
libtiff.so:graphics/tiff \
|
||||
libuuid.so:misc/e2fsprogs-libuuid
|
||||
|
||||
USES= gmake iconv jpeg libedit libtool lua:51-52 perl5 \
|
||||
USES= gmake iconv jpeg libedit autoreconf libtool lua perl5 \
|
||||
pkgconfig shebangfix ssl
|
||||
USE_LDCONFIG= yes
|
||||
USE_RC_SUBR= freeswitch
|
||||
|
|
@ -48,7 +49,7 @@ CONFLICTS_BUILD= xmlrpc-c-*
|
|||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
|
||||
--enable-zrtp
|
||||
CFLAGS+= -Wno-error
|
||||
CFLAGS+= -Wno-error -I${LUA_INCDIR}
|
||||
|
||||
USERS= ${PORTNAME}
|
||||
GROUPS= ${USERS}
|
||||
|
|
@ -79,26 +80,44 @@ RUSSIAN_DESC= Russian Language Sounds
|
|||
SWEDISH_DESC= Swedish Language Sounds
|
||||
|
||||
ALL_MODULES_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa \
|
||||
${LOCALBASE}/bin/aclocal:devel/automake
|
||||
${LOCALBASE}/bin/aclocal:devel/automake \
|
||||
${LOCALBASE}/bin/erl:lang/erlang \
|
||||
${LOCALBASE}/bin/bash:shells/bash \
|
||||
${LOCALBASE}/bin/mariadb:databases/mariadb104-client
|
||||
ALL_MODULES_CONFLICTS_BUILD= apr
|
||||
ALL_MODULES_EXTRA_PATCHES= ${FILESDIR}/extrapatch-modules.conf
|
||||
ALL_MODULES_LIB_DEPENDS= libopencv_video.so:graphics/opencv \
|
||||
libopencv_core.so:graphics/opencv-core \
|
||||
libhiredis.so:databases/hiredis \
|
||||
libmemcached.so:databases/libmemcached \
|
||||
libSoundTouch.so:audio/soundtouch \
|
||||
libasound.so:audio/alsa-lib \
|
||||
libportaudio.so:audio/portaudio \
|
||||
libmp4v2.so:multimedia/mp4v2 \
|
||||
libshout.so:audio/libshout \
|
||||
libmpg123.so:audio/mpg123 \
|
||||
libcodec2.so:audio/codec2 \
|
||||
libflite.so:audio/flite \
|
||||
libh2o.so:www/h2o \
|
||||
libh323.so:net/h323plus \
|
||||
libhiredis.so:databases/hiredis \
|
||||
libilbc.so:net/ilbc \
|
||||
libmemcached.so:databases/libmemcached \
|
||||
libmongoc-1.0.so:devel/mongo-c-driver \
|
||||
libmp3lame.so:audio/lame \
|
||||
libmp4v2.so:multimedia/mp4v2 \
|
||||
libmpg123.so:audio/mpg123 \
|
||||
libnetsnmp.so:net-mgmt/net-snmp \
|
||||
libopencv_core.so:graphics/opencv-core \
|
||||
libopusfile.so:audio/opusfile \
|
||||
libportaudio.so:audio/portaudio \
|
||||
libpt.so:devel/ptlib \
|
||||
librabbitmq.so:net/rabbitmq-c \
|
||||
libshout.so:audio/libshout \
|
||||
libtheora.so:multimedia/libtheora \
|
||||
libtonezone.so:misc/dahdi \
|
||||
libvlc.so:multimedia/vlc \
|
||||
libyaml.so:textproc/libyaml
|
||||
ALL_MODULES_RUN_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa
|
||||
ALL_MODULES_USE= XORG=x11 OPENLDAP=yes
|
||||
ALL_MODULES_USES= autoreconf xorg # required by mod_unimrcp
|
||||
ALL_MODULES_USE= XORG=x11 OPENLDAP=yes JAVA=yes
|
||||
ALL_MODULES_USES= python:2.7 xorg # required by mod_unimrcp
|
||||
ALL_MODULES_CFLAGS= -I${LOCALBASE}/include/openh323/ \
|
||||
-I${JAVA_HOME}/include/ \
|
||||
-I${JAVA_HOME}/include/freebsd
|
||||
JAVA_VERSION= 11
|
||||
|
||||
8K_VARS= BITRATES+=8000
|
||||
16K_VARS= BITRATES+=16000
|
||||
|
|
|
|||
|
|
@ -1,16 +1,15 @@
|
|||
--- modules.conf.orig 2019-07-02 21:01:14 UTC
|
||||
+++ modules.conf
|
||||
@@ -1,167 +1,167 @@
|
||||
--- modules.conf.orig 2020-05-12 12:19:16.000000000 +0200
|
||||
+++ modules.conf 2020-05-23 20:50:32.788487000 +0200
|
||||
@@ -1,174 +1,174 @@
|
||||
-#applications/mod_abstraction
|
||||
-#applications/mod_av
|
||||
+applications/mod_abstraction
|
||||
applications/mod_av
|
||||
-#applications/mod_avmd
|
||||
-#applications/mod_bert
|
||||
-#applications/mod_blacklist
|
||||
-#applications/mod_callcenter
|
||||
-#applications/mod_cidlookup
|
||||
-#applications/mod_cluechoo
|
||||
+applications/mod_abstraction
|
||||
+applications/mod_av
|
||||
+applications/mod_avmd
|
||||
+applications/mod_bert
|
||||
+applications/mod_blacklist
|
||||
|
|
@ -48,16 +47,18 @@
|
|||
-#applications/mod_ladspa
|
||||
-#applications/mod_lcr
|
||||
-#applications/mod_memcache
|
||||
-#applications/mod_mongo
|
||||
-#applications/mod_mp4
|
||||
-#applications/mod_mp4v2
|
||||
-#applications/mod_nibblebill
|
||||
-#applications/mod_oreka
|
||||
+applications/mod_http_cache
|
||||
+applications/mod_ladspa
|
||||
+applications/mod_lcr
|
||||
+applications/mod_memcache
|
||||
#applications/mod_mongo
|
||||
-#applications/mod_mp4
|
||||
+applications/mod_mongo
|
||||
+applications/mod_mp4
|
||||
#applications/mod_mp4v2
|
||||
-#applications/mod_nibblebill
|
||||
-#applications/mod_oreka
|
||||
+applications/mod_mp4v2
|
||||
+applications/mod_nibblebill
|
||||
+applications/mod_oreka
|
||||
#applications/mod_osp
|
||||
|
|
@ -66,9 +67,10 @@
|
|||
#applications/mod_rad_auth
|
||||
-#applications/mod_redis
|
||||
-#applications/mod_rss
|
||||
-applications/mod_signalwire
|
||||
+applications/mod_redis
|
||||
+applications/mod_rss
|
||||
applications/mod_signalwire
|
||||
+#applications/mod_signalwire
|
||||
applications/mod_sms
|
||||
#applications/mod_sms_flowroute
|
||||
-#applications/mod_snapshot
|
||||
|
|
@ -95,7 +97,8 @@
|
|||
-#applications/mod_voicemail_ivr
|
||||
+applications/mod_voicemail_ivr
|
||||
#asr_tts/mod_cepstral
|
||||
#asr_tts/mod_flite
|
||||
-#asr_tts/mod_flite
|
||||
+asr_tts/mod_flite
|
||||
#asr_tts/mod_pocketsphinx
|
||||
-#asr_tts/mod_tts_commandline
|
||||
-#asr_tts/mod_unimrcp
|
||||
|
|
@ -107,11 +110,13 @@
|
|||
codecs/mod_b64
|
||||
#codecs/mod_bv
|
||||
-#codecs/mod_clearmode
|
||||
+codecs/mod_clearmode
|
||||
#codecs/mod_codec2
|
||||
-#codecs/mod_codec2
|
||||
-#codecs/mod_com_g729
|
||||
-#codecs/mod_dahdi_codec
|
||||
+codecs/mod_clearmode
|
||||
+codecs/mod_codec2
|
||||
+codecs/mod_com_g729
|
||||
#codecs/mod_dahdi_codec
|
||||
+codecs/mod_dahdi_codec
|
||||
codecs/mod_g723_1
|
||||
codecs/mod_g729
|
||||
codecs/mod_h26x
|
||||
|
|
@ -125,7 +130,10 @@
|
|||
#codecs/mod_silk
|
||||
#codecs/mod_siren
|
||||
-#codecs/mod_theora
|
||||
-#databases/mod_mariadb
|
||||
+codecs/mod_theora
|
||||
+databases/mod_mariadb
|
||||
databases/mod_pgsql
|
||||
dialplans/mod_dialplan_asterisk
|
||||
-#dialplans/mod_dialplan_directory
|
||||
+dialplans/mod_dialplan_directory
|
||||
|
|
@ -149,11 +157,13 @@
|
|||
endpoints/mod_skinny
|
||||
endpoints/mod_sofia
|
||||
endpoints/mod_verto
|
||||
#event_handlers/mod_amqp
|
||||
-#event_handlers/mod_amqp
|
||||
+event_handlers/mod_amqp
|
||||
event_handlers/mod_cdr_csv
|
||||
-#event_handlers/mod_cdr_mongodb
|
||||
-#event_handlers/mod_cdr_pg_csv
|
||||
+event_handlers/mod_cdr_mongodb
|
||||
#event_handlers/mod_cdr_pg_csv
|
||||
+event_handlers/mod_cdr_pg_csv
|
||||
event_handlers/mod_cdr_sqlite
|
||||
#event_handlers/mod_erlang_event
|
||||
-#event_handlers/mod_event_multicast
|
||||
|
|
@ -167,9 +177,10 @@
|
|||
+event_handlers/mod_json_cdr
|
||||
#event_handlers/mod_radius_cdr
|
||||
-#event_handlers/mod_odbc_cdr
|
||||
+event_handlers/mod_odbc_cdr
|
||||
#event_handlers/mod_kazoo
|
||||
-#event_handlers/mod_kazoo
|
||||
-#event_handlers/mod_rayo
|
||||
+event_handlers/mod_odbc_cdr
|
||||
+event_handlers/mod_kazoo
|
||||
+event_handlers/mod_rayo
|
||||
#event_handlers/mod_smpp
|
||||
-#event_handlers/mod_snmp
|
||||
|
|
@ -191,15 +202,19 @@
|
|||
+formats/mod_ssml
|
||||
formats/mod_tone_stream
|
||||
-#formats/mod_vlc
|
||||
+formats/mod_vlc
|
||||
#formats/mod_opusfile
|
||||
-#formats/mod_opusfile
|
||||
-#languages/mod_basic
|
||||
-#languages/mod_java
|
||||
+formats/mod_vlc
|
||||
+formats/mod_opusfile
|
||||
+languages/mod_basic
|
||||
#languages/mod_java
|
||||
+languages/mod_java
|
||||
languages/mod_lua
|
||||
#languages/mod_managed
|
||||
#languages/mod_perl
|
||||
#languages/mod_python
|
||||
-#languages/mod_perl
|
||||
-#languages/mod_python
|
||||
+languages/mod_perl
|
||||
+languages/mod_python
|
||||
#languages/mod_v8
|
||||
-#languages/mod_yaml
|
||||
+languages/mod_yaml
|
||||
|
|
@ -256,3 +271,9 @@
|
|||
#xml_int/mod_xml_radius
|
||||
xml_int/mod_xml_rpc
|
||||
xml_int/mod_xml_scgi
|
||||
|
||||
#../../libs/freetdm/mod_freetdm
|
||||
|
||||
-## Experimental Modules (don't cry if they're broken)
|
||||
+# Experimental Modules (don't cry if they're broken)
|
||||
#../../contrib/mod/xml_int/mod_xml_odbc
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- build/Makefile.in.orig 2017-06-13 13:22:10 UTC
|
||||
--- build/Makefile.in.orig 2020-05-12 10:20:11 UTC
|
||||
+++ build/Makefile.in
|
||||
@@ -594,76 +594,9 @@ uninstall-am:
|
||||
@@ -706,76 +706,9 @@ uninstall-am:
|
||||
|
||||
all:
|
||||
@echo " +---------- FreeSWITCH Build Complete ----------+"
|
||||
|
|
|
|||
11
net/freeswitch/files/patch-configure.ac
Normal file
11
net/freeswitch/files/patch-configure.ac
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- configure.ac.orig 2020-05-12 10:19:16 UTC
|
||||
+++ configure.ac
|
||||
@@ -582,7 +582,7 @@ AC_SUBST(SYS_XMLRPC_CFLAGS)
|
||||
AC_SUBST(SYS_XMLRPC_LDFLAGS)
|
||||
AM_CONDITIONAL([SYSTEM_XMLRPCC],[test "${enable_xmlrpcc}" = "yes"])
|
||||
|
||||
-for luaversion in luajit lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do
|
||||
+for luaversion in luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do
|
||||
PKG_CHECK_MODULES([LUA],[${luaversion}],[have_lua=yes],[have_lua=no])
|
||||
if test ${have_lua} = yes; then
|
||||
break
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
--- src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c.orig 2020-05-12 10:19:16 UTC
|
||||
+++ src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c
|
||||
@@ -33,7 +33,11 @@
|
||||
#include <switch.h>
|
||||
#include <g711.h>
|
||||
#include <poll.h>
|
||||
+#if defined(__FreeBSD__)
|
||||
+#include <dahdi/compat/types.h>
|
||||
+#else
|
||||
#include <linux/types.h> /* __u32 */
|
||||
+#endif
|
||||
#include <sys/ioctl.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- src/switch_utils.c.orig 2019-05-26 01:06:48 UTC
|
||||
--- src/switch_utils.c.orig 2020-05-12 10:19:16 UTC
|
||||
+++ src/switch_utils.c
|
||||
@@ -1847,7 +1847,7 @@ SWITCH_DECLARE(switch_status_t) switch_f
|
||||
@@ -1945,7 +1945,7 @@ SWITCH_DECLARE(switch_status_t) switch_find_local_ip(c
|
||||
goto doh;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue