Merge pull request #259 from drowe67/ms-rel-182

Performs final updates to versioning and build dependencies for 1.8.2.
drowe67 · Jul 19, 2022 · b9afda8 · b9afda8
2 parents b4f5f1c + ddc74fd
commit b9afda8
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -50,7 +50,7 @@ message(STATUS "Compilation date = XX${DATE_RESULT}XX")
 set(FREEDV_VERSION_MAJOR 1)
 set(FREEDV_VERSION_MINOR 8)
 set(FREEDV_VERSION_PATCH 2)
-set(FREEDV_VERSION_SUFFIX "devel")
+set(FREEDV_VERSION_SUFFIX "")
 
 set(FREEDV_VERSION ${FREEDV_VERSION_MAJOR}.${FREEDV_VERSION_MINOR}.${FREEDV_VERSION_PATCH})
 if(FREEDV_VERSION_SUFFIX)
@@ -589,9 +589,9 @@ elseif(UNIX AND NOT APPLE)
  SET(CPACK_GENERATOR "DEB")
  SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Mooneer Salem <mooneer@gmail.com>") #required
  if(USE_PULSEAUDIO)
- SET(CPACK_DEBIAN_PACKAGE_DEPENDS "codec2 (>= 1.0.0), lpcnet (>= 0.3.0), libspeexdsp1 (>= 1.2~rc1.2-1+b2), libsamplerate0 (>= 0.1.9-2), libwxgtk3.0-gtk3-0v5 (>= 3.0.4+dfsg-3), libpulse0 (>= 14.2-2), libhamlib2 (>= 3.3-10build1), libasound2 (>= 1.1.8-1), libao4 (>= 1.2.2+20180113-1), libgsm1 (>= 1.0.18-2), libsndfile1 (>= 1.0.28-6)")
+ SET(CPACK_DEBIAN_PACKAGE_DEPENDS "codec2 (>= 1.0.5), lpcnet (>= 0.3.0), libspeexdsp1 (>= 1.2~rc1.2-1+b2), libsamplerate0 (>= 0.1.9-2), libwxgtk3.0-gtk3-0v5 (>= 3.0.4+dfsg-3), libpulse0 (>= 14.2-2), libhamlib2 (>= 3.3-10build1), libasound2 (>= 1.1.8-1), libao4 (>= 1.2.2+20180113-1), libgsm1 (>= 1.0.18-2), libsndfile1 (>= 1.0.28-6)")
  else(USE_PULSEAUDIO)
- SET(CPACK_DEBIAN_PACKAGE_DEPENDS "codec2 (>= 1.0.0), lpcnet (>= 0.3.0), libspeexdsp1 (>= 1.2~rc1.2-1+b2), libsamplerate0 (>= 0.1.9-2), libwxgtk3.0-gtk3-0v5 (>= 3.0.4+dfsg-3), libportaudio2 (>= 19.6.0-1build1), libhamlib2 (>= 3.3-10build1), libasound2 (>= 1.1.8-1), libao4 (>= 1.2.2+20180113-1), libgsm1 (>= 1.0.18-2), libsndfile1 (>= 1.0.28-6)")
+ SET(CPACK_DEBIAN_PACKAGE_DEPENDS "codec2 (>= 1.0.5), lpcnet (>= 0.3.0), libspeexdsp1 (>= 1.2~rc1.2-1+b2), libsamplerate0 (>= 0.1.9-2), libwxgtk3.0-gtk3-0v5 (>= 3.0.4+dfsg-3), libportaudio2 (>= 19.6.0-1build1), libhamlib2 (>= 3.3-10build1), libasound2 (>= 1.1.8-1), libao4 (>= 1.2.2+20180113-1), libgsm1 (>= 1.0.18-2), libsndfile1 (>= 1.0.28-6)")
  endif(USE_PULSEAUDIO)
 
  SET(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)

diff --git a/USER_MANUAL.html b/USER_MANUAL.html
@@ -586,6 +586,10 @@ <h2 id="v1.8.2-july-2022"><span class="header-section-number">16.1</span> V1.8.2
 <ul>
 <li>Increase plot buffer size to resolve issues with “To Spkr/Headphones” tab (PR #258)</li>
 </ul></li>
+<li>Build system:
+<ul>
+<li>Depend on Codec2 1.0.5. (PR #259)</li>
+</ul></li>
 </ol>
 <h2 id="v1.8.1-july-2022"><span class="header-section-number">16.2</span> V1.8.1 July 2022</h2>
 <ol type="1">

diff --git a/USER_MANUAL.md b/USER_MANUAL.md
@@ -797,7 +797,9 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
  * Save rig names instead of IDs to prevent Hamlib off by one issues. (PR #256)
 2. Bugfixes:
  * Increase plot buffer size to resolve issues with "To Spkr/Headphones" tab (PR #258)
-
+3. Build system:
+ * Depend on Codec2 1.0.5. (PR #259)
+
 ## V1.8.1 July 2022
 
 1. Bugfixes:

diff --git a/USER_MANUAL.pdf b/USER_MANUAL.pdf
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.0.4_rc2
+CODEC2_BRANCH=v1.0.5
 LPCNET_BRANCH=v0.3
 
 # First build and install vanilla codec2 as we need -lcodec2 to build LPCNet

diff --git a/build_osx.sh b/build_osx.sh
@@ -8,7 +8,7 @@ export FREEDVGUIDIR=${PWD}
 export CODEC2DIR=$FREEDVGUIDIR/codec2
 export LPCNETDIR=$FREEDVGUIDIR/LPCNet
 export HAMLIBDIR=$FREEDVGUIDIR/hamlib
-export CODEC2_BRANCH=v1.0.4_rc2
+export CODEC2_BRANCH=v1.0.5
 export LPCNET_BRANCH=v0.3
 export UT_ENABLE=${UT_ENABLE:-0}
 

diff --git a/build_windows.sh b/build_windows.sh
@@ -20,7 +20,7 @@ export FREEDVGUIDIR=${PWD}
 export CODEC2DIR=$FREEDVGUIDIR/codec2
 export LPCNETDIR=$FREEDVGUIDIR/LPCNet
 
-CODEC2_BRANCH=v1.0.4_rc2
+CODEC2_BRANCH=v1.0.5
 LPCNET_BRANCH=v0.3
 
 # First build and install vanilla codec2 as we need -lcodec2 to build LPCNet