sip-lab 1.40.0 → 1.40.1

package/build_deps.sh

@@ -5,77 +5,72 @@ set -o nounset
 set -o pipefail
 
 
-START_DIR=`pwd`
+START_DIR=$(pwd)
+
+
+ensure_git_repo() {
+    local dir=$1
+    local repo=$2
+    local commit=$3
+    shift 3
+
+    cd "$START_DIR/3rdParty"
+    if [[ -d "$dir" ]]; then
+        cd "$dir"
+        local current=$(git rev-parse HEAD 2>/dev/null || echo "")
+        cd "$START_DIR/3rdParty"
+        if [[ "$current" == "$commit" ]]; then
+            echo "$dir: already at desired commit $commit, skipping"
+            return 0
+        fi
+        echo "$dir: commit mismatch ($current != $commit), re-cloning"
+        rm -rf "$dir"
+    fi
+
+    git clone "$repo" "$dir"
+    cd "$dir"
+    git checkout "$commit"
+
+    if [[ $# -gt 0 ]]; then
+        eval "$*"
+    fi
+    cd "$START_DIR/3rdParty"
+}
 
 
 mkdir -p $START_DIR/3rdParty
 
-
-cd $START_DIR/3rdParty
-if [[ ! -d spandsp ]]
-then
-    commit=e59ca8fb8b1591e626e6a12fdc60a2ebe83435ed
-    git clone https://github.com/freeswitch/spandsp
-    cd spandsp
-    git checkout $commit
+ensure_git_repo spandsp https://github.com/freeswitch/spandsp e59ca8fb8b1591e626e6a12fdc60a2ebe83435ed '
     ./bootstrap.sh
-    CFLAGS='-O -fPIC' ./configure --enable-shared
+    CFLAGS="-O -fPIC" ./configure --enable-shared
     make
-fi
+'
 
+ensure_git_repo rapidjson https://github.com/Tencent/rapidjson 27c3a8dc0e2c9218fe94986d249a12b5ed838f1d
 
-cd $START_DIR/3rdParty
-if [[ ! -d rapidjson ]]
-then
-    git clone https://github.com/Tencent/rapidjson
-    cd rapidjson
-    git checkout 27c3a8dc0e2c9218fe94986d249a12b5ed838f1d
-fi
-
-
-cd $START_DIR/3rdParty
-if [[ ! -d bcg729 ]]
-then
-    git clone https://github.com/MayamaTakeshi/bcg729
-    cd bcg729
-    git checkout faaa895862165acde6df8add722ba4f85a25007d
+ensure_git_repo bcg729 https://github.com/MayamaTakeshi/bcg729 faaa895862165acde6df8add722ba4f85a25007d '
     cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .
     make
     mkdir -p lib
     cp -f src/libbcg729.a lib
-fi
-
-
-cd $START_DIR/3rdParty
-if [[ ! -d pjproject ]]
-then
-    git clone https://github.com/pjsip/pjproject
-    cd pjproject
-    #git checkout de3d744c2e1188b59bb907b6ee32ef83740ebc64
-    #git checkout 33a3c9e0a5eb84426edef05a9aa98af17d8011c3 # required for bcg729
-    #git checkout 797088ed133c98492519b7d042b75735f6f9388c # updated as part of #21
-    #git checkout 651df5b50129b7c5a5feec8336dda4468d53d2b0 # updated to latest to see of crash issues improve
-    #git checkout 043926a5846963a2c99378e8daa495230923eaab # updated to try to solve #49 (but issue remains)
-    #git checkout c36802585ddefb3ca477d1f6d773d179510c5412 # updated to try to solve #83 (but issue remains)
-    git checkout 9543a1bcf50be721d030be99afeeb63bd8cf2013 # updated to latest commit to permit to report https://github.com/pjsip/pjproject/issues/4082
+'
 
+ensure_git_repo pjproject https://github.com/pjsip/pjproject 9543a1bcf50be721d030be99afeeb63bd8cf2013 '
     cat > user.mak <<EOF
     export CFLAGS += -fPIC -g
     export LDFLAGS +=
 EOF
-
-    sed -i -r 's/BCG729_LIBS="-lbcg729"/BCG729_LIBS=''/' aconfigure
-    LIBS=`pwd`/../bcg729/src/libbcg729.a ./configure --with-bcg729=`pwd`/../bcg729
-    cat > pjlib/include/pj/config_site.h <<EOF
+    sed -i -r "s/BCG729_LIBS=\"-lbcg729\"/BCG729_LIBS=\"\"/" aconfigure
+    LIBS=$(pwd)/../bcg729/src/libbcg729.a ./configure --with-bcg729=$(pwd)/../bcg729
+    cat > pjlib/include/pj/config_site.h <<EOF2
 #define PJSUA_MAX_ACC (20000)
 #define PJ_IOQUEUE_MAX_HANDLES (1024)
 #define PJSUA_MAX_CALLS (20000)
 
 #define PJMEDIA_HAS_OPUS_CODEC 1
-EOF
+EOF2
     make dep && make clean && make
-fi
-
+'
 
 cd $START_DIR/3rdParty
 if [[ ! -d boost_1_66_0 ]]
@@ -84,13 +79,17 @@ then
     tar xf boost_1_66_0.tar.bz2
 fi
 
-
 cd $START_DIR/3rdParty
+POCKETSPHINX_VERSION=5.0.3
+if [[ -f pocketsphinx/.version && "$(cat pocketsphinx/.version)" != "$POCKETSPHINX_VERSION" ]]
+then
+    echo "pocketsphinx: version mismatch, re-downloading"
+    rm -rf pocketsphinx
+fi
 if [[ ! -d pocketsphinx ]]
 then
-    POCKETSPHINX_VERSION=5.0.3
     rm -f v${POCKETSPHINX_VERSION}.tar.gz
-    wget https://github.com/cmusphinx/pocketsphinx/archive/refs/tags/v${POCKETSPHINX_VERSION}.tar.gz 
+    wget https://github.com/cmusphinx/pocketsphinx/archive/refs/tags/v${POCKETSPHINX_VERSION}.tar.gz
     tar xf v${POCKETSPHINX_VERSION}.tar.gz
     rm -f v${POCKETSPHINX_VERSION}.tar.gz
     mv pocketsphinx-${POCKETSPHINX_VERSION} pocketsphinx
@@ -98,6 +97,7 @@ then
     sed -i '/include(GNUInstallDirs)/a \\nset(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")' CMakeLists.txt
     cmake -S . -B build
     cmake --build build
+    echo "$POCKETSPHINX_VERSION" > .version
 
     rm -fr ../../pocketsphinx
     mkdir -p ../../pocketsphinx
@@ -105,14 +105,7 @@ then
 fi
 
 
-cd $START_DIR/3rdParty
-if [[ ! -d pjwebsock ]]
-then
-    git clone https://github.com/jimying/pjwebsock
-    cd pjwebsock
-    #git checkout a0616ea27f01d5e3bdfd5b801fb1499473a0b0cb
-    git checkout ed8bfee79e26ef4e023bac1359301c201ee133af
-fi
+ensure_git_repo pjwebsock https://github.com/jimying/pjwebsock ed8bfee79e26ef4e023bac1359301c201ee133af
 
 
 #cd $START_DIR/3rdParty

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sip-lab",
-  "version": "1.40.0",
+  "version": "1.40.1",
   "description": "",
   "main": "index.js",
   "engines": {