diff --git a/.drone.yml b/.drone.yml index 486c2f8402..4119e80d05 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,7 +14,8 @@ steps: image: signalwire/freeswitch-public-base pull: true commands: - - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp-dev + - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev + - DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-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 +29,8 @@ steps: image: signalwire/freeswitch-public-base pull: true commands: - - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp-dev + - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev + - DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-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 +39,8 @@ steps: image: signalwire/freeswitch-public-base pull: true commands: - - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp-dev + - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev + - DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-dev - make install || true - cd tests/unit - ./run-tests.sh @@ -83,7 +86,8 @@ steps: image: signalwire/freeswitch-public-base:stretch pull: true commands: - - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp-dev + - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev + - DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-dev - cp build/modules.conf.most modules.conf #Enable/Uncomment mods - echo 'codecs/mod_openh264' >> modules.conf @@ -113,7 +117,8 @@ steps: image: signalwire/freeswitch-public-base:stretch pull: true commands: - - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp-dev + - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev + - DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-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 +149,6 @@ trigger: --- kind: signature -hmac: c48137f0dee8c2825711979e2c490367a2467a92866d3dfa11cf340a113dbf53 +hmac: 847aeb3791f682fe44b2e401a7a2b6ebbf06830e67046745459a31b32a7da2f3 ... diff --git a/configure.ac b/configure.ac index 3b84854271..169e899807 100644 --- a/configure.ac +++ b/configure.ac @@ -714,9 +714,9 @@ PKG_CHECK_MODULES([MARIADB], [libmariadb >= 3.0.9],[ ]) ]) -PKG_CHECK_MODULES([SPANDSP], [spandsp >= 1.99],[ +PKG_CHECK_MODULES([SPANDSP], [spandsp >= 3.0],[ AM_CONDITIONAL([HAVE_SPANDSP],[true])],[ - AC_MSG_ERROR([no usable spandsp; please install spandsp devel package or equivalent]) + AC_MSG_ERROR([no usable spandsp; please install spandsp3 devel package or equivalent]) ]) PKG_CHECK_MODULES([SOFIA_SIP], [sofia-sip-ua >= 1.12.12],[ diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index f8b28f0431..e734c09533 100755 --- a/debian/bootstrap.sh +++ b/debian/bootstrap.sh @@ -333,7 +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 (>= 0.0.6), + libspandsp3-dev, # module build-depends $(debian_wrap "${mod_build_depends}") Standards-Version: 3.9.3 diff --git a/freeswitch.spec b/freeswitch.spec index 7bf9774602..e53255812b 100644 --- a/freeswitch.spec +++ b/freeswitch.spec @@ -153,7 +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: spandsp3-devel >= 3.0 BuildRequires: pcre-devel BuildRequires: speex-devel BuildRequires: sqlite-devel