Merge pull request #483 from drowe67/ms-codec2-1.2.0

Update for codec2 v1.2.0 release.
drowe67 · Jul 25, 2023 · 85b9672 · 85b9672
2 parents 82fa296 + 6fa4d50
commit 85b9672
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/USER_MANUAL.md b/USER_MANUAL.md
@@ -890,7 +890,9 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
 
 1. Bugfixes:
     * Fix bug preventing proper Options window sizing on Windows. (PR #478)
-2. Cleanup:
+2. Build system:
+    * Update Codec2 to v1.2.0. (PR #483)
+3. Cleanup:
     * Remove 2400B mode from the UI. (PR #479)
 
 ## V1.8.12 July 2023

diff --git a/build_linux.sh b/build_linux.sh
@@ -21,7 +21,7 @@ export CODEC2DIR=$FREEDVGUIDIR/codec2
 export LPCNETDIR=$FREEDVGUIDIR/LPCNet
 
 # change this when working on combined codec2/freedv-gui changes
-CODEC2_BRANCH=v1.1.1
+CODEC2_BRANCH=1.2.0
 LPCNET_BRANCH=v0.5
 
 # OK, build and test LPCNet
@@ -41,7 +41,7 @@ cd $FREEDVGUIDIR
 if [ ! -d codec2 ]; then
     git clone https://github.com/drowe67/codec2.git
 fi
-cd codec2 && git switch master && git pull && git checkout $CODEC2_BRANCH
+cd codec2 && git switch main && git pull && git checkout $CODEC2_BRANCH
 mkdir -p build_linux && cd build_linux && rm -Rf * && cmake -DLPCNET_BUILD_DIR=$LPCNETDIR/build_linux .. && make VERBOSE=1
 # sanity check test
 cd src

diff --git a/build_osx.sh b/build_osx.sh
@@ -8,8 +8,8 @@ export FREEDVGUIDIR=${PWD}
 export CODEC2DIR=$FREEDVGUIDIR/codec2
 export LPCNETDIR=$FREEDVGUIDIR/LPCNet
 export HAMLIBDIR=$FREEDVGUIDIR/hamlib
-export CODEC2_BRANCH=master
-export LPCNET_BRANCH=master
+export CODEC2_BRANCH=1.2.0
+export LPCNET_BRANCH=v0.5
 export UT_ENABLE=${UT_ENABLE:-0}
 
 # Prerequisite: build dylibbundler
@@ -35,7 +35,7 @@ cd $FREEDVGUIDIR
 if [ ! -d LPCNet ]; then
     git clone https://github.com/drowe67/LPCNet.git
 fi
-cd $LPCNETDIR && git checkout v0.5 && git pull && git checkout $LPCNET_BRANCH
+cd $LPCNETDIR && git checkout master && git pull && git checkout $LPCNET_BRANCH
 mkdir  -p build_osx && cd build_osx && rm -Rf *
 cmake -DBUILD_OSX_UNIVERSAL=1 ..
 make -j4
@@ -48,7 +48,7 @@ cd $FREEDVGUIDIR
 if [ ! -d codec2 ]; then
     git clone https://github.com/drowe67/codec2-new.git codec2
 fi
-cd codec2 && git checkout v1.1.1 && git pull && git checkout $CODEC2_BRANCH
+cd codec2 && git switch main && git pull && git checkout $CODEC2_BRANCH
 mkdir -p build_osx && cd build_osx && rm -Rf * && cmake -DLPCNET_BUILD_DIR=$LPCNETDIR/build_osx -DBUILD_OSX_UNIVERSAL=1 .. && make VERBOSE=1 -j4
 
 # sanity check test

diff --git a/build_windows.sh b/build_windows.sh
@@ -22,7 +22,7 @@ export FREEDVGUIDIR=${PWD}
 export CODEC2DIR=$FREEDVGUIDIR/codec2
 export LPCNETDIR=$FREEDVGUIDIR/LPCNet
 
-CODEC2_BRANCH=v1.1.1
+CODEC2_BRANCH=1.2.0
 LPCNET_BRANCH=v0.5
 
 # OK, build and test LPCNet
@@ -39,7 +39,7 @@ cd $FREEDVGUIDIR
 if [ ! -d codec2 ]; then
     git clone https://github.com/drowe67/codec2.git
 fi
-cd codec2 && git switch master && git pull && git checkout $CODEC2_BRANCH
+cd codec2 && git switch main && git pull && git checkout $CODEC2_BRANCH
 mkdir -p $BUILD_DIR && cd $BUILD_DIR && rm -Rf * && $CMAKE -DLPCNET_BUILD_DIR=$LPCNETDIR/$BUILD_DIR .. && make VERBOSE=1
 
 cd $FREEDVGUIDIR

diff --git a/cmake/BuildCodec2.cmake b/cmake/BuildCodec2.cmake
@@ -18,7 +18,7 @@ ExternalProject_Add(build_codec2
    SOURCE_DIR codec2_src
    BINARY_DIR codec2_build
    GIT_REPOSITORY https://github.com/drowe67/codec2.git
-   GIT_TAG v1.1.1
+   GIT_TAG 1.2.0
    CMAKE_ARGS ${CODEC2_CMAKE_ARGS}
    CMAKE_CACHE_ARGS -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
    INSTALL_COMMAND ""