Merge pull request #773 from signalwire/spandsp

[Build-System] Remove SpanDSP library from the FreeSWITCH tree and use packages instead.
signalwire · Aug 4, 2020 · 97c4bfc · 97c4bfc
2 parents 84d3484 + 231d5e6
commit 97c4bfc
Show file tree

Hide file tree

Showing 560 changed files with 1,624 additions and 226,108 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -14,7 +14,7 @@ steps:
       image: signalwire/freeswitch-public-base
       pull: true
       commands:
-      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev
+      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp-dev
       - echo "applications/mod_test" >> modules.conf
       - echo 'codecs/mod_openh264' >> modules.conf
       - sed -i '/applications\\/mod_http_cache/s/^#//g' modules.conf
@@ -28,7 +28,7 @@ steps:
       image: signalwire/freeswitch-public-base
       pull: true
       commands:
-      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev
+      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp-dev
       - echo '#!/bin/bash\nmake -j`nproc --all` |& tee ./unit-tests-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./build-status.txt\n' > build.sh
       - chmod +x build.sh
       - ./build.sh
@@ -37,7 +37,7 @@ steps:
       image: signalwire/freeswitch-public-base
       pull: true
       commands:
-      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev
+      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp-dev
       - make install || true
       - cd tests/unit
       - ./run-tests.sh
@@ -83,7 +83,7 @@ steps:
       image: signalwire/freeswitch-public-base:stretch
       pull: true
       commands:
-      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev
+      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp-dev
       - cp build/modules.conf.most modules.conf
       #Enable/Uncomment mods
       - echo 'codecs/mod_openh264' >> modules.conf
@@ -113,7 +113,7 @@ steps:
       image: signalwire/freeswitch-public-base:stretch
       pull: true
       commands:
-      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev
+      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp-dev
       - mkdir -p scan-build
       - echo '#!/bin/bash\nscan-build-4.0 -o ./scan-build/ make -j`nproc --all` |& tee ./scan-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./scan-build-status.txt\n' > scan.sh
       - chmod +x scan.sh
@@ -144,6 +144,6 @@ trigger:
 
 ---
 kind: signature
-hmac: 9f536d54b3df4db408a9e23a412185d0c95e66d22d15ba7ff00c7cfc85bff3ab
+hmac: c48137f0dee8c2825711979e2c490367a2467a92866d3dfa11cf340a113dbf53
 
 ...
diff --git a/.gitignore b/.gitignore
@@ -142,7 +142,6 @@ Release/
 /libs/libcodec2/unittest/Makefile
 /libs/libcodec2/unittest/Makefile.in
 /libs/mpg123-1.13.2/
-/libs/spandsp/src/cielab_luts.h
 /scripts/fsxs
 /scripts/gentls_cert
 

