freeswitch-stable: bump to 1.10.7

- freetdm is now external
- install libfreeswitch to staging directory for external freetdm
- fix pkgconfig file
- add dependency on libks to mod-verto
- add missing PKG_CONFIG_DEPENDS
- add build fixes
- refresh patches

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

13 files changed, 192 insertions, 157 deletions

diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile
index e8fdb2f..aa65a5b 100644
--- a/net/freeswitch-stable/Makefile
+++ b/net/freeswitch-stable/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PRG_NAME:=freeswitch
 PKG_NAME:=$(PRG_NAME)-stable
-PKG_VERSION:=1.10.6
-PKG_RELEASE:=2
+PKG_VERSION:=1.10.7
+PKG_RELEASE:=1
 PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
 
 PKG_SOURCE:=$(PRG_NAME)-$(PKG_VERSION).-release.tar.xz
 PKG_SOURCE_URL:=https://files.$(PRG_NAME).org/releases/$(PRG_NAME)
-PKG_HASH:=9a08d4e184e6d715e1c12c43a0f901597151752ef236f0a37e40996272b5c38d
+PKG_HASH:=0919bddc2ea9cab2e4944314e71637bea9dd4f40d510722a74ea032104594c41
 
 PKG_CPE_ID:=cpe:/a:freeswitch:freeswitch
 
@@ -73,9 +73,6 @@ FS_STABLE_SYSCONF_DIR:=/etc
 FS_STABLE_TLS_DIR:=$(FS_STABLE_SYSCONF_DIR)/$(PRG_NAME)/tls
 FS_STABLE_TZ_DIR:=$(FS_STABLE_DATA_DIR)/tz
 
-FTDM:=freetdm
-PKG_LIBFTDM:=lib$(FTDM)-stable
-
 FS_STABLE_MOD_AVAILABLE:= \
 	abstraction \
 	alsa \
@@ -122,7 +119,6 @@ FS_STABLE_MOD_AVAILABLE:= \
 	fail2ban \
 	fifo \
 	format_cdr \
-	$(FTDM) \
 	fsk \
 	fsv \
 	g723_1 \
@@ -226,15 +222,13 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_FS_STABLE_WITH_DEBUG \
 	CONFIG_FS_STABLE_WITH_FREETYPE \
 	CONFIG_FS_STABLE_WITH_LIBYUV \
+	CONFIG_FS_STABLE_WITH_MODCONF \
 	CONFIG_FS_STABLE_WITH_ODBC \
 	CONFIG_FS_STABLE_WITH_PNG \
 	CONFIG_FS_STABLE_WITH_SRTP \
 	CONFIG_FS_STABLE_WITH_VPX \
 	CONFIG_FS_STABLE_WITH_ZRTP \
 	CONFIG_LIBC \
-	CONFIG_PACKAGE_$(PKG_LIBFTDM) \
-	CONFIG_PACKAGE_$(PKG_LIBFTDM)-ftmod-libpri \
-	CONFIG_PACKAGE_$(PKG_LIBFTDM)-ftmod-pritap \
 	CONFIG_PACKAGE_$(PKG_NAME)-misc-perl-esl \
 	CONFIG_PACKAGE_$(PKG_NAME)-misc-python-esl \
 	CONFIG_SOFT_FLOAT
@@ -299,12 +293,6 @@ define Package/$(PKG_NAME)/install/dir
 	done
 endef
 
-define Package/$(PKG_LIBFTDM)/install/ftmod
-	$(INSTALL_DIR) $(1)$(FS_STABLE_MOD_DIR)
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)$(FS_STABLE_MOD_DIR)/ftmod_$(2).so \
-						$(1)$(FS_STABLE_MOD_DIR)
-endef
-
 define Package/$(PKG_NAME)/install/lib
 	$(INSTALL_DIR) $(1)$(FS_STABLE_LIB_DIR)
 	$(CP) $(PKG_INSTALL_DIR)$(FS_STABLE_LIB_DIR)/$(2).so.* \
@@ -321,45 +309,6 @@ define Package/$(PKG_NAME)/config
 	source "$(SOURCE)/Config.in"
 endef
 
