From 60a7a6d51db36931a622cd49a401f00b6ce2930d Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sat, 13 Mar 2021 22:30:23 +0100
Subject: [PATCH] Update Armadillo and Protocol Buffers local versions

---
 CMakeLists.txt    |  4 ++--
 README.md         | 12 ++++++------
 docs/changelog.md |  3 +++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 604c9b47a..5e1c7e37d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -324,13 +324,13 @@ set(GNSSSDR_PROTOBUF_MIN_VERSION "3.0.0")
 ################################################################################
 set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2")
 set(GNSSSDR_GLOG_LOCAL_VERSION "0.4.0")
-set(GNSSSDR_ARMADILLO_LOCAL_VERSION "10.2.x")
+set(GNSSSDR_ARMADILLO_LOCAL_VERSION "10.3.x")
 set(GNSSSDR_GTEST_LOCAL_VERSION "1.10.0")
 set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master")
 set(GNSSSDR_GPSTK_LOCAL_VERSION "8.0.0")
 set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.19")
 set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.11.4")
-set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.15.5")
+set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.15.6")
 set(GNSSSDR_BENCHMARK_LOCAL_VERSION "1.5.2")
 set(GNSSSDR_MATHJAX_EXTERNAL_VERSION "2.7.7")
 
diff --git a/README.md b/README.md
index d0402a3c9..94fe9b7c6 100644
--- a/README.md
+++ b/README.md
@@ -292,9 +292,9 @@ $ sudo apt-get install libblas-dev liblapack-dev       # For Debian/Ubuntu/Linux
 $ sudo yum install lapack-devel blas-devel             # For Fedora/CentOS/RHEL
 $ sudo zypper install lapack-devel blas-devel          # For OpenSUSE
 $ sudo pacman -S blas lapack                           # For Arch Linux
-$ wget http://sourceforge.net/projects/arma/files/armadillo-10.2.1.tar.xz
-$ tar xvfz armadillo-10.2.1.tar.xz
-$ cd armadillo-10.2.1
+$ wget http://sourceforge.net/projects/arma/files/armadillo-10.3.0.tar.xz
+$ tar xvfz armadillo-10.3.0.tar.xz
+$ cd armadillo-10.3.0
 $ cmake .
 $ make
 $ sudo make install
@@ -395,9 +395,9 @@ $ sudo apt-get install autoconf automake libtool curl make g++ unzip
 and then:
 
 ```
-$ wget https://github.com/protocolbuffers/protobuf/releases/download/v3.15.5/protobuf-cpp-3.15.5.tar.gz
-$ tar xvfz protobuf-cpp-3.15.5.tar.gz
-$ cd protobuf-3.15.5
+$ wget https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protobuf-cpp-3.15.6.tar.gz
+$ tar xvfz protobuf-cpp-3.15.6.tar.gz
+$ cd protobuf-3.15.6
 $ ./autogen.sh
 $ ./configure
 $ make
diff --git a/docs/changelog.md b/docs/changelog.md
index 544575c3e..51afcdc85 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -64,6 +64,9 @@ SPDX-FileCopyrightText: 2011-2021 Carles Fernandez-Prades <carles.fernandez@cttc
   `carrier_phase_rads` parameter value.
 - The `Labsat_Signal_Source` implementation of the `SignalSource` block now can
   read files in the LabSat 3 Wideband format (`.LS3W`).
+- Replace `Receiver.sources_count` configuration parameter name by
+  `GNSS-SDR.num_sources`. The former parameter name is still read to ensure
+  backward compatibility with configuration files using that nomenclature.
 
 &nbsp;