From: Andrey Volk Date: Sun, 2 Aug 2026 17:33:59 +0000 (+0300) Subject: [SpanDSP] Update to v3.1.1 and fix build on Windows. (#3090) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=inline;p=thirdparty%2Ffreeswitch.git [SpanDSP] Update to v3.1.1 and fix build on Windows. (#3090) --- diff --git a/Freeswitch.2017.sln b/Freeswitch.2017.sln index 5a8a5ba12c..3d67ec12c2 100644 --- a/Freeswitch.2017.sln +++ b/Freeswitch.2017.sln @@ -444,6 +444,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_opus", "src\mod\codecs\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_t43_gray_code_tables", "libs\win32\spandsp\make_t43_gray_code_tables.2017.vcxproj", "{EDDB8AB9-C53E-44C0-A620-0E86C2CBD5D5}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_modem_godard_descriptor", "libs\win32\spandsp\make_modem_godard_descriptor.2017.vcxproj", "{C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winFailToBan", "src\mod\languages\mod_managed\managed\examples\winFailToBan\winFailToBan.csproj", "{5BA0D5BD-330D-4EE2-B959-CAFEA04E50E0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rtc", "src\mod\endpoints\mod_rtc\mod_rtc.2017.vcxproj", "{3884ADD2-91D0-4CD6-86D3-D5FB2D4AAB9E}" @@ -2322,6 +2324,18 @@ Global {589A07E7-5DE5-49FD-A62C-27795B806AFB}.Release|Win32.Build.0 = Release|Win32 {589A07E7-5DE5-49FD-A62C-27795B806AFB}.Release|x64.ActiveCfg = Release|x64 {589A07E7-5DE5-49FD-A62C-27795B806AFB}.Release|x64.Build.0 = Release|x64 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.All|Win32.ActiveCfg = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.All|Win32.Build.0 = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.All|x64.ActiveCfg = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.All|x64.Build.0 = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Debug|Win32.ActiveCfg = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Debug|Win32.Build.0 = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Debug|x64.ActiveCfg = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Debug|x64.Build.0 = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Release|Win32.ActiveCfg = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Release|Win32.Build.0 = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Release|x64.ActiveCfg = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Release|x64.Build.0 = All|Win32 {3745B86B-6BE8-3E67-FCB9-BE62A6131D67}.All|Win32.ActiveCfg = Debug|Win32 {3745B86B-6BE8-3E67-FCB9-BE62A6131D67}.All|Win32.Build.0 = Debug|Win32 {3745B86B-6BE8-3E67-FCB9-BE62A6131D67}.All|x64.ActiveCfg = Debug|x64 @@ -2515,6 +2529,7 @@ Global {FBC7E2A4-B989-4289-BA7F-68F440E9EF8B} = {A5A27244-AD24-46E5-B01B-840CD296C91D} {7AEE504B-23B6-4B05-829E-7CD34855F146} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {87933C2D-0159-46F7-B326-E1B6E982C21E} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {CB4E68A1-8D19-4B5E-87B9-97A895E1BA17} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {7AC7AB4F-5EF3-40A0-AD2B-CF4D9720FAC3} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0} {411F6D43-9F09-47D0-8B04-E1EB6B67C5BF} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0} diff --git a/configure.ac b/configure.ac index f1ef880d53..271193619e 100644 --- a/configure.ac +++ b/configure.ac @@ -705,9 +705,9 @@ PKG_CHECK_MODULES([MARIADB], [libmariadb >= 3.0.9],[ ]) ]) -PKG_CHECK_MODULES([SPANDSP], [spandsp >= 3.0],[ +PKG_CHECK_MODULES([SPANDSP], [spandsp >= 3.1.1],[ AM_CONDITIONAL([HAVE_SPANDSP],[true])],[ - AC_MSG_ERROR([no usable spandsp; please install spandsp3 devel package or equivalent]) + AC_MSG_ERROR([no usable spandsp; please install spandsp4 devel package or equivalent]) ]) PKG_CHECK_MODULES([SOFIA_SIP], [sofia-sip-ua >= 1.13.17],[ diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index b4f6eb3a57..b6d4c5fcba 100755 --- a/debian/bootstrap.sh +++ b/debian/bootstrap.sh @@ -319,7 +319,7 @@ Build-Depends: # used by many modules libcurl4-openssl-dev | libcurl4-gnutls-dev | libcurl-dev, bison, zlib1g-dev, libsofia-sip-ua-dev (>= 1.13.17), - libspandsp3-dev, + libspandsp4-dev, # used to format the private freeswitch apt-repo key properly gnupg, # module build-depends diff --git a/freeswitch.spec b/freeswitch.spec index a5dab64927..f9a92e0eb7 100755 --- a/freeswitch.spec +++ b/freeswitch.spec @@ -132,7 +132,7 @@ BuildRequires: gcc-c++ BuildRequires: libtool >= 1.5.17 BuildRequires: openssl-devel >= 1.0.1e BuildRequires: sofia-sip-devel >= 1.13.17 -BuildRequires: spandsp3-devel >= 3.0 +BuildRequires: spandsp4-devel >= 3.1.1 BuildRequires: pcre2-devel BuildRequires: speex-devel BuildRequires: sqlite-devel >= 3.6.20 diff --git a/libs/win32/spandsp/libspandsp.2017.vcxproj b/libs/win32/spandsp/libspandsp.2017.vcxproj index 6a3d8012d0..b97c7fa2a8 100644 --- a/libs/win32/spandsp/libspandsp.2017.vcxproj +++ b/libs/win32/spandsp/libspandsp.2017.vcxproj @@ -1,4 +1,4 @@ - + @@ -188,6 +188,7 @@ + @@ -254,11 +255,16 @@ + + + + + @@ -290,6 +296,7 @@ + @@ -309,6 +316,8 @@ + + @@ -335,6 +344,9 @@ + + + @@ -346,6 +358,7 @@ + @@ -383,6 +396,7 @@ + @@ -405,6 +419,8 @@ + + @@ -416,6 +432,7 @@ + @@ -460,6 +477,9 @@ {329a6fa0-0fcc-4435-a950-e670aefa9838} false + + {c8ea4ad3-3edd-4dd1-9d63-4be22585aa14} + {eddb8ab9-c53e-44c0-a620-0e86c2cbd5d5} false diff --git a/libs/win32/spandsp/make_modem_godard_descriptor.2017.vcxproj b/libs/win32/spandsp/make_modem_godard_descriptor.2017.vcxproj new file mode 100644 index 0000000000..738362297e --- /dev/null +++ b/libs/win32/spandsp/make_modem_godard_descriptor.2017.vcxproj @@ -0,0 +1,75 @@ + + + + + All + Win32 + + + + make_modem_godard_descriptor + make_modem_godard_descriptor + Win32Proj + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14} + + + + Application + Unicode + $(DefaultPlatformToolset) + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(PlatformName)\$(Configuration)\ + $(PlatformName)\make_modem_godard_descriptor\$(Configuration)\ + false + + + + $(IntDir)BuildLog $(ProjectName).htm + + + Disabled + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + $(IntDir)$(TargetName).pdb + Level3 + ProgramDatabase + + + true + Console + MachineX86 + + + "$(TargetPath)" 1800.0 2400.0 0.99 1000.0 100.0 15 1 >"..\..\spandsp\src\v17_v32bis_rx_godard.h" +"$(TargetPath)" 1700.0 2400.0 0.99 1000.0 30.0 5 1 >"..\..\spandsp\src\v29rx_godard.h" + + + + + + + + + + + + + + \ No newline at end of file diff --git a/w32/download_spandsp.props b/w32/download_spandsp.props index f02c66a9bd..bdda02da70 100644 --- a/w32/download_spandsp.props +++ b/w32/download_spandsp.props @@ -1,10 +1,13 @@ + true + + $(SpandspVersion.TrimStart('v'))