-define Package/$(PKG_LIBFTDM)/Default
-  SECTION:=libs
-  CATEGORY:=Libraries
-  SUBMENU:=Telephony
-  URL:=https://www.$(PRG_NAME).org
-endef
-
-define Package/$(PKG_LIBFTDM)
-$(call Package/$(PKG_LIBFTDM)/Default)
-  DEPENDS:=
-  TITLE:=TDM signaling and media API
-  MENU:=1
-  URL:=https://www.$(PRG_NAME).org
-endef
-
-define Package/$(PKG_LIBFTDM)/description
-Provides a unified interface to hardware TDM cards and SS7 stacks.
-endef
-
-define Package/$(PKG_LIBFTDM)/install
-$(call Package/$(PKG_NAME)/install/lib,$(1),lib$(FTDM))
-endef
-
-define Package/$(PKG_LIBFTDM)/FTModule
-define Package/$(PKG_LIBFTDM)-ftmod-$(subst _,-,$(1))
-$(call Package/$(PKG_LIBFTDM)/Default)
-  DEPENDS:=$(PKG_LIBFTDM) \
-	  $(patsubst +%,+PACKAGE_$(PKG_LIBFTDM)-ftmod-$(subst _,-,$(1)):%,$(4))
-  TITLE:=$(2) FreeTDM module
-endef
-define Package/$(PKG_LIBFTDM)-ftmod-$(subst _,-,$(1))/description
-$(subst \n,$(newline),$(3))
-endef
-define Package/$(PKG_LIBFTDM)-ftmod-$(subst _,-,$(1))/install
-$(call Package/$(PKG_LIBFTDM)/install/ftmod,$$(1),$(1))
-endef
-$$(eval $$(call BuildPackage,$(PKG_LIBFTDM)-ftmod-$(subst _,-,$(1))))
-endef
-
 define Package/$(PKG_NAME)/Default
   SUBMENU:=Telephony
   SECTION:=net
@@ -633,6 +582,7 @@ CONFIGURE_ARGS+= \
 	--with-dbdir=/tmp/$(PRG_NAME)/db \
 	--with-imagesdir=$(FS_STABLE_IMAGES_DIR) \
 	--with-logfiledir=/tmp/$(PRG_NAME)/log \
+	--with-python3=no \
 	--with-recordingsdir=/tmp/$(PRG_NAME)/recordings \
 	--with-storagedir=/tmp/$(PRG_NAME)/storage \
 	$(call autoconf_bool,CONFIG_FS_STABLE_WITH_DEBUG,debug) \
@@ -644,9 +594,7 @@ CONFIGURE_ARGS+= \
 	$(if $(CONFIG_FS_STABLE_WITH_FREETYPE),,--without-freetype) \
 	$(if $(CONFIG_FS_STABLE_WITH_ODBC),--with-odbc-lib="$(STAGING_DIR)$(FS_STABLE_LIB_DIR)") \
 	$(if $(CONFIG_FS_STABLE_WITH_ODBC),--with-odbc="$(STAGING_DIR)/usr") \
-	$(if $(CONFIG_FS_STABLE_WITH_PNG),,--without-png) \
-	$(if $(CONFIG_PACKAGE_$(PKG_LIBFTDM)-ftmod-libpri),--with-libpri="$(STAGING_DIR)/usr",--without-libpri) \
-	$(if $(CONFIG_PACKAGE_$(PKG_LIBFTDM)-ftmod-pritap),--with-pritap,--without-pritap)
+	$(if $(CONFIG_FS_STABLE_WITH_PNG),,--without-png)
 
 ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-misc-python-esl)$(CONFIG_PACKAGE_$(PKG_NAME)-mod-python),)
 CONFIGURE_ARGS+= \
@@ -856,14 +804,7 @@ endif
 ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-radius-cdr),)
 	$(CP) $(DL_DIR)/$(FS_STABLE_FREERADIUS_CLIENT_FILE) $(PKG_BUILD_DIR)/libs
 endif
-
-# Compile FreeTDM first
-ifneq ($(CONFIG_PACKAGE_$(PKG_LIBFTDM)),)
-	$(call Build/Compile/Default,-C $(PKG_BUILD_DIR)/libs/$(FTDM))
-endif
-ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)),)
 	$(call Build/Compile/Default)
-endif
 ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-misc-perl-esl),)
 	$(call Build/Compile/Default,-C $(PKG_BUILD_DIR)/libs/esl perlmod)
 endif
@@ -873,13 +814,7 @@ endif
 endef
 
 define Build/Install
-# Again, FreeTDM first
-ifneq ($(CONFIG_PACKAGE_$(PKG_LIBFTDM)),)
-	$(call Build/Install/Default,-C $(PKG_BUILD_DIR)/libs/$(FTDM) install)
-endif
-ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)),)
 	$(call Build/Install/Default)
-endif
 ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-misc-perl-esl),)
 	$(call Build/Compile/Default,-C $(PKG_BUILD_DIR)/libs/esl DESTDIR=$(PKG_INSTALL_DIR) perlmod-install)
 endif
@@ -888,34 +823,18 @@ ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-misc-python-esl),)
 endif
 endef
 
-define Build/InstallDev/$(PKG_LIBFTDM)
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)$(FS_STABLE_PKGCONFIG_DIR)/$(FTDM).pc \
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)$(FS_STABLE_INCLUDES_DIR) $(1)$(FS_STABLE_LIB_DIR) \
 						$(1)$(FS_STABLE_PKGCONFIG_DIR)
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include
-endef
-
-define Build/InstallDev/$(PKG_NAME)
-	$(INSTALL_DIR) $(1)$(FS_STABLE_INCLUDES_DIR)
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)$(FS_STABLE_INCLUDES_DIR)/*.h \
 						$(1)$(FS_STABLE_INCLUDES_DIR)
 	$(INSTALL_DATA) \
 		$(PKG_INSTALL_DIR)$(FS_STABLE_PKGCONFIG_DIR)/$(PRG_NAME).pc \
 						$(1)$(FS_STABLE_PKGCONFIG_DIR)
+	$(CP) $(PKG_INSTALL_DIR)$(FS_STABLE_LIB_DIR)/libfreeswitch.so* \
+						$(1)$(FS_STABLE_LIB_DIR)
 endef
 
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)$(FS_STABLE_PKGCONFIG_DIR)
-ifneq ($(CONFIG_PACKAGE_$(PKG_LIBFTDM)),)
-	$(call Build/InstallDev/$(PKG_LIBFTDM),$(1))
-endif
-ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)),)
-	$(call Build/InstallDev/$(PKG_NAME),$(1))
-endif
-endef
-
-$(eval $(call BuildPackage,$(PKG_LIBFTDM)))
 $(eval $(call BuildPackage,$(PKG_NAME)))
 $(eval $(call BuildPackage,$(PKG_NAME)-misc-perl-esl))
 $(eval $(call BuildPackage,$(PKG_NAME)-misc-python-esl))
@@ -937,22 +856,6 @@ $(eval $(call Package/$(PKG_NAME)/Example,testing))
 $(eval $(call Package/$(PKG_NAME)/Example,vanilla))
 
 ################################
-# FreeTDM modules
-# Params:
-# 1 - Package subname
-# 2 - Package title
-# 3 - Module description
-# 4 - Module dependencies
-################################
-
-$(eval $(call Package/$(PKG_LIBFTDM)/FTModule,analog,Analog,Offers generic FXO/FXS support for any type of card supported by FreeTDM.,))
-$(eval $(call Package/$(PKG_LIBFTDM)/FTModule,analog_em,Analog EM,Offers generic E&M signaling for any type of card supported by FreeTDM.,))
-$(eval $(call Package/$(PKG_LIBFTDM)/FTModule,libpri,LibPRI,Offers support for PRI lines using the open source libpri stack for any\ntype of card supported by FreeTDM. Supports both PRI and BRI signalling.,+libpri @!aarch64))
-$(eval $(call Package/$(PKG_LIBFTDM)/FTModule,pritap,PRI tapping,This module is used to tap PRI lines.,+$(PKG_LIBFTDM)-ftmod-libpri))
-$(eval $(call Package/$(PKG_LIBFTDM)/FTModule,skel,Skeleton,ftmod_skel is an example module.,))
-$(eval $(call Package/$(PKG_LIBFTDM)/FTModule,zt,DAHDI I/O,This module supports the DAHDI interface. The DAHDI interface is used by\nseveral hardware vendors.,))
-
-################################
 # FreeSWITCH language files
 # Params:
 # 1 - Language code
@@ -1038,7 +941,6 @@ $(eval $(call Package/$(PKG_NAME)/Module,expr,Expr,This module adds expr support
 $(eval $(call Package/$(PKG_NAME)/Module,fail2ban,Fail2ban logging,Provides support for Fail2ban logging.,))
 $(eval $(call Package/$(PKG_NAME)/Module,fifo,FIFO,This module adds a first-in first-out queue system.,))
 $(eval $(call Package/$(PKG_NAME)/Module,format_cdr,Multiformat CDR,A superset of mod_json_cdr and mod_xml_cdr.,))
-$(eval $(call Package/$(PKG_NAME)/Module,$(FTDM),FreeTDM endpoint,This module is the glue between FreeSWITCH and FreeTDM.,+$(PKG_LIBFTDM)))
 $(eval $(call Package/$(PKG_NAME)/Module,fsk,FSK,This module adds frequency-shift keying support which can be used to\nsend and receive caller ID.,))
 $(eval $(call Package/$(PKG_NAME)/Module,fsv,FSV,This module provides dialplan applications for recording and playing\nvideos.,))
 $(eval $(call Package/$(PKG_NAME)/Module,g723_1,G.723.1 passthrough,G.723.1 codec passthrough.,))
@@ -1124,7 +1026,7 @@ $(eval $(call Package/$(PKG_NAME)/Module,translate,Number translation,This modul
 $(eval $(call Package/$(PKG_NAME)/Module,tts_commandline,TTS command-line,Run a command-line and play the output file.,))
 $(eval $(call Package/$(PKG_NAME)/Module,unimrcp,UniMRCP,Allows communication with Media Resource Control Protocol servers.,))
 $(eval $(call Package/$(PKG_NAME)/Module,valet_parking,Valet parking,This module implements the valet call parking strategy.,))
-$(eval $(call Package/$(PKG_NAME)/Module,verto,Verto,Verto signaling protocol.,))
+$(eval $(call Package/$(PKG_NAME)/Module,verto,Verto,Verto signaling protocol.,+libks))
 $(eval $(call Package/$(PKG_NAME)/Module,video_filter,Video filter chromakey,This module provides a media bug for chromakey functionality.,))
 $(eval $(call Package/$(PKG_NAME)/Module,vmd,Voicemail detection,This module detects voicemail beeps.,))
 $(eval $(call Package/$(PKG_NAME)/Module,voicemail,Voicemail,This module provides a voicemail system.,))
diff --git a/net/freeswitch-stable/patches/030-fix-configure-ac.patch b/net/freeswitch-stable/patches/030-fix-configure-ac.patch
index 4176d10..0f395f5 100644
--- a/net/freeswitch-stable/patches/030-fix-configure-ac.patch
+++ b/net/freeswitch-stable/patches/030-fix-configure-ac.patch
@@ -40,7 +40,7 @@
  AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
  
  case $host in
-@@ -1643,13 +1619,7 @@ AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl
+@@ -1660,13 +1636,7 @@ AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl
  # -a "x$ac_cv_have_EXTERN_h" != "xno"
  
  if test "x$ac_cv_have_perl" != "xno"; then
@@ -55,7 +55,7 @@
  
     save_CFLAGS="$CFLAGS"
     CFLAGS="$PERL_CFLAGS"
-@@ -1744,24 +1714,12 @@ then
+@@ -1761,24 +1731,12 @@ then
  		if test "$python_has_distutils" != "no" ; then
  			AC_MSG_CHECKING([location of site-packages])
  
diff --git a/net/freeswitch-stable/patches/120-fix-copts.patch b/net/freeswitch-stable/patches/120-fix-copts.patch
index 673765c..b878b27 100644
--- a/net/freeswitch-stable/patches/120-fix-copts.patch
+++ b/net/freeswitch-stable/patches/120-fix-copts.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2063,7 +2063,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS)
+@@ -2251,7 +2251,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS)
  AC_SUBST(OUR_DISABLED_UNINSTALL_MODS)
  AC_SUBST(AM_MAKEFLAGS)
  
@@ -84,7 +84,7 @@
  AC_LANG_C
 --- a/libs/srtp/configure.ac
 +++ b/libs/srtp/configure.ac
-@@ -3,9 +3,12 @@ AC_INIT(srtp, 1.4.2, mcgrew@cisco.com)
+@@ -3,9 +3,12 @@ AC_INIT(srtp, 2.4.0, mcgrew@cisco.com)
  AC_CONFIG_AUX_DIR(build)
  AM_INIT_AUTOMAKE
  
diff --git a/net/freeswitch-stable/patches/140-libvpx-cross.patch b/net/freeswitch-stable/patches/140-libvpx-cross.patch
index 86513f2..9cf1c3f 100644
--- a/net/freeswitch-stable/patches/140-libvpx-cross.patch
+++ b/net/freeswitch-stable/patches/140-libvpx-cross.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -583,8 +583,15 @@ libs/libedit/src/.libs/libedit.a:
+@@ -585,8 +585,15 @@ libs/libedit/src/.libs/libedit.a:
  libs/libzrtp/libzrtp.a:
  	cd libs/libzrtp && $(MAKE)
  
diff --git a/net/freeswitch-stable/patches/220-esl-python.patch b/net/freeswitch-stable/patches/220-esl-python.patch
index a2b657f..d6081f0 100644
--- a/net/freeswitch-stable/patches/220-esl-python.patch
+++ b/net/freeswitch-stable/patches/220-esl-python.patch
@@ -1,9 +1,9 @@
 --- a/libs/esl/python/Makefile
 +++ b/libs/esl/python/Makefile
 @@ -1,6 +1,4 @@
--LOCAL_CFLAGS=`python ./python-config --includes`
--LOCAL_LDFLAGS=`python ./python-config --ldflags`
--SITE_DIR=$(DESTDIR)/`python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)"`
+-LOCAL_CFLAGS=`$(PYTHON) ./python-config --includes`
+-LOCAL_LDFLAGS=`$(PYTHON) ./python-config --ldflags`
+-SITE_DIR=$(DESTDIR)/`$(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)"`
 +SITE_DIR=$(DESTDIR)/$(PYTHON_SITE_DIR)
  
  all: _ESL.so
@@ -23,21 +23,21 @@
  	mkdir -p $(SITE_DIR)
 --- a/libs/esl/Makefile.am
 +++ b/libs/esl/Makefile.am
-@@ -77,7 +77,7 @@ luamod: $(MYLIB)
+@@ -79,7 +79,7 @@ luamod: $(MYLIB)
  	$(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS)" CXXFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" LUA_CFLAGS="$(LUA_CFLAGS)" LUA_LIBS="$(LUA_LIBS)" -C lua
  
  pymod: $(MYLIB)
--	$(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS)" CXXFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C python
-+	$(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS)" CXXFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" PYTHON_CFLAGS="$(PYTHON_CFLAGS)" PYTHON_LDFLAGS="$(PYTHON_LDFLAGS)" -C python
+-	$(MAKE) PYTHON=$(PYTHON) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS)" CXXFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C python
++	$(MAKE) PYTHON=$(PYTHON) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS)" CXXFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" PYTHON_CFLAGS="$(PYTHON_CFLAGS)" PYTHON_LDFLAGS="$(PYTHON_LDFLAGS)" -C python
  
- tclmod: $(MYLIB)
- 	$(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS)" CXXFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C tcl
-@@ -98,7 +98,7 @@ phpmod-install: phpmod
+ py3mod: $(MYLIB)
+ 	$(MAKE) PYTHON3=$(PYTHON3) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS)" CXXFLAGS="-I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C python3
+@@ -103,7 +103,7 @@ phpmod-install: phpmod
  	$(MAKE) -C php install
  
  pymod-install: pymod
--	$(MAKE) -C python install
-+	$(MAKE) PYTHON_SITE_DIR="$(PYTHON_SITE_DIR)" -C python install
+-	$(MAKE) PYTHON=$(PYTHON) -C python install
++	$(MAKE) PYTHON=$(PYTHON) PYTHON_SITE_DIR="$(PYTHON_SITE_DIR)" -C python install
  
- rubymod-install: rubymod
- 	$(MAKE) -C ruby install
+ py3mod-install: py3mod
+ 	$(MAKE) PYTHON3=$(PYTHON3) -C python3 install
diff --git a/net/freeswitch-stable/patches/280-tone-down-freetdm-COMP_VENDOR_CFLAGS.patch b/net/freeswitch-stable/patches/280-tone-down-freetdm-COMP_VENDOR_CFLAGS.patch
deleted file mode 100644
index 7e29e94..0000000
--- a/net/freeswitch-stable/patches/280-tone-down-freetdm-COMP_VENDOR_CFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libs/freetdm/configure.ac
-+++ b/libs/freetdm/configure.ac
-@@ -88,7 +88,7 @@ AC_ARG_ENABLE([enable_64],
- 
- case "${ax_cv_c_compiler_vendor}" in
- gnu)
--	COMP_VENDOR_CFLAGS="-ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -O0"
-+	COMP_VENDOR_CFLAGS="-ffast-math -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes"
- 	;;
- sun)
- 	COMP_VENDOR_CFLAGS="-xc99=all -mt -xCC -xvpara"
diff --git a/net/freeswitch-stable/patches/290-fix-mod_freetdm-copts.patch b/net/freeswitch-stable/patches/290-fix-mod_freetdm-copts.patch
deleted file mode 100644
index 0cde4d1..0000000
--- a/net/freeswitch-stable/patches/290-fix-mod_freetdm-copts.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/libs/freetdm/mod_freetdm/Makefile.in
-+++ b/libs/freetdm/mod_freetdm/Makefile.in
-@@ -1,4 +1,4 @@
--FT_CFLAGS=@CFLAGS@ @COMP_VENDOR_CFLAGS@ @DEFS@
-+FT_CFLAGS=@COMP_VENDOR_CFLAGS@ @DEFS@
- 
- BASE=../../..
- FT_DIR=..
diff --git a/net/freeswitch-stable/patches/330-do-not-install-freetdm-twice.patch b/net/freeswitch-stable/patches/330-do-not-install-freetdm-twice.patch
deleted file mode 100644
index a81d60b..0000000
--- a/net/freeswitch-stable/patches/330-do-not-install-freetdm-twice.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libs/freetdm/mod_freetdm/Makefile.in
-+++ b/libs/freetdm/mod_freetdm/Makefile.in
-@@ -15,7 +15,6 @@ $(FTLA): $(FT_DIR)/.update
- 	cd $(FT_DIR) && $(MAKE)
- 
- local_install:
--	cd $(FT_DIR) && $(MAKE) install
- 	[ -f $(DESTDIR)@confdir@/autoload_configs/freetdm.conf.xml ] || cp -f $(FT_DIR)/conf/freetdm.conf.xml  $(DESTDIR)@confdir@/autoload_configs
- 
- local_clean:
diff --git a/net/freeswitch-stable/patches/370-procd-compat.patch b/net/freeswitch-stable/patches/370-procd-compat.patch
index 5bab0f2..bdc212b 100644
--- a/net/freeswitch-stable/patches/370-procd-compat.patch
+++ b/net/freeswitch-stable/patches/370-procd-compat.patch
@@ -1,6 +1,6 @@
 --- a/src/switch_console.c
 +++ b/src/switch_console.c
-@@ -1051,10 +1051,12 @@ static void *SWITCH_THREAD_FUNC console_
+@@ -1052,10 +1052,12 @@ static void *SWITCH_THREAD_FUNC console_
  	while (running) {
  		int32_t arg = 0;
  
diff --git a/net/freeswitch-stable/patches/400-fix-pc-file.patch b/net/freeswitch-stable/patches/400-fix-pc-file.patch
new file mode 100644
index 0000000..d0ba2e2
--- /dev/null
+++ b/net/freeswitch-stable/patches/400-fix-pc-file.patch
@@ -0,0 +1,13 @@
+--- a/build/freeswitch.pc.in
++++ b/build/freeswitch.pc.in
+@@ -1,8 +1,8 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
++libdir=${exec_prefix}/lib
+ libexecdir=@libexecdir@
+-includedir=@includedir@
++includedir=${prefix}/include/freeswitch
+ modulesdir=@modulesdir@
+ runtimedir=@runtimedir@
+ logfiledir=@logfiledir@
diff --git a/net/freeswitch-stable/patches/420-switch_rtp-report-undeclared.patch b/net/freeswitch-stable/patches/420-switch_rtp-report-undeclared.patch
new file mode 100644
index 0000000..bf6a868
--- /dev/null
+++ b/net/freeswitch-stable/patches/420-switch_rtp-report-undeclared.patch
@@ -0,0 +1,11 @@
+--- a/src/switch_rtp.c
++++ b/src/switch_rtp.c
+@@ -2155,7 +2155,7 @@ static void switch_send_rtcp_event(switc
+ 				switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header, value);
+ 				snprintf(header, sizeof(header), "Source-Lost");
+ #if SWITCH_BYTE_ORDER == __BIG_ENDIAN
+-				tmpLost = report->lost; /* signed 24bit will extended signess to int32_t automatically */
++				tmpLost = rtcp_report_block->lost; /* signed 24bit will extended signess to int32_t automatically */
+ #else
+ 				tmpLost = ntohl(rtcp_report_block->lost)>>8;
+ 				tmpLost = tmpLost | ((tmpLost & 0x00800000) ? 0xff000000 : 0x00000000); /* ...and signess compensation */
diff --git a/net/freeswitch-stable/patches/430-mod_opusfile-format-error.patch b/net/freeswitch-stable/patches/430-mod_opusfile-format-error.patch
new file mode 100644
index 0000000..c2a60ef
--- /dev/null
+++ b/net/freeswitch-stable/patches/430-mod_opusfile-format-error.patch
@@ -0,0 +1,20 @@
+--- a/src/mod/formats/mod_opusfile/mod_opusfile.c
++++ b/src/mod/formats/mod_opusfile/mod_opusfile.c
+@@ -930,7 +930,7 @@ static int decode_stream_cb(void *dconte
+ 	if (globals.debug) {
+ 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[OGG/OPUS Stream Decode] decode CB called: context: %p data: %p packet_len: %d\n", 
+ 				(void *)context, data, nbytes);
+-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[OGG/OPUS Stream Decode] decode_stream_cb(): switch_thread_self(): %lx\n",  switch_thread_self());
++		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[OGG/OPUS Stream Decode] decode_stream_cb(): switch_thread_self(): %lx\n", (unsigned long)(intptr_t)switch_thread_self());
+ 	}
+ 
+ 	switch_mutex_lock(context->ogg_mutex);
+@@ -973,7 +973,7 @@ static void *SWITCH_THREAD_FUNC read_str
+ 	int buffered_ogg_bytes;
+ 
+ 	if (globals.debug) {
+-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[OGG/OPUS Stream Decode] read_stream_thread(): switch_thread_self(): 0x%lx\n",  switch_thread_self());
++		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[OGG/OPUS Stream Decode] read_stream_thread(): switch_thread_self(): 0x%lx\n", (unsigned long)(intptr_t)switch_thread_self());
+ 	}
+ 	switch_thread_rwlock_rdlock(context->rwlock);
+ 	switch_mutex_lock(context->ogg_mutex);
diff --git a/net/freeswitch-stable/patches/480-fix-libyuv-dependency.patch b/net/freeswitch-stable/patches/480-fix-libyuv-dependency.patch
new file mode 100644
index 0000000..0dbc19e
--- /dev/null
+++ b/net/freeswitch-stable/patches/480-fix-libyuv-dependency.patch
@@ -0,0 +1,118 @@
+commit a2ce46c6fde38d6ac54a8a2ee1a5b391e2ed2071
+Author: Sebastian Kemper <sebastian_ml@gmx.net>
+Date:   Mon Nov 1 09:59:09 2021 +0100
+
+    [core] fix "--disable-libyuv"
+    
+    Recent changes made it impossible to compile freeswitch without libyuv
+    support.
+    
+    src/switch_core_video.c: In function 'switch_img_read_from_file':
+    src/switch_core_video.c:3139:4: error: implicit declaration of function 'RAWToI420' [-Werror=implicit-function-declaration]
+    RAWToI420(data, width * 3,
+    ^
+    src/switch_core_video.c:3148:4: error: implicit declaration of function 'ABGRToARGB' [-Werror=implicit-function-declaration]
+    ABGRToARGB(data, width * 4, img->planes[SWITCH_PLANE_PACKED], img->stride[SWITCH_PLANE_PACKED], width, height);
+    ^
+    
+    Fix this my adding/moving the checks for "SWITCH_HAVE_YUV".
+    
+    Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
+
+--- a/src/switch_core_video.c
++++ b/src/switch_core_video.c
+@@ -3116,6 +3116,7 @@ SWITCH_DECLARE(switch_status_t) switch_i
+ 
+ SWITCH_DECLARE(switch_image_t *) switch_img_read_from_file(const char* file_name, switch_img_fmt_t img_fmt)
+ {
++#ifdef SWITCH_HAVE_YUV
+ 	int width = 0, height = 0, channels = 0;
+ 	int comp = STBI_rgb;
+ 	unsigned char *data = NULL;
+@@ -3155,12 +3156,16 @@ SWITCH_DECLARE(switch_image_t *) switch_
+ 	} else if (data) {
+ 		stbi_image_free(data);
+ 	}
++#endif
+ 
+ 	return NULL;
+ }
+ 
+ SWITCH_DECLARE(switch_status_t) switch_img_write_to_file(switch_image_t *img, const char* file_name, int quality)
+ {
++#ifndef SWITCH_HAVE_YUV
++	return SWITCH_STATUS_FALSE;
++#else
+ 	int comp = STBI_rgb;
+ 	unsigned char *data = NULL;
+ 	const char *ext = strrchr(file_name, '.');
+@@ -3217,6 +3222,7 @@ SWITCH_DECLARE(switch_status_t) switch_i
+ 	free(data);
+ 
+ 	return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE;
++#endif
+ }
+ 
+ typedef struct data_url_context_s {
+@@ -3224,14 +3230,19 @@ typedef struct data_url_context_s {
+ 	char **urlP;
+ } data_url_context_t;
+ 
++#ifdef SWITCH_HAVE_YUV
+ static void data_url_write_func(void *context, void *data, int size)
+ {
+ 	switch_buffer_t *buffer = (switch_buffer_t *)context;
+ 	switch_buffer_write(buffer, data, size);
+ }
++#endif
+ 
+ SWITCH_DECLARE(switch_status_t) switch_img_data_url(switch_image_t *img, char **urlP, const char *type, int quality)
+ {
++#ifndef SWITCH_HAVE_YUV
++	return SWITCH_STATUS_FALSE;
++#else
+ 	int comp = STBI_rgb;
+ 	unsigned char *data = NULL;
+ 	int stride_in_bytes = 0;
+@@ -3300,6 +3311,7 @@ SWITCH_DECLARE(switch_status_t) switch_i
+ 	switch_buffer_destroy(&buffer);
+ 
+ 	return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE;
++#endif /* SWITCH_HAVE_YUV */
+ }
+ 
+ 
+--- a/tests/unit/switch_core_video.c
++++ b/tests/unit/switch_core_video.c
+@@ -48,6 +48,7 @@ FST_CORE_BEGIN("./conf")
+ 		}
+ 		FST_TEARDOWN_END()
+ 
++#ifdef SWITCH_HAVE_YUV
+ 		FST_TEST_BEGIN(data_url_test)
+ 		{
+ 			char *data_url = NULL;
+@@ -88,6 +89,7 @@ FST_CORE_BEGIN("./conf")
+ 			unlink(argb_filename);
+ 		}
+ 		FST_TEST_END()
++#endif /* SWITCH_HAVE_YUV */
+ 
+ 		FST_TEST_BEGIN(img_patch)
+ 		{
+@@ -239,6 +241,7 @@ FST_CORE_BEGIN("./conf")
+ 		}
+ 		FST_TEST_END()
+ 
++#ifdef SWITCH_HAVE_YUV
+ 		FST_TEST_BEGIN(stb_data_url)
+ 		{
+ 			switch_image_t *img = switch_img_alloc(NULL, SWITCH_IMG_FMT_I420, 120, 60, 1);
+@@ -321,6 +324,7 @@ FST_CORE_BEGIN("./conf")
+ 			unlink(jpg_write_filename);
+ 		}
+ 		FST_TEST_END()
++#endif /* SWITCH_HAVE_YUV */
+ 	}
+ 	FST_SUITE_END()
+ }