diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/debian-setup.sh | 4 | ||||
| -rwxr-xr-x | tools/macos-setup.sh | 53 | ||||
| -rwxr-xr-x | tools/rpm-setup.sh | 3 | ||||
| -rw-r--r-- | tools/win-setup.ps1 | 7 |
4 files changed, 65 insertions, 2 deletions
diff --git a/tools/debian-setup.sh b/tools/debian-setup.sh index 333e0f474b..29812ff5a8 100755 --- a/tools/debian-setup.sh +++ b/tools/debian-setup.sh @@ -159,6 +159,10 @@ echo "libsystemd-dev is unavailable" add_package ADDITIONAL_LIST libilbc-dev || echo "libilbc-dev is unavailable" +# opus library libopus-dev +add_package ADDITIONAL_LIST libopus-dev || + echo "libopus-dev is unavailable" + # softhsm2 2.0.0: Ubuntu 16.04 # softhsm2 2.2.0: Debian >= jessie-backports, Ubuntu 18.04 # softhsm2 >= 2.4.0: Debian >= buster, Ubuntu >= 18.10 diff --git a/tools/macos-setup.sh b/tools/macos-setup.sh index 3b3486b06e..cc8183c646 100755 --- a/tools/macos-setup.sh +++ b/tools/macos-setup.sh @@ -170,6 +170,7 @@ if [ "$SPANDSP_VERSION" ]; then fi BCG729_VERSION=1.0.2 ILBC_VERSION=2.0.2 +OPUS_VERSION=1.3.1 PYTHON3_VERSION=3.7.1 BROTLI_VERSION=1.0.7 # minizip @@ -1776,6 +1777,42 @@ uninstall_ilbc() { fi } +install_opus() { + if [ "$OPUS_VERSION" -a ! -f opus-$OPUS_VERSION-done ] ; then + echo "Downloading, building, and installing opus:" + [ -f opus-$OPUS_VERSION.tar.gz ] || curl -L -O https://archive.mozilla.org/pub/opus/opus-$OPUS_VERSION.tar.gz || exit 1 + $no_build && echo "Skipping installation" && return + gzcat opus-$OPUS_VERSION.tar.gz | tar xf - || exit 1 + cd opus-$OPUS_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 opus-$OPUS_VERSION-done + fi +} + +uninstall_opus() { + if [ ! -z "$installed_opus_version" ] ; then + echo "Uninstalling opus:" + cd opus-$installed_opus_version + $DO_MAKE_UNINSTALL || exit 1 + make distclean || exit 1 + cd .. + rm opus-$installed_opus_version-done + + if [ "$#" -eq 1 -a "$1" = "-r" ] ; then + # + # Get rid of the previously downloaded and unpacked version. + # + rm -rf opus-$installed_opus_version + rm -rf opus-$installed_opus_version.tar.gz + fi + + installed_opus_version="" + fi +} + install_python3() { local macver=10.9 if [[ $DARWIN_MAJOR_VERSION -lt 13 ]]; then @@ -1987,6 +2024,17 @@ install_all() { uninstall_ilbc -r fi + if [ -n "$installed_opus_version" ] \ + && [ "$installed_opus_version" != "$OPUS_VERSION" ] ; then + echo "Installed opus version is $installed_opus_version" + if [ -z "$OPUS_VERSION" ] ; then + echo "opus is not requested" + else + echo "Requested opus version is $OPUS_VERSION" + fi + uninstall_opus -r + fi + if [ ! -z "$installed_spandsp_version" -a \ "$installed_spandsp_version" != "$SPANDSP_VERSION" ] ; then echo "Installed SpanDSP version is $installed_spandsp_version" @@ -2475,6 +2523,8 @@ install_all() { install_ilbc + install_opus + install_python3 install_brotli @@ -2506,6 +2556,8 @@ uninstall_all() { uninstall_python3 + uninstall_opus + uninstall_ilbc uninstall_bcg729 @@ -2714,6 +2766,7 @@ then 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_ilbc_version=`ls ilbc-*-done 2>/dev/null | sed 's/ilbc-\(.*\)-done/\1/'` + installed_opus_version=`ls opus-*-done 2>/dev/null | sed 's/opus-\(.*\)-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/'` installed_minizip_version=`ls minizip-*-done 2>/dev/null | sed 's/minizip-\(.*\)-done/\1/'` diff --git a/tools/rpm-setup.sh b/tools/rpm-setup.sh index bc4cd5a150..132320028d 100755 --- a/tools/rpm-setup.sh +++ b/tools/rpm-setup.sh @@ -217,6 +217,9 @@ echo "libnl3/libnl are unavailable" >&2 add_package ADDITIONAL_LIST ilbc-devel || echo "ilbc is unavailable" >&2 +add_package ADDITIONAL_LIST opus-devel || + echo "opus is unavailable" >&2 + ACTUAL_LIST=$BASIC_LIST # Now arrange for optional support libraries diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index a6b3214323..8040656c63 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -69,8 +69,8 @@ Param( # trouble instead of trying to catch exceptions everywhere. $ErrorActionPreference = "Stop" -$Win64CurrentTag = "2020-09-27" -$Win32CurrentTag = "2020-09-27" +$Win64CurrentTag = "2020-09-30" +$Win32CurrentTag = "2020-09-30" # Archive file / SHA256 $Win64Archives = @{ @@ -90,6 +90,7 @@ $Win64Archives = @{ "MaxMindDB-1.3.2-win64ws.zip" = "9025c43e9b21ff0bfbaf206b8ed96e2920ef1434107f789e4c7c0c1d8b508952"; "minizip-1.2.11-4-win64ws.zip" = "dd6bf24e2d946465ad19aa4f8c38e0db91da6585887935de68011982cd6fb2cb"; "nghttp2-1.39.2-win64ws.zip" = "a53f4074bffd919539d90c8d0cde2ea6a10a383f14e38b706e7e70e55476e6bf"; + "opus-1.3.1-3-win64ws.zip" = "1f7a55a6d2d7215dffa4a43bca8ca05024bd4ba1ac3d0d0c405fd38b09cc2205"; "sbc-1.3-1-win64ws.zip" = "08cef6898c421277a6582ef3225d8820f74a037cbd5b6e673a4d8f4593ce80a1"; "snappy-1.1.3-1-win64ws.zip" = "692a15e70f2cdeca621988a46e936d3651e7feb5176981f2656a5e913c394bcc"; "spandsp-0.0.6-1-win64ws.zip" = "0e46c61a5a8dca562c36e88a8962a50c1ec1a9fcf89dd05996dac5a79e454527"; @@ -115,6 +116,7 @@ $Win32Archives = @{ "MaxMindDB-1.3.2-win32ws.zip" = "5c8b4bf3092da8fad6edb005a5283c6a74b7e115a50da010953eed77d33c11b7"; "minizip-1.2.11-4-win32ws.zip" = "41e113930902c2519c4644e8307a0cc51c5855e001e1e69768c48deb376142d0"; "nghttp2-1.39.2-win32ws.zip" = "b511260befc210c1d6d0e920e5f5c47b9e6a21baee6e9874ef12a92093abd245"; + "opus-1.3.1-3-win32ws.zip" = "9700b14c8945fcfed2188b806a2ee7e8628922c22569a4c5183075f3dc133177"; "sbc-1.3-1-win32ws.zip" = "ad37825e9ace4b849a5442c08f1ed7e30634e6b774bba4307fb86f35f82e71ba"; "snappy-1.1.3-1-win32ws.zip" = "2508ef7c5d27655c356d7b86a00ac887fc178eab5df63595b8793953dae5c379"; "spandsp-0.0.6-1-win32ws.zip" = "3c25f2f4d641d4257ec9922f6db77346a8eed2e360e7d0e27b828ade19c4705b"; @@ -176,6 +178,7 @@ $CleanupItems = @( "MaxMindDB-1.3.2-win??ws" "minizip-*-win??ws" "nghttp2-*-win??ws" + "opus-1.3.1-?-win??ws" "portaudio_v19" "portaudio_v19_2" "sbc-1.3-win??ws" |