From fc0cca091103d1bbc58095bc7bc54b05f09b9d90 Mon Sep 17 00:00:00 2001 From: Joerg Mayer Date: Mon, 13 Jan 2020 22:48:10 +0100 Subject: macos-setup.sh: Add SpeexDSP setup and install MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3558d398970d919b8e12992ad4c97789aac79129 Reviewed-on: https://code.wireshark.org/review/35785 Reviewed-by: Jörg Mayer --- tools/macos-setup.sh | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) (limited to 'tools/macos-setup.sh') diff --git a/tools/macos-setup.sh b/tools/macos-setup.sh index 70df4040ec..8d87440698 100755 --- a/tools/macos-setup.sh +++ b/tools/macos-setup.sh @@ -161,6 +161,7 @@ LIBSSH_VERSION=0.9.0 MAXMINDDB_VERSION=1.3.2 NGHTTP2_VERSION=1.39.2 SPANDSP_VERSION=0.0.6 +SPEEXDSP_VERSION=1.2.0 if [ "$SPANDSP_VERSION" ]; then # # SpanDSP depends on libtiff. @@ -1666,6 +1667,42 @@ uninstall_spandsp() { fi } +install_speexdsp() { + if [ "$SPEEXDSP_VERSION" -a ! -f speexdsp-$SPEEXDSP_VERSION-done ] ; then + echo "Downloading, building, and installing SpeexDSP:" + [ -f speexdsp-$SPEEXDSP_VERSION.tar.gz ] || curl -L -O http://downloads.us.xiph.org/releases/speex/speexdsp-$SPEEXDSP_VERSION.tar.gz || exit 1 + $no_build && echo "Skipping installation" && return + gzcat speexdsp-$SPEEXDSP_VERSION.tar.gz | tar xf - || exit 1 + cd speexdsp-$SPEEXDSP_VERSION + CFLAGS="$CFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" CXXFLAGS="$CXXFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" LDFLAGS="$LDFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" ./configure || exit 1 + make $MAKE_BUILD_OPTS || exit 1 + $DO_MAKE_INSTALL || exit 1 + cd .. + touch speexdsp-$SPEEXDSP_VERSION-done + fi +} + +uninstall_speexdsp() { + if [ ! -z "$installed_speexdsp_version" ] ; then + echo "Uninstalling SpeexDSP:" + cd speexdsp-$installed_speexdsp_version + $DO_MAKE_UNINSTALL || exit 1 + make distclean || exit 1 + cd .. + rm speexdsp-$installed_speexdsp_version-done + + if [ "$#" -eq 1 -a "$1" = "-r" ] ; then + # + # Get rid of the previously downloaded and unpacked version. + # + rm -rf speexdsp-$installed_speexdsp_version + rm -rf speexdsp-$installed_speexdsp_version.tar.gz + fi + + installed_speexdsp_version="" + fi +} + install_bcg729() { if [ "$BCG729_VERSION" -a ! -f bcg729-$BCG729_VERSION-done ] ; then echo "Downloading, building, and installing bcg729:" @@ -1893,7 +1930,7 @@ install_all() { if [ ! -z "$installed_bcg729_version" -a \ "$installed_bcg729_version" != "$BCG729_VERSION" ] ; then - echo "Installed SpanDSP version is $installed_bcg729_version" + echo "Installed bcg729 version is $installed_bcg729_version" if [ -z "$BCG729_VERSION" ] ; then echo "bcg729 is not requested" else @@ -1913,6 +1950,17 @@ install_all() { uninstall_spandsp -r fi + if [ ! -z "$installed_speexdsp_version" -a \ + "$installed_speexdsp_version" != "$SPEEXDSP_VERSION" ] ; then + echo "Installed SpeexDSP version is $installed_speexdsp_version" + if [ -z "$SPEEXDSP_VERSION" ] ; then + echo "speexdsp is not requested" + else + echo "Requested SpeexDSP version is $SPEEXDSP_VERSION" + fi + uninstall_speexdsp -r + fi + if [ ! -z "$installed_libtiff_version" -a \ "$installed_libtiff_version" != "$LIBTIFF_VERSION" ] ; then echo "Installed libtiff version is $installed_libtiff_version" @@ -2373,6 +2421,8 @@ install_all() { install_spandsp + install_speexdsp + install_bcg729 install_python3 @@ -2408,6 +2458,8 @@ uninstall_all() { uninstall_bcg729 + uninstall_speexdsp + uninstall_spandsp uninstall_libtiff @@ -2607,6 +2659,7 @@ then installed_nghttp2_version=`ls nghttp2-*-done 2>/dev/null | sed 's/nghttp2-\(.*\)-done/\1/'` installed_libtiff_version=`ls tiff-*-done 2>/dev/null | sed 's/tiff-\(.*\)-done/\1/'` installed_spandsp_version=`ls spandsp-*-done 2>/dev/null | sed 's/spandsp-\(.*\)-done/\1/'` + installed_speexdsp_version=`ls speexdsp-*-done 2>/dev/null | sed 's/speexdsp-\(.*\)-done/\1/'` installed_bcg729_version=`ls bcg729-*-done 2>/dev/null | sed 's/bcg729-\(.*\)-done/\1/'` installed_python3_version=`ls python3-*-done 2>/dev/null | sed 's/python3-\(.*\)-done/\1/'` installed_brotli_version=`ls brotli-*-done 2>/dev/null | sed 's/brotli-\(.*\)-done/\1/'` -- cgit v1.2.3