From d56e9104ace266879beb18a8f321c1cc1a38c426 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Tue, 17 Mar 2020 16:49:38 +0100
Subject: [PATCH] Update to last version

---
 CMakeLists.txt                    | 5 ++---
 build_all_linux.sh                | 1 +
 build_all_macos.sh                | 1 +
 linphone-sdk                      | 2 +-
 src/components/chat/ChatModel.cpp | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 374c7e780..3ee774410 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,11 +72,10 @@ option(ENABLE_TOOLS "Enable tools of SDK" NO)
 option(ENABLE_STRICT "Build with strict compilator flags e.g. -Wall -Werror" NO)
 
 option(ENABLE_FFMPEG "Build mediastreamer2 with ffmpeg video support." YES)
+option(ENABLE_OPUS "Build mediastreamer2 with the OPUS codec." YES)
 
 if(WIN32 OR APPLE)
-    option(ENABLE_OPUS "Build mediastreamer2 with the OPUS codec." YES)
-else()##Opus crash on Linux. The version for 4.3 is old. We have to use a switch in configuration to select the newest version for desktop.
-    option(ENABLE_OPUS "Build mediastreamer2 with the OPUS codec." NO)
+else()
     option(ENABLE_V4L "Ability to capture and display video using libv4l2 or libv4l." YES)
 endif()
 
diff --git a/build_all_linux.sh b/build_all_linux.sh
index bcd7eb351..148e37883 100755
--- a/build_all_linux.sh
+++ b/build_all_linux.sh
@@ -33,6 +33,7 @@ if [[ -z ${Qt5_DIR} ]]; then
 fi
 
 #Creation of folders
+rm -rf build-desktop
 mkdir -p build-desktop
 #Opus crash on Linux. The version for 4.3 is old. We have to use a switch in configuration to select the newest version for desktop.
 #SDK building
diff --git a/build_all_macos.sh b/build_all_macos.sh
index 95c31a790..0bc694d21 100755
--- a/build_all_macos.sh
+++ b/build_all_macos.sh
@@ -32,6 +32,7 @@ if [[ -z ${Qt5_DIR} ]]; then
 fi
 
 #Creation of folders
+rm -rf build-desktop
 mkdir -p build-desktop
 cd build-desktop
 
diff --git a/linphone-sdk b/linphone-sdk
index 5ab4ceb1d..760b36867 160000
--- a/linphone-sdk
+++ b/linphone-sdk
@@ -1 +1 @@
-Subproject commit 5ab4ceb1dee6e0670b3385c10ecd9a8575b5529e
+Subproject commit 760b36867d8200461220d21bbd6e844a21e554dc
diff --git a/src/components/chat/ChatModel.cpp b/src/components/chat/ChatModel.cpp
index f468edcfb..7c9553eae 100644
--- a/src/components/chat/ChatModel.cpp
+++ b/src/components/chat/ChatModel.cpp
@@ -247,7 +247,7 @@ private:
 
   shared_ptr<linphone::Buffer> onFileTransferSend (
     const shared_ptr<linphone::ChatMessage> &,
-    const shared_ptr<const linphone::Content> &,
+    const shared_ptr<linphone::Content> &,
     size_t,
     size_t
   ) override {
@@ -257,7 +257,7 @@ private:
 
   void onFileTransferProgressIndication (
     const shared_ptr<linphone::ChatMessage> &message,
-    const shared_ptr<const linphone::Content> &,
+    const shared_ptr<linphone::Content> &,
     size_t offset,
     size_t
   ) override {