diff --git a/Freeswitch.2017.sln b/Freeswitch.2017.sln
@@ -342,9 +342,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_easyroute", "src\mod\ap
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_lcr", "src\mod\applications\mod_lcr\mod_lcr.2017.vcxproj", "{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libs\spandsp\src\libtiff.2017.vcxproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libs\win32\libtiff\libtiff.2017.vcxproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libs\spandsp\src\libspandsp.2017.vcxproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libs\win32\spandsp\libspandsp.2017.vcxproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "libs\win32\speex\libspeex.2017.vcxproj", "{E972C52F-9E85-4D65-B19C-031E511E9DB4}"
 EndProject
@@ -358,9 +358,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_skinny", "src\mod\endpo
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rtmp", "src\mod\endpoints\mod_rtmp\mod_rtmp.2017.vcxproj", "{48414740-C693-4968-9846-EE058020C64F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_at_dictionary", "libs\spandsp\src\msvc\make_at_dictionary.2017.vcxproj", "{DEE932AB-5911-4700-9EEB-8C7090A0A330}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_at_dictionary", "libs\win32\spandsp\make_at_dictionary.2017.vcxproj", "{DEE932AB-5911-4700-9EEB-8C7090A0A330}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_modem_filter", "libs\spandsp\src\msvc\make_modem_filter.2017.vcxproj", "{329A6FA0-0FCC-4435-A950-E670AEFA9838}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_modem_filter", "libs\win32\spandsp\make_modem_filter.2017.vcxproj", "{329A6FA0-0FCC-4435-A950-E670AEFA9838}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_skel", "src\mod\applications\mod_skel\mod_skel.2017.vcxproj", "{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}"
 EndProject
@@ -484,11 +484,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmltok", "libs\win32\xmlrpc
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup.2017", "w32\Setup\Setup.2017.wixproj", "{47213370-B933-487D-9F45-BCA26D7E2B6F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_math_fixed_tables", "libs\spandsp\src\msvc\make_math_fixed_tables.2017.vcxproj", "{2386B892-35F5-46CF-A0F0-10394D2FBF9B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_math_fixed_tables", "libs\win32\spandsp\make_math_fixed_tables.2017.vcxproj", "{2386B892-35F5-46CF-A0F0-10394D2FBF9B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcbt", "libs\win32\libcbt\libcbt.2017.vcxproj", "{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_cielab_luts", "libs\spandsp\src\msvc\make_cielab_luts.2017.vcxproj", "{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_cielab_luts", "libs\win32\spandsp\make_cielab_luts.2017.vcxproj", "{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "opus", "opus", "{ED2CA8B5-8E91-4296-A120-02BB0B674652}"
 EndProject
@@ -504,7 +504,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus.silk_float", "libs\win
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_opus", "src\mod\codecs\mod_opus\mod_opus.2017.vcxproj", "{64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_t43_gray_code_tables", "libs\spandsp\src\msvc\make_t43_gray_code_tables.2017.vcxproj", "{EDDB8AB9-C53E-44C0-A620-0E86C2CBD5D5}"
+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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winFailToBan", "src\mod\languages\mod_managed\managed\examples\winFailToBan\winFailToBan.csproj", "{5BA0D5BD-330D-4EE2-B959-CAFEA04E50E0}"
 EndProject

diff --git a/Makefile.am b/Makefile.am
@@ -130,7 +130,7 @@ CORE_CFLAGS += -I$(switch_srcdir)/libs/libyuv/include
 CORE_CFLAGS += -DSWITCH_HAVE_YUV
 endif
 CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/crypto/include -Ilibs/srtp/crypto/include
-CORE_CFLAGS += -I$(switch_builddir)/libs/spandsp/src -I$(switch_srcdir)/libs/spandsp/src 
+CORE_CFLAGS += $(SPANDSP_CFLAGS)
 if ENABLE_LIBVPX
 CORE_CFLAGS += -DSWITCH_HAVE_VPX
 endif
@@ -184,13 +184,10 @@ endif
 ##
 ## libfreeswitch
 ##
-noinst_LTLIBRARIES        = libfreeswitch_spandsp.la
+noinst_LTLIBRARIES        =
 if ENABLE_LIBYUV
 noinst_LTLIBRARIES += libfreeswitch_libyuv.la
 endif
-libfreeswitch_spandsp_la_SOURCES = libs/spandsp/src/plc.c libs/spandsp/src/alloc.c libs/spandsp/src/bit_operations.c
-libfreeswitch_spandsp_la_CFLAGS  = -Ilibs/spandsp/src $(CORE_CFLAGS) $(AM_CFLAGS)
-CORE_LIBS+=libfreeswitch_spandsp.la
 
 if ENABLE_LIBYUV
 libfreeswitch_libyuv_la_SOURCES = \
@@ -251,7 +248,7 @@ endif
 lib_LTLIBRARIES	         = libfreeswitch.la
 libfreeswitch_la_CFLAGS  = $(CORE_CFLAGS) $(SQLITE_CFLAGS) $(GUMBO_CFLAGS) $(FVAD_CFLAGS) $(FREETYPE_CFLAGS) $(CURL_CFLAGS) $(PCRE_CFLAGS) $(SPEEX_CFLAGS) $(LIBEDIT_CFLAGS) $(openssl_CFLAGS)  $(AM_CFLAGS) $(TPL_CFLAGS)
 libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_LDFLAGS) -no-undefined
-libfreeswitch_la_LIBADD  = $(CORE_LIBS) $(APR_LIBS) $(SQLITE_LIBS) $(GUMBO_LIBS) $(FVAD_LIBS) $(FREETYPE_LIBS) $(CURL_LIBS) $(PCRE_LIBS) $(SPEEX_LIBS) $(LIBEDIT_LIBS) $(openssl_LIBS) $(PLATFORM_CORE_LIBS) $(TPL_LIBS)
+libfreeswitch_la_LIBADD  = $(CORE_LIBS) $(APR_LIBS) $(SQLITE_LIBS) $(GUMBO_LIBS) $(FVAD_LIBS) $(FREETYPE_LIBS) $(CURL_LIBS) $(PCRE_LIBS) $(SPEEX_LIBS) $(LIBEDIT_LIBS) $(openssl_LIBS) $(PLATFORM_CORE_LIBS) $(TPL_LIBS) $(SPANDSP_LIBS)
 libfreeswitch_la_DEPENDENCIES = $(BUILT_SOURCES)
 
 if HAVE_PNG
@@ -713,9 +710,7 @@ core-install: core_install
 
 clean_core: clean-libLTLIBRARIES
 	rm -f $(libfreeswitch_la_OBJECTS)
-	rm -f $(libfreeswitch_spandsp_la_OBJECTS)
 	rm -f `echo $(libfreeswitch_la_OBJECTS) | sed -e's|.lo|.o|g'`
-	rm -f `echo $(libfreeswitch_spandsp_la_OBJECTS) | sed -e's|.lo|.o|g'`
 
 install_core: install-libLTLIBRARIES
 
@@ -780,12 +775,6 @@ iks-reconf:
 	cd libs/iksemel && sh ./configure.gnu $(MY_DEFAULT_ARGS)
 	$(MAKE) mod_dingaling-clean
 
-spandsp-reconf:
-	cd libs/spandsp && $(MAKE) clean || echo
-	cd libs/spandsp && autoreconf -fi
-	cd libs/spandsp && sh ./configure.gnu $(MY_DEFAULT_ARGS)
-	cd libs/spandsp && $(MAKE)
-
 cluecon:
 	@clear
 	@echo Thank you for updating. This is going to take a while so relax.

diff --git a/bootstrap.sh b/bootstrap.sh
@@ -8,7 +8,7 @@ BGJOB=false
 VERBOSE=false
 BASEDIR=`pwd`;
 LIBDIR=${BASEDIR}/libs;
-SUBDIRS="apr libzrtp iksemel libdingaling srtp freetdm spandsp unimrcp fs";
+SUBDIRS="apr libzrtp iksemel libdingaling srtp freetdm unimrcp fs";
 
 while getopts 'jhd:v' o; do 
   case "$o" in

diff --git a/configure.ac b/configure.ac
@@ -714,6 +714,11 @@ PKG_CHECK_MODULES([MARIADB], [libmariadb >= 3.0.9],[
   ])
 ])
 
+PKG_CHECK_MODULES([SPANDSP], [spandsp >= 1.99],[
+  AM_CONDITIONAL([HAVE_SPANDSP],[true])],[
+    AC_MSG_ERROR([no usable spandsp; please install spandsp devel package or equivalent])
+])
+
 PKG_CHECK_MODULES([SOFIA_SIP], [sofia-sip-ua >= 1.12.12],[
   AM_CONDITIONAL([HAVE_SOFIA_SIP],[true])],[
     AC_MSG_ERROR([no usable sofia-sip; please install sofia-sip-ua devel package or equivalent])
@@ -2111,7 +2116,6 @@ AC_CONFIG_SUBDIRS([libs/iksemel])
 AC_CONFIG_SUBDIRS([libs/libdingaling])
 AC_CONFIG_SUBDIRS([libs/freetdm])
 AC_CONFIG_SUBDIRS([libs/unimrcp])
-AC_CONFIG_SUBDIRS([libs/spandsp])
 if test "x${enable_zrtp}" = "xyes"; then
    AC_CONFIG_SUBDIRS([libs/libzrtp])
 fi

diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh
@@ -333,6 +333,7 @@ Build-Depends:
 # used by many modules
  libcurl4-openssl-dev | libcurl4-gnutls-dev | libcurl-dev,
  bison, zlib1g-dev, libsofia-sip-ua-dev (>= 1.12.12),
+ libspandsp-dev (>= 1.99),
 # module build-depends
  $(debian_wrap "${mod_build_depends}")
 Standards-Version: 3.9.3

diff --git a/debian/copyright b/debian/copyright
@@ -1310,45 +1310,6 @@ Files: libs/js/nsprpub/pr/tests/tmocon.c
 Copyright: 1998-2004 Netscape Communications Corporation
 License: MPL-1.1 or GPL-2+
 
-Files: libs/spandsp/*
-Copyright: 2001-2012, Steve Underwood
- 2006 Michael Jerris
- 1991-1997 Silicon Graphics, Inc.
- 1990-1997 Sam Leffler
- 1993 CMU
- 2004, Horizon Wimba, Inc.
- 1990, 1995  Frank D. Cringle.
-License: LGPL-2.1
-
-Files: libs/spandsp/tests/*
- libs/spandsp/spandsp-sim/g1050.c
- libs/spandsp/spandsp-sim/line_model.c
- libs/spandsp/spandsp-sim/make_line_models.c
- libs/spandsp/spandsp-sim/spandsp-sim.h
- libs/spandsp/spandsp-sim/test_utils.c
- libs/spandsp/src/image_translate.c
- libs/spandsp/src/make_at_dictionary.c
- libs/spandsp/src/make_cielab_luts.c
- libs/spandsp/src/make_math_fixed_tables.c
- libs/spandsp/src/make_modem_filter.c
- libs/spandsp/test-data/etsi/fax/generate_etsi_300_242_pages.c
- libs/spandsp/test-data/itu/fax/generate_dithered_tif.c
- libs/spandsp/test-data/itu/fax/generate_sized_pages.c
- libs/spandsp/test-data/itu/fax/generate_striped_pages.c
-Copyright: 2001-2012, Steve Underwood
-License: GPL-2
-
-Files: libs/spandsp/tests/ademco_contactid_tests.c
- libs/spandsp/tests/regression_tests.sh
- libs/spandsp/tests/timezone_tests.c
- libs/spandsp/tests/tsb85_extra_tests.sh
- libs/spandsp/tests/tsb85_tests.c
- libs/spandsp/tests/tsb85_tests.sh
- libs/spandsp/tests/v42bis_tests.sh
- libs/spandsp/tests/fax_tests.sh
-Copyright: 2001-2012, Steve Underwood
-License: LGPL-2.1
-
 Files: src/mod/applications/mod_cluechoo/sl.h
 Copyright: 1993 Toyoda Masashi
 License: FIXME
@@ -1441,11 +1402,6 @@ Files: libs/libsndfile/src/G72x/*
 Copyright: Abandoned, Sun Microsystems, Inc.
 License: public-domain
 
-Files: libs/spandsp/src/spandsp/fast_convert.h
-Copyright: 2001-2004 Erik de Castro Lopo <[email protected]>
- 2009 Steve Underwood
-License: LGPL-2.1
-
 Files: libs/libsndfile/*
  libs/win32/libsndfile/*
 Copyright: 1999-2009 Erik de Castro Lopo <[email protected]>

diff --git a/debian/license-reconcile.yml b/debian/license-reconcile.yml
@@ -162,15 +162,6 @@ Rules:
    Matches: the\sLicense\sat\shttp://www.mozilla.org/MPL/
    Matches: GNU\sGeneral\sPublic\sLicense\sVersion\s2\sor\slater
    License: MPL-1.1 or GPL-2+
-  -
-   Glob: libs/spandsp/tests/g726_tests.c
-   Matches: Copyright\s(C)\s2006\sSteve\sUnderwood
-   Matches: specification.\sThese\sare\scopyright\smaterial,\sand\sso\scannot\sbe\sdistributed\swith\sthis\stest\ssoftware.
-   Copyright: 2006 Steve Underwood
-  -
-   Glob: libs/spandsp/*/g722.[ch]
-   Matches: Copyright\s\(c\)\sCMU\s+1993
-   Copyright: 1993 CMU
   -
    Glob: libs/libwebsockets/win32port/zlib/inftrees.c
    Matches: Copyright\s1995-2010\sMark\sAdler\s.;

diff --git a/freeswitch.spec b/freeswitch.spec
@@ -153,6 +153,7 @@ BuildRequires: libtool >= 1.5.17
 BuildRequires: ncurses-devel
 BuildRequires: openssl-devel >= 1.0.1e
 BuildRequires: sofia-sip-devel >= 1.12.12
+BuildRequires: spandsp-devel >= 1.99
 BuildRequires: pcre-devel 
 BuildRequires: speex-devel 
 BuildRequires: sqlite-devel

diff --git a/libs/.gitignore b/libs/.gitignore
@@ -486,70 +486,6 @@ opal
 /sounds/
 /soundtouch/
 /soundtouch-*/
-/spandsp/config-h.in
-/spandsp/doc/doxygen
-/spandsp/doc/Makefile
-/spandsp/doc/Makefile.in
-/spandsp/Makefile
-/spandsp/Makefile.in
-/spandsp/m4/libtool.m4
-/spandsp/m4/ltoptions.m4
-/spandsp/m4/ltsugar.m4
-/spandsp/m4/ltversion.m4
-/spandsp/m4/lt~obsolete.m4
-/spandsp/spandsp-sim/Makefile
-/spandsp/spandsp-sim/Makefile.in
-/spandsp/src/at_interpreter_dictionary.h
-/spandsp/src/config.h
-/spandsp/src/make_at_dictionary
-/spandsp/src/Makefile
-/spandsp/src/Makefile.in
-/spandsp/src/make_math_fixed_tables
-/spandsp/src/make_modem_filter
-/spandsp/src/make_t43_gray_code_tables
-/spandsp/src/math_fixed_tables.h
-/spandsp/src/msvc/All/BuildLog make_at_dictionary.htm
-/spandsp/src/msvc/All/BuildLog make_modem_filter.htm
-/spandsp/src/spandsp.h
-/spandsp/src/stamp-h1
-/spandsp/src/t43_gray_code_tables.h
-/spandsp/src/v17_v32bis_rx_fixed_rrc.h
-/spandsp/src/v17_v32bis_rx_floating_rrc.h
-/spandsp/src/v17_v32bis_tx_fixed_rrc.h
-/spandsp/src/v17_v32bis_tx_floating_rrc.h
-/spandsp/src/v22bis_rx_1200_fixed_rrc.h
-/spandsp/src/v22bis_rx_1200_floating_rrc.h
-/spandsp/src/v22bis_rx_2400_fixed_rrc.h
-/spandsp/src/v22bis_rx_2400_floating_rrc.h
-/spandsp/src/v22bis_tx_fixed_rrc.h
-/spandsp/src/v22bis_tx_floating_rrc.h
-/spandsp/src/v27ter_rx_2400_fixed_rrc.h
-/spandsp/src/v27ter_rx_2400_floating_rrc.h
-/spandsp/src/v27ter_rx_4800_fixed_rrc.h
-/spandsp/src/v27ter_rx_4800_floating_rrc.h
-/spandsp/src/v27ter_tx_2400_fixed_rrc.h
-/spandsp/src/v27ter_tx_2400_floating_rrc.h
-/spandsp/src/v27ter_tx_4800_fixed_rrc.h
-/spandsp/src/v27ter_tx_4800_floating_rrc.h
-/spandsp/src/v29rx_fixed_rrc.h
-/spandsp/src/v29rx_floating_rrc.h
-/spandsp/src/v29tx_fixed_rrc.h
-/spandsp/src/v29tx_floating_rrc.h
-/spandsp/test-data/etsi/fax/Makefile
-/spandsp/test-data/etsi/fax/Makefile.in
-/spandsp/test-data/etsi/Makefile
-/spandsp/test-data/etsi/Makefile.in
-/spandsp/test-data/itu/fax/Makefile
-/spandsp/test-data/itu/fax/Makefile.in
-/spandsp/test-data/itu/Makefile
-/spandsp/test-data/itu/Makefile.in
-/spandsp/test-data/local/Makefile
-/spandsp/test-data/local/Makefile.in
-/spandsp/test-data/Makefile
-/spandsp/test-data/Makefile.in
-/spandsp/tests/Makefile
-/spandsp/tests/Makefile.in
-/spandsp/src/make_cielab_luts
 /sphinxbase-*/
 /srtp/aes_tables
 /srtp/config_in.h
@@ -819,7 +755,6 @@ broadvoice/config/compile
 ilbc/config/compile
 libg722_1/config/compile
 pcre/compile
-spandsp/config/compile
 srtp/build/compile
 unimrcp/build/compile
 /pcre-*/
@@ -837,7 +772,6 @@ iksemel/configure
 libdingaling/configure
 libyuv/Makefile
 libyuv/convert
-spandsp/configure
 srtp/configure
 tiff-4.0.2/configure
 unimrcp/configure
@@ -863,3 +797,6 @@ signalwire-client-c-*/
 signalwire-client-c-*
 mariadb-connector-c-*/
 mariadb-connector-c-*
+/spandsp*/
+/spandsp*
+win32/spandsp/spandsp.h
diff --git a/libs/spandsp/.gitignore b/libs/spandsp/.gitignore
diff --git a/libs/spandsp/.update b/libs/spandsp/.update
diff --git a/libs/spandsp/AUTHORS b/libs/spandsp/AUTHORS