]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
[Build-System] Use spandsp3 package 793/head
authorAndrey Volk <andywolk@gmail.com>
Thu, 13 Aug 2020 20:10:21 +0000 (00:10 +0400)
committerAndrey Volk <andywolk@gmail.com>
Fri, 14 Aug 2020 21:46:47 +0000 (01:46 +0400)
.drone.yml
configure.ac
debian/bootstrap.sh
freeswitch.spec

index 486c2f84022f6527bc7f9e545113d17a4dbc7861..4119e80d0510a2e9aa6315bc5ea1264cc1a9b010 100644 (file)
@@ -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
 
 ...
index 3b84854271d7fe6f2a157165e06e103afbe5c5cd..169e899807a7bc18dd8998fbe45e7c43a0dbac8f 100644 (file)
@@ -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],[
index f8b28f04315ed6a8ba885d544d923fce3554c004..e734c09533f6e10394fa80fca170cfcbffbbd01f 100755 (executable)
@@ -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
index 7bf9774602986621991ceaff0659686f6cb42e8b..e53255812b4366ee8eb74326f68b45382cbd28da 100644 (file)
@@ -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