build pjsip with bcg729

Author: weslleymurdock

.github/workflows/pjsua2.yml

@@ -29,7 +29,7 @@ jobs:
           brew install nasm autoconf automake libtool swig
           sudo mv /Applications/Xcode_15.1.app /Applications/Xcode.app
           sed -i'' -e 's/xamarin/maui/g' ${{ github.workspace }}/pjproject/pjsip-apps/src/swig/csharp/Makefile
-          ./build --ssl --opus --h264 -a=x86_64,arm64 --ci
+          ./build h264 opus ssl bcg729 -a=x86_64,arm64 --ci
       - uses: actions/upload-artifact@v3
         with:
           name: libpjsua2-ios

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
       run: |
         brew install nasm autoconf automake libtool swig
         sed -i'' -e 's/xamarin/maui/g' ${{ github.workspace }}/pjproject/pjsip-apps/src/swig/csharp/Makefile
-        ./build h264 opus ssl -a=x86_64,arm64 --ci
+        ./build h264 opus ssl bcg729 -a=x86_64,arm64 --ci
         tar -zcvf libpjsua2.tar.gz ./libpjsua2
     - name: release
       uses: actions/create-release@v1

build

@@ -205,22 +205,19 @@ function build_bcg729 () {
 
     for arch in ${USE_ARCHS[@]}
     do
-        echo "-- BCG729: Compiling $arch"
-        g729_extra_cflags="-arch $arch"
-        if [ "$arch" == "i386" ] || [ "$arch" == "x86_64" ]; then
+        echo "-- BCG729: Compiling $arch" 
+        if [ "$arch" == "x86_64" ]; then
             os_platform="iPhoneSimulator" 
+            mkdir -p "${os_platform}${IOS_SDK_VERSION}-${arch}.sdk"        
+            cmake . -DCMAKE_INSTALL_PREFIX="${os_platform}${IOS_SDK_VERSION}-${arch}.sdk" -DCMAKE_SKIP_INSTALL_RPATH=ON
+            make C_FLAGS="$C_FLAGS -O2 -m64 -miphoneos-version-min=${MIN_IOS_VERSION} -isysroot ${xcode_dev_path}/Platforms/${os_platform}.platform/Developer/SDKs/${os_platform}.sdk -march=x86-64" || exit  
+
         else
-            os_platform="iPhoneOS" 
+            os_platform="iPhoneOS"  
+            mkdir -p "${os_platform}${IOS_SDK_VERSION}-${arch}.sdk"            
+            cmake . -DCMAKE_INSTALL_PREFIX="${os_platform}${IOS_SDK_VERSION}-${arch}.sdk" -DCMAKE_SKIP_INSTALL_RPATH=ON
+            make C_FLAGS="$C_FLAGS -fPIE -miphoneos-version-min=${MIN_IOS_VERSION} -isysroot ${xcode_dev_path}/Platforms/${os_platform}.platform/Developer/SDKs/${os_platform}.sdk -march=${arch}" || exit  
         fi
-
-        sed -i'' -e 's/dd_definitions("-Wall")/dd_definitions("-Wall -march=${arch}")/g' CMakeLists.txt
-
-        mkdir -p "${$BCG729_BUILD_DIR}/${os_platform}${IOS_SDK_VERSION}-${arch}.sdk"
-
-        cmake . -DCMAKE_INSTALL_PREFIX="${$BCG729_BUILD_DIR}/${os_platform}${IOS_SDK_VERSION}-${arch}.sdk" -DCMAKE_SKIP_INSTALL_RPATH=ON
-
-        make CFLAGS="$CFLAGS ${opus_opt_cflags} -fPIE -miphoneos-version-min=${MIN_IOS_VERSION} -isysroot ${xcode_dev_path}/Platforms/${os_platform}.platform/Developer/SDKs/${os_platform}.sdk -march=${arch}" || exit  
-
         make install 
     done
 
@@ -315,7 +312,7 @@ function build_opus () {
         return
     fi
 
-    opus_version="1.3.1"
+    opus_version="1.4"
     opus_opt_cflags="-Ofast -flto -g"
     opus_opt_ldflags="-flto"
     opus_opt_config_args=""
@@ -442,6 +439,10 @@ function config_site () {
         echo "#define PJMEDIA_HAS_OPUS_CODEC 1" >> "$PJSIP_CONFIG_SITE_H"
     fi
 
+    if [ $BCG729_SUPPORT = true ]; then
+        echo "#define PJMEDIA_HAS_BCG729 1" >> "$PJSIP_CONFIG_SITE_H"
+    fi
+
     while IFS=',' read -ra CONFIG_SITE_OPTION; do
         for i in "${CONFIG_SITE_OPTION[@]}"; do
             echo "#define $i" >> $PJSIP_CONFIG_SITE_H
@@ -521,13 +522,13 @@ function _build () {
 
     if [ $BCG729_SUPPORT = true ]; then
         if [ "$arch" != "i386" ] && [ "$arch" != "x86_64" ]; then
-            configure="$configure --with-bcg729=${BCG729_BUILD_DIR}/"
-            export CFLAGS="${CFLAGS} -I${BCG729_BUILD_DIR}/include/bcg729"
+            configure="$configure --with-bcg729=${BCG729_BUILD_DIR}/iPhoneOS${IOS_SDK_VERSION}-${arch}.sdk"
+            export CFLAGS="${CFLAGS} -I${BCG729_BUILD_DIR}/iPhoneOS${IOS_SDK_VERSION}-${arch}.sdk/include/bcg729"
             export LDFLAGS="${LDFLAGS} -L${BCG729_BUILD_DIR}/iPhoneOS${IOS_SDK_VERSION}-${arch}.sdk/lib"
         else
-            configure="$configure --with-bcg729=${SSL_BUILD_DIR}/"
-            export CFLAGS="${CFLAGS} -I${SSL_BUILD_DIR}/include/bcg729"
-            export LDFLAGS="${LDFLAGS} -L${SSL_BUILD_DIR}/iPhoneSimulator${IOS_SDK_VERSION}-${arch}.sdk/lib"
+            configure="$configure --with-bcg729=${BCG729_BUILD_DIR}/iPhoneSimulator${IOS_SDK_VERSION}-${arch}.sdk"
+            export CFLAGS="${CFLAGS} -I${BCG729_BUILD_DIR}/iPhoneSimulator${IOS_SDK_VERSION}-${arch}.sdk/include/bcg729"
+            export LDFLAGS="${LDFLAGS} -L${BCG729_BUILD_DIR}/iPhoneSimulator${IOS_SDK_VERSION}-${arch}.sdk/lib"
         fi
     fi
 
@@ -571,9 +572,11 @@ function _build () {
 
     ARCH="-arch $arch " $configure #>> $arch_log 2>&1 || exit
     echo "make dep"
-    make dep >> $arch_log 2>&1 || exit
+    make dep >> $arch_log 2>&1 &
+            spinner $! || exit
     echo "make " 
-    make >> $arch_log 2>&1 || exit
+    make >> $arch_log 2>&1 &
+            spinner $! || exit
 
     if [ $SSL_SUPPORT = true ]; then
         if [ $ENABLE_ZRTP = true ]; then
@@ -590,8 +593,12 @@ function _build () {
     #TODO: fix libs not found on runner path because they are in temp
     echo "Making swig "
     cd "$PJSIP_SRC_DIR/pjsip-apps/src/swig"
-    make clean
-    make
+    make clean >> $arch_log 2>&1 &
+            spinner $! || exit
+
+    make >> $arch_log 2>&1 &
+            spinner $! || exit
+
 
     echo "Done building for $arch"
     echo "============================="