Adding linphone-sdk. Adding patches per module. Compiling in chroot.

8 files changed, 209 insertions, 685 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ebe92bb269f..3901343e1632 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linphone-desktop-all-git
 	pkgdesc = A free VoIP and video softphone based on the SIP protocol (Installed in /opt with all deps included).
-	pkgver = 4.1.1.r620.e8956256
+	pkgver = 4.1.1.r627.d8d0a99f
 	pkgrel = 1
 	url = https://www.linphone.org/
 	arch = x86_64
@@ -20,17 +20,18 @@ pkgbase = linphone-desktop-all-git
 	depends = qt5-tools
 	conflicts = linphone-desktop
 	source = linphone-desktop::git+https://gitlab.linphone.org/BC/public/linphone-desktop.git
+	source = linphone-sdk::git+https://gitlab.linphone.org/BC/public/linphone-sdk.git
 	source = bcg729::git+https://gitlab.linphone.org/BC/public/bcg729.git
 	source = bcmatroska2::git+https://gitlab.linphone.org/BC/public/bcmatroska2.git
 	source = bctoolbox::git+https://gitlab.linphone.org/BC/public/bctoolbox.git
 	source = bcunit::git+https://gitlab.linphone.org/BC/public/bcunit.git
 	source = belcard::git+https://gitlab.linphone.org/BC/public/belcard.git
-	source = belle-msrp::git+https://gitlab.linphone.org/BC/public/belle-msrp.git
 	source = belle-sip::git+https://gitlab.linphone.org/BC/public/belle-sip.git
 	source = belr::git+https://gitlab.linphone.org/BC/public/belr.git
 	source = bzrtp::git+https://gitlab.linphone.org/BC/public/bzrtp.git
-	source = cmake-builder::git+https://gitlab.linphone.org/BC/public/linphone-cmake-builder.git
 	source = bv16-floatingpoint::git+https://gitlab.linphone.org/BC/public/external/bv16-floatingpoint.git
+	source = codec2::git+https://gitlab.linphone.org/BC/public/external/codec2.git
+	source = decaf::git+https://gitlab.linphone.org/BC/public/external/decaf.git
 	source = ffmpeg::git+https://gitlab.linphone.org/BC/public/external/ffmpeg.git
 	source = gsm::git+https://gitlab.linphone.org/BC/public/external/gsm.git
 	source = libjpeg-turbo::git+https://gitlab.linphone.org/BC/public/external/libjpeg-turbo.git
@@ -39,27 +40,41 @@ pkgbase = linphone-desktop-all-git
 	source = libxsd::git+https://gitlab.linphone.org/BC/public/external/libxsd.git
 	source = mbedtls::git+https://gitlab.linphone.org/BC/public/external/mbedtls.git
 	source = minizip::git+https://gitlab.linphone.org/BC/public/external/minizip.git
+	source = opencore-amr::git+https://gitlab.linphone.org/BC/public/external/opencore-amr.git
 	source = openh264::git+https://gitlab.linphone.org/BC/public/external/openh264.git
 	source = opus::git+https://gitlab.linphone.org/BC/public/external/opus.git
 	source = soci::git+https://gitlab.linphone.org/BC/public/external/soci.git
 	source = speex::git+https://gitlab.linphone.org/BC/public/external/speex.git
 	source = sqlite3::git+https://gitlab.linphone.org/BC/public/external/sqlite3.git
 	source = srtp::git+https://gitlab.linphone.org/BC/public/external/srtp.git
-	source = v4l-utils::git+https://gitlab.linphone.org/BC/public/external/v4l-utils.git
+	source = vo-amrwbenc::git+https://gitlab.linphone.org/BC/public/external/vo-amrwbenc.git
 	source = xerces-c::git+https://gitlab.linphone.org/BC/public/external/xerces-c.git
 	source = zlib::git+https://gitlab.linphone.org/BC/public/external/zlib.git
+	source = zxing-cpp::git+https://gitlab.linphone.org/BC/public/external/zxing-cpp.git
+	source = lime::git+https://gitlab.linphone.org/BC/public/lime.git
+	source = linphone-cmake-builder::git+https://gitlab.linphone.org/BC/public/linphone-cmake-builder.git
+	source = linphone-sdk::git+https://gitlab.linphone.org/BC/public/linphone-sdk.git
 	source = linphone::git+https://gitlab.linphone.org/BC/public/linphone.git
 	source = mediastreamer2::git+https://gitlab.linphone.org/BC/public/mediastreamer2.git
 	source = msamr::git+https://gitlab.linphone.org/BC/public/msamr.git
+	source = mscodec2::git+https://gitlab.linphone.org/BC/public/mscodec2.git
 	source = msopenh264::git+https://gitlab.linphone.org/BC/public/msopenh264.git
 	source = mssilk::git+https://gitlab.linphone.org/BC/public/mssilk.git
 	source = mswasapi::git+https://gitlab.linphone.org/BC/public/mswasapi.git
 	source = mswebrtc::git+https://gitlab.linphone.org/BC/public/mswebrtc.git
-	source = msx264::git+https://gitlab.linphone.org/BC/public/msx264.git
 	source = ortp::git+https://gitlab.linphone.org/BC/public/ortp.git
 	source = webrtc::git+https://gitlab.linphone.org/BC/public/external/webrtc.git
 	source = linphone.desktop
-	source = linphone-desktop-submodules.patch
+	source = linphone-desktop.patch
+	source = linphone.patch
+	source = vo-amrwbenc.patch
+	source = soci.patch
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -100,7 +115,10 @@ pkgbase = linphone-desktop-all-git
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = 346d983f503873811b3a4f72772e5afe4990275526c9e15c1b5cde2ad69a0544
-	sha256sums = bc5fdb3111e0eb7fc1fc72aa71bfcc33adf4c66995bdd09fb1cf6b8340fcfe1a
+	sha256sums = e7574cdb0a5f8d334b1ed1d938fd6c7639e5785b80f01d39e81a682595af4171
+	sha256sums = 2d174bd6b3d55fc9140b5a94a60bfb0274d0853e780ff0269125bcc6fd501922
+	sha256sums = eb7f7dcf3a7f3b44ae9f73f5d4cfeb04056b8ad8892a24ef589b894856176db7
+	sha256sums = d2ade50e81835b005fa0f49cdb240943070175bc7a9f802b9be91c80ee29c78d
 
 pkgname = linphone-desktop-all-git
 
diff --git a/.gitignore b/.gitignore
index 0c52bcfb28e4..4f4db536fb3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,32 +1,38 @@
 linphone-desktop-all-git-*.pkg.tar.xz
+linphone-desktop-all-git-*.log
+PKGBUILD-namcap.log
 bcg729/
 bcmatroska2/
 bctoolbox/
 bcunit/
 belcard/
-belle-msrp/
 belle-sip/
 belr/
 bv16-floatingpoint/
 bzrtp/
-cmake-builder/
+codec2/
+decaf/
 ffmpeg/
 gsm/
 libjpeg-turbo/
 libvpx/
 libxml2/
 libxsd/
-linphone/
+lime/
+linphone-cmake-builder/
 linphone-desktop/
+linphone-sdk/
+linphone/
 mbedtls/
 mediastreamer2/
 minizip/
 msamr/
+mscodec2/
 msopenh264/
 mssilk/
 mswasapi/
 mswebrtc/
-msx264/
+opencore-amr/
 openh264/
 opus/
 ortp/
@@ -36,7 +42,8 @@ speex/
 sqlite3/
 src/
 srtp/
-v4l-utils/
-xerces-c/
+vo-amrwbenc/
 webrtc/
+xerces-c/
 zlib/
+zxing-cpp/
diff --git a/PKGBUILD b/PKGBUILD
index 6adc6663a698..0afa44f956c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,124 +1,150 @@
 # Maintainer: Fredy García <frealgagu at gmail dot com>
 
 pkgname=linphone-desktop-all-git
-pkgver=4.1.1.r620.e8956256
+pkgver=4.1.1.r627.d8d0a99f
 pkgrel=1
 pkgdesc="A free VoIP and video softphone based on the SIP protocol (Installed in /opt with all deps included)."
 arch=("x86_64")
 url="https://www.${pkgname%-desktop-all-git}.org/"
 license=("GPL2")
-depends=("qt5-graphicaleffects" "qt5-quickcontrols" "qt5-quickcontrols2" "qt5-svg" "qt5-tools")
-makedepends=("cmake" "doxygen" "git" "graphviz" "ladspa" "nasm" "python-pystache" "yasm")
+depends=("alsa-utils" "glew" "qt5-graphicaleffects" "qt5-quickcontrols" "qt5-quickcontrols2" "qt5-svg" "qt5-tools" "v4l-utils")
+makedepends=("cmake" "doxygen" "git" "graphviz" "ladspa" "libbsd" "nasm" "python-pystache" "yasm")
 conflicts=("${pkgname%-all-git}")
 source=("${pkgname%-all-git}::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/${pkgname%-all-git}.git"
-        "bcg729::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/bcg729.git"
-        "bcmatroska2::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/bcmatroska2.git"
-        "bctoolbox::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/bctoolbox.git"
-        "bcunit::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/bcunit.git"
-        "belcard::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/belcard.git"
-        "belle-msrp::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/belle-msrp.git"
-        "belle-sip::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/belle-sip.git"
-        "belr::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/belr.git"
-        "bzrtp::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/bzrtp.git"
-        "cmake-builder::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/${pkgname%-desktop-all-git}-cmake-builder.git"
-        "bv16-floatingpoint::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/bv16-floatingpoint.git"
-        "ffmpeg::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/ffmpeg.git"
-        "gsm::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/gsm.git"
-        "libjpeg-turbo::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/libjpeg-turbo.git"
-        "libvpx::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/libvpx.git"
-        "libxml2::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/libxml2.git"
-        "libxsd::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/libxsd.git"
-        "mbedtls::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/mbedtls.git"
-        "minizip::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/minizip.git"
-        "openh264::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/openh264.git"
-        "opus::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/opus.git"
-        "soci::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/soci.git"
-        "speex::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/speex.git"
-        "sqlite3::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/sqlite3.git"
-        "srtp::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/srtp.git"
-        "v4l-utils::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/v4l-utils.git"
-        "xerces-c::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/xerces-c.git"
-        "zlib::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/zlib.git"
-        "${pkgname%-desktop-all-git}::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/${pkgname%-desktop-all-git}.git"
-        "mediastreamer2::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/mediastreamer2.git"
-        "msamr::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/msamr.git"
-        "msopenh264::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/msopenh264.git"
-        "mssilk::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/mssilk.git"
-        "mswasapi::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/mswasapi.git"
-        "mswebrtc::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/mswebrtc.git"
-        "msx264::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/msx264.git"
-        "ortp::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/ortp.git"
+        "${pkgname%-desktop-all-git}-sdk::git+https://gitlab.linphone.org/BC/public/${pkgname%-desktop-all-git}-sdk.git"
+        "bcg729::git+https://gitlab.linphone.org/BC/public/bcg729.git"
+        "bcmatroska2::git+https://gitlab.linphone.org/BC/public/bcmatroska2.git"
+        "bctoolbox::git+https://gitlab.linphone.org/BC/public/bctoolbox.git"
+        "bcunit::git+https://gitlab.linphone.org/BC/public/bcunit.git"
+        "belcard::git+https://gitlab.linphone.org/BC/public/belcard.git"
+        "belle-sip::git+https://gitlab.linphone.org/BC/public/belle-sip.git"
+        "belr::git+https://gitlab.linphone.org/BC/public/belr.git"
+        "bzrtp::git+https://gitlab.linphone.org/BC/public/bzrtp.git"
+        "bv16-floatingpoint::git+https://gitlab.linphone.org/BC/public/external/bv16-floatingpoint.git"
+        "codec2::git+https://gitlab.linphone.org/BC/public/external/codec2.git"
+        "decaf::git+https://gitlab.linphone.org/BC/public/external/decaf.git"
+        "ffmpeg::git+https://gitlab.linphone.org/BC/public/external/ffmpeg.git"
+        "gsm::git+https://gitlab.linphone.org/BC/public/external/gsm.git"
+        "libjpeg-turbo::git+https://gitlab.linphone.org/BC/public/external/libjpeg-turbo.git"
+        "libvpx::git+https://gitlab.linphone.org/BC/public/external/libvpx.git"
+        "libxml2::git+https://gitlab.linphone.org/BC/public/external/libxml2.git"
+        "libxsd::git+https://gitlab.linphone.org/BC/public/external/libxsd.git"
+        "mbedtls::git+https://gitlab.linphone.org/BC/public/external/mbedtls.git"
+        "minizip::git+https://gitlab.linphone.org/BC/public/external/minizip.git"
+        "opencore-amr::git+https://gitlab.linphone.org/BC/public/external/opencore-amr.git"
+        "openh264::git+https://gitlab.linphone.org/BC/public/external/openh264.git"
+        "opus::git+https://gitlab.linphone.org/BC/public/external/opus.git"
+        "soci::git+https://gitlab.linphone.org/BC/public/external/soci.git"
+        "speex::git+https://gitlab.linphone.org/BC/public/external/speex.git"
+        "sqlite3::git+https://gitlab.linphone.org/BC/public/external/sqlite3.git"
+        "srtp::git+https://gitlab.linphone.org/BC/public/external/srtp.git"
+        "vo-amrwbenc::git+https://gitlab.linphone.org/BC/public/external/vo-amrwbenc.git"
+        "xerces-c::git+https://gitlab.linphone.org/BC/public/external/xerces-c.git"
+        "zlib::git+https://gitlab.linphone.org/BC/public/external/zlib.git"
+        "zxing-cpp::git+https://gitlab.linphone.org/BC/public/external/zxing-cpp.git"
+        "lime::git+https://gitlab.linphone.org/BC/public/lime.git"
+        "linphone-cmake-builder::git+https://gitlab.linphone.org/BC/public/linphone-cmake-builder.git"
+        "linphone-sdk::git+https://gitlab.linphone.org/BC/public/linphone-sdk.git"
+        "linphone::git+https://gitlab.linphone.org/BC/public/linphone.git"
+        "mediastreamer2::git+https://gitlab.linphone.org/BC/public/mediastreamer2.git"
+        "msamr::git+https://gitlab.linphone.org/BC/public/msamr.git"
+        "mscodec2::git+https://gitlab.linphone.org/BC/public/mscodec2.git"
+        "msopenh264::git+https://gitlab.linphone.org/BC/public/msopenh264.git"
+        "mssilk::git+https://gitlab.linphone.org/BC/public/mssilk.git"
+        "mswasapi::git+https://gitlab.linphone.org/BC/public/mswasapi.git"
+        "mswebrtc::git+https://gitlab.linphone.org/BC/public/mswebrtc.git"
+        "ortp::git+https://gitlab.linphone.org/BC/public/ortp.git"
         "webrtc::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/webrtc.git"
         "${pkgname%-desktop-all-git}.desktop"
-        "${pkgname%-all-git}-submodules.patch")
-sha256sums=("SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP"
-            "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP"
-            "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" 
+        "${pkgname%-all-git}.patch"
+        "${pkgname%-desktop-all-git}.patch"
+        "vo-amrwbenc.patch"
+        "soci.patch")
+sha256sums=("SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP"
+            "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP"
+            "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP"
             "346d983f503873811b3a4f72772e5afe4990275526c9e15c1b5cde2ad69a0544"
-            "bc5fdb3111e0eb7fc1fc72aa71bfcc33adf4c66995bdd09fb1cf6b8340fcfe1a")
+            "e7574cdb0a5f8d334b1ed1d938fd6c7639e5785b80f01d39e81a682595af4171"
+            "2d174bd6b3d55fc9140b5a94a60bfb0274d0853e780ff0269125bcc6fd501922"
+            "eb7f7dcf3a7f3b44ae9f73f5d4cfeb04056b8ad8892a24ef589b894856176db7"
+            "d2ade50e81835b005fa0f49cdb240943070175bc7a9f802b9be91c80ee29c78d")
 
 prepare() {
   cd "${srcdir}/${pkgname%-all-git}"
 
   git submodule init
-  git config submodule.submodules/bcg729.url "${srcdir}/bcg729"
-  git config submodule.submodules/bcmatroska2.url "${srcdir}/bcmatroska2"
-  git config submodule.submodules/bctoolbox.url "${srcdir}/bctoolbox"
-  git config submodule.submodules/bcunit.url "${srcdir}/bcunit"
-  git config submodule.submodules/belcard.url "${srcdir}/belcard"
-  git config submodule.submodules/belle-msrp.url "${srcdir}/belle-msrp"
-  git config submodule.submodules/belle-sip.url "${srcdir}/belle-sip"
-  git config submodule.submodules/belr.url "${srcdir}/belr"
-  git config submodule.submodules/bzrtp.url "${srcdir}/bzrtp"
-  git config submodule.submodules/cmake-builder.url "${srcdir}/cmake-builder"
-  git config submodule.submodules/externals/bv16-floatingpoint.url "${srcdir}/bv16-floatingpoint"
-  git config submodule.submodules/externals/ffmpeg.url "${srcdir}/ffmpeg"
-  git config submodule.submodules/externals/gsm.url "${srcdir}/gsm"
-  git config submodule.submodules/externals/libjpeg-turbo.url "${srcdir}/libjpeg-turbo"
-  git config submodule.submodules/externals/libvpx.url "${srcdir}/libvpx"
-  git config submodule.submodules/externals/libxml2.url "${srcdir}/libxml2"
-  git config submodule.submodules/externals/libxsd.url "${srcdir}/libxsd"
-  git config submodule.submodules/externals/mbedtls.url "${srcdir}/mbedtls"
   git config submodule.submodules/externals/minizip.url "${srcdir}/minizip"
-  git config submodule.submodules/externals/openh264.url "${srcdir}/openh264"
-  git config submodule.submodules/externals/opus.url "${srcdir}/opus"
-  git config submodule.submodules/externals/soci.url "${srcdir}/soci"
-  git config submodule.submodules/externals/speex.url "${srcdir}/speex"
-  git config submodule.submodules/externals/sqlite3.url "${srcdir}/sqlite3"
-  git config submodule.submodules/externals/srtp.url "${srcdir}/srtp"
-  git config submodule.submodules/externals/v4l-utils.url "${srcdir}/v4l-utils"
-  git config submodule.submodules/externals/xerces-c.url "${srcdir}/xerces-c"
-  git config submodule.submodules/externals/zlib.url "${srcdir}/zlib"
-  git config submodule.submodules/${pkgname%-desktop-all-git}.url "${srcdir}/${pkgname%-desktop-all-git}"
-  git config submodule.submodules/mediastreamer2.url "${srcdir}/mediastreamer2"
-  git config submodule.submodules/msamr.url "${srcdir}/msamr"
-  git config submodule.submodules/msopenh264.url "${srcdir}/msopenh264"
-  git config submodule.submodules/mssilk.url "${srcdir}/mssilk"
-  git config submodule.submodules/mswasapi.url "${srcdir}/mswasapi"
-  git config submodule.submodules/mswebrtc.url "${srcdir}/mswebrtc"
-  git config submodule.submodules/msx264.url "${srcdir}/msx264"
-  git config submodule.submodules/ortp.url "${srcdir}/ortp"
+  git config submodule.${pkgname%-desktop-all-git}-sdk.url "${srcdir}/${pkgname%-desktop-all-git}-sdk"
   git submodule update --init
-  
-  cd "${srcdir}/${pkgname%-all-git}/submodules/mswebrtc"
+  patch -Np1 -i "${srcdir}/${pkgname%-all-git}.patch"
+
+  cd "${srcdir}/${pkgname%-all-git}/${pkgname%-desktop-all-git}-sdk"
+
+  git config submodule.bcg729.url "${srcdir}/bcg729"
+  git config submodule.bcmatroska2.url "${srcdir}/bcmatroska2"
+  git config submodule.bctoolbox.url "${srcdir}/bctoolbox"
+  git config submodule.bcunit.url "${srcdir}/bcunit"
+  git config submodule.belcard.url "${srcdir}/belcard"
+  git config submodule.belle-sip.url "${srcdir}/belle-sip"
+  git config submodule.belr.url "${srcdir}/belr"
+  git config submodule.bzrtp.url "${srcdir}/bzrtp"
+  git config submodule.external/bv16-floatingpoint.url "${srcdir}/bv16-floatingpoint"
+  git config submodule.external/codec2.url "${srcdir}/codec2"
+  git config submodule.external/decaf.url "${srcdir}/decaf"
+  git config submodule.external/ffmpeg.url "${srcdir}/ffmpeg"
+  git config submodule.external/gsm.url "${srcdir}/gsm"
+  git config submodule.external/libjpeg-turbo.url "${srcdir}/libjpeg-turbo"
+  git config submodule.external/libvpx.url "${srcdir}/libvpx"
+  git config submodule.external/libxml2.url "${srcdir}/libxml2"
+  git config submodule.external/libxsd.url "${srcdir}/libxsd"
+  git config submodule.external/mbedtls.url "${srcdir}/mbedtls"
+  git config submodule.external/opencore-amr.url "${srcdir}/opencore-amr"
+  git config submodule.external/openh264.url "${srcdir}/openh264"
+  git config submodule.external/opus.url "${srcdir}/opus"
+  git config submodule.external/soci.url "${srcdir}/soci"
+  git config submodule.external/speex.url "${srcdir}/speex"
+  git config submodule.external/sqlite3.url "${srcdir}/sqlite3"
+  git config submodule.external/srtp.url "${srcdir}/srtp"
+  git config submodule.external/vo-amrwbenc.url "${srcdir}/vo-amrwbenc"
+  git config submodule.external/xerces-c.url "${srcdir}/xerces-c"
+  git config submodule.external/zlib.url "${srcdir}/zlib"
+  git config submodule.external/zxing-cpp.url "${srcdir}/zxing-cpp"
+  git config submodule.lime.url "${srcdir}/lime"
+  git config submodule.cmake-builder.url "${srcdir}/linphone-cmake-builder"
+  git config submodule.${pkgname%-desktop-all-git}.url "${srcdir}/${pkgname%-desktop-all-git}"
+  git config submodule.mediastreamer2.url "${srcdir}/mediastreamer2"
+  git config submodule.msamr.url "${srcdir}/msamr"
+  git config submodule.mscodec2.url "${srcdir}/mscodec2"
+  git config submodule.msopenh264.url "${srcdir}/msopenh264"
+  git config submodule.mssilk.url "${srcdir}/mssilk"
+  git config submodule.mswasapi.url "${srcdir}/mswasapi"
+  git config submodule.mswebrtc.url "${srcdir}/mswebrtc"
+  git config submodule.ortp.url "${srcdir}/ortp"
+  git submodule update --init
+
+  cd "${srcdir}/${pkgname%-all-git}/${pkgname%-desktop-all-git}-sdk/mswebrtc"
 
   git config submodule.webrtc.url "${srcdir}/webrtc"
   git submodule update --init
 
-  cd "${srcdir}/${pkgname%-all-git}"
+  cd "${srcdir}/${pkgname%-all-git}/${pkgname%-desktop-all-git}-sdk/${pkgname%-desktop-all-git}"
+
+  patch -Np1 -i "${srcdir}/${pkgname%-desktop-all-git}.patch"
+
+  cd "${srcdir}/${pkgname%-all-git}/${pkgname%-desktop-all-git}-sdk/external/vo-amrwbenc"
+
+  patch -Np1 -i "${srcdir}/vo-amrwbenc.patch"
+
+  cd "${srcdir}/${pkgname%-all-git}/${pkgname%-desktop-all-git}-sdk/external/soci"
 
-  patch -Np1 -i "../${pkgname%-all-git}-submodules.patch"
-  
-  #Patch generated via:
-  #git diff --ignore-submodules > ../submodules.patch
-  #git submodule --quiet foreach --recursive 'git diff --src-prefix=a/${name}/ --dst-prefix=b/${name}/' >> ../submodules.patch
+  patch -Np1 -i "${srcdir}/soci.patch"
 }
 
 pkgver() {
   cd "${srcdir}/${pkgname%-all-git}"
   (
     set -o pipefail
-    git describe --long --tags 2> /dev/null | sed "s/^[a-Z\.\-]*//;s/\([^-]*-\)g/r\1/;s/-/./g" || 
+    git describe --long --tags 2> /dev/null | sed "s/^[A-Za-z\.\-]*//;s/\([^-]*-\)g/r\1/;s/-/./g" || 
     printf "r%s.%s\n" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" 
   )
 }
diff --git a/linphone-desktop-submodules.patch b/linphone-desktop-submodules.patch
deleted file mode 100644
index 5fb41247244e..000000000000
--- a/linphone-desktop-submodules.patch
+++ /dev/null
@@ -1,582 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b9d0501d..efda8f09 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,6 +26,9 @@ project(linphoneqt VERSION 4.1.1)
- set(APP_LIBRARY app-library)
- include(application_info.cmake)
- 
-+# Pointing RPATH to /opt/linphone-desktop/lib{,64} to be used when installing
-+SET(CMAKE_INSTALL_RPATH "/opt/linphone-desktop/lib:/opt/linphone-desktop/lib64")
-+
- # ------------------------------------------------------------------------------
- 
- set(TARGET_NAME linphone-qt)
-diff --git a/submodules/externals/soci/cmake/SociConfig.cmake b/submodules/externals/soci/cmake/SociConfig.cmake
-index 5ac4ce06..8e936a68 100644
---- a/submodules/externals/soci/cmake/SociConfig.cmake
-+++ b/submodules/externals/soci/cmake/SociConfig.cmake
-@@ -51,7 +51,7 @@ if (MSVC)
- else()
- 
-   set(SOCI_GCC_CLANG_COMMON_FLAGS
--    "-pedantic -Werror -Wno-error=parentheses -Wall -Wextra -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Woverloaded-virtual -Wredundant-decls -Wno-long-long")
-+    "-pedantic -Wno-error=parentheses -Wall -Wextra -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Woverloaded-virtual -Wredundant-decls -Wno-long-long")
- 
-   set(SOCI_CXX_VERSION_FLAGS "-std=c++11")
- 
-diff --git a/submodules/externals/zlib/zconf.h b/submodules/externals/zlib/zconf.h
-deleted file mode 100644
-index 5e1d68a..0000000
---- a/submodules/externals/zlib/zconf.h
-+++ /dev/null
-@@ -1,534 +0,0 @@
--/* zconf.h -- configuration of the zlib compression library
-- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
-- * For conditions of distribution and use, see copyright notice in zlib.h
-- */
--
--/* @(#) $Id$ */
--
--#ifndef ZCONF_H
--#define ZCONF_H
--
--/*
-- * If you *really* need a unique prefix for all types and library functions,
-- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
-- * Even better than compiling with -DZ_PREFIX would be to use configure to set
-- * this permanently in zconf.h using "./configure --zprefix".
-- */
--#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
--#  define Z_PREFIX_SET
--
--/* all linked symbols and init macros */
--#  define _dist_code            z__dist_code
--#  define _length_code          z__length_code
--#  define _tr_align             z__tr_align
--#  define _tr_flush_bits        z__tr_flush_bits
--#  define _tr_flush_block       z__tr_flush_block
--#  define _tr_init              z__tr_init
--#  define _tr_stored_block      z__tr_stored_block
--#  define _tr_tally             z__tr_tally
--#  define adler32               z_adler32
--#  define adler32_combine       z_adler32_combine
--#  define adler32_combine64     z_adler32_combine64
--#  define adler32_z             z_adler32_z
--#  ifndef Z_SOLO
--#    define compress              z_compress
--#    define compress2             z_compress2
--#    define compressBound         z_compressBound
--#  endif
--#  define crc32                 z_crc32
--#  define crc32_combine         z_crc32_combine
--#  define crc32_combine64       z_crc32_combine64
--#  define crc32_z               z_crc32_z
--#  define deflate               z_deflate
--#  define deflateBound          z_deflateBound
--#  define deflateCopy           z_deflateCopy
--#  define deflateEnd            z_deflateEnd
--#  define deflateGetDictionary  z_deflateGetDictionary
--#  define deflateInit           z_deflateInit
--#  define deflateInit2          z_deflateInit2
--#  define deflateInit2_         z_deflateInit2_
--#  define deflateInit_          z_deflateInit_
--#  define deflateParams         z_deflateParams
--#  define deflatePending        z_deflatePending
--#  define deflatePrime          z_deflatePrime
--#  define deflateReset          z_deflateReset
--#  define deflateResetKeep      z_deflateResetKeep
--#  define deflateSetDictionary  z_deflateSetDictionary
--#  define deflateSetHeader      z_deflateSetHeader
--#  define deflateTune           z_deflateTune
--#  define deflate_copyright     z_deflate_copyright
--#  define get_crc_table         z_get_crc_table
--#  ifndef Z_SOLO
--#    define gz_error              z_gz_error
--#    define gz_intmax             z_gz_intmax
--#    define gz_strwinerror        z_gz_strwinerror
--#    define gzbuffer              z_gzbuffer
--#    define gzclearerr            z_gzclearerr
--#    define gzclose               z_gzclose
--#    define gzclose_r             z_gzclose_r
--#    define gzclose_w             z_gzclose_w
--#    define gzdirect              z_gzdirect
--#    define gzdopen               z_gzdopen
--#    define gzeof                 z_gzeof
--#    define gzerror               z_gzerror
--#    define gzflush               z_gzflush
--#    define gzfread               z_gzfread
--#    define gzfwrite              z_gzfwrite
--#    define gzgetc                z_gzgetc
--#    define gzgetc_               z_gzgetc_
--#    define gzgets                z_gzgets
--#    define gzoffset              z_gzoffset
--#    define gzoffset64            z_gzoffset64
--#    define gzopen                z_gzopen
--#    define gzopen64              z_gzopen64
--#    ifdef _WIN32
--#      define gzopen_w              z_gzopen_w
--#    endif
--#    define gzprintf              z_gzprintf
--#    define gzputc                z_gzputc
--#    define gzputs                z_gzputs
--#    define gzread                z_gzread
--#    define gzrewind              z_gzrewind
--#    define gzseek                z_gzseek
--#    define gzseek64              z_gzseek64
--#    define gzsetparams           z_gzsetparams
--#    define gztell                z_gztell
--#    define gztell64              z_gztell64
--#    define gzungetc              z_gzungetc
--#    define gzvprintf             z_gzvprintf
--#    define gzwrite               z_gzwrite
--#  endif
--#  define inflate               z_inflate
--#  define inflateBack           z_inflateBack
--#  define inflateBackEnd        z_inflateBackEnd
--#  define inflateBackInit       z_inflateBackInit
--#  define inflateBackInit_      z_inflateBackInit_
--#  define inflateCodesUsed      z_inflateCodesUsed
--#  define inflateCopy           z_inflateCopy
--#  define inflateEnd            z_inflateEnd
--#  define inflateGetDictionary  z_inflateGetDictionary
--#  define inflateGetHeader      z_inflateGetHeader
--#  define inflateInit           z_inflateInit
--#  define inflateInit2          z_inflateInit2
--#  define inflateInit2_         z_inflateInit2_
--#  define inflateInit_          z_inflateInit_
--#  define inflateMark           z_inflateMark
--#  define inflatePrime          z_inflatePrime
--#  define inflateReset          z_inflateReset
--#  define inflateReset2         z_inflateReset2
--#  define inflateResetKeep      z_inflateResetKeep
--#  define inflateSetDictionary  z_inflateSetDictionary
--#  define inflateSync           z_inflateSync
--#  define inflateSyncPoint      z_inflateSyncPoint
--#  define inflateUndermine      z_inflateUndermine
--#  define inflateValidate       z_inflateValidate
--#  define inflate_copyright     z_inflate_copyright
--#  define inflate_fast          z_inflate_fast
--#  define inflate_table         z_inflate_table
--#  ifndef Z_SOLO
--#    define uncompress            z_uncompress
--#    define uncompress2           z_uncompress2
--#  endif
--#  define zError                z_zError
--#  ifndef Z_SOLO
--#    define zcalloc               z_zcalloc
--#    define zcfree                z_zcfree
--#  endif
--#  define zlibCompileFlags      z_zlibCompileFlags
--#  define zlibVersion           z_zlibVersion
--
--/* all zlib typedefs in zlib.h and zconf.h */
--#  define Byte                  z_Byte
--#  define Bytef                 z_Bytef
--#  define alloc_func            z_alloc_func
--#  define charf                 z_charf
--#  define free_func             z_free_func
--#  ifndef Z_SOLO
--#    define gzFile                z_gzFile
--#  endif
--#  define gz_header             z_gz_header
--#  define gz_headerp            z_gz_headerp
--#  define in_func               z_in_func
--#  define intf                  z_intf
--#  define out_func              z_out_func
--#  define uInt                  z_uInt
--#  define uIntf                 z_uIntf
--#  define uLong                 z_uLong
--#  define uLongf                z_uLongf
--#  define voidp                 z_voidp
--#  define voidpc                z_voidpc
--#  define voidpf                z_voidpf
--
--/* all zlib structs in zlib.h and zconf.h */
--#  define gz_header_s           z_gz_header_s
--#  define internal_state        z_internal_state
--
--#endif
--
--#if defined(__MSDOS__) && !defined(MSDOS)
--#  define MSDOS
--#endif
--#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
--#  define OS2
--#endif
--#if defined(_WINDOWS) && !defined(WINDOWS)
--#  define WINDOWS
--#endif
--#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
--#  ifndef WIN32
--#    define WIN32
--#  endif
--#endif
--#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
--#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
--#    ifndef SYS16BIT
--#      define SYS16BIT
--#    endif
--#  endif
--#endif
--
--/*
-- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
-- * than 64k bytes at a time (needed on systems with 16-bit int).
-- */
--#ifdef SYS16BIT
--#  define MAXSEG_64K
--#endif
--#ifdef MSDOS
--#  define UNALIGNED_OK
--#endif
--
--#ifdef __STDC_VERSION__
--#  ifndef STDC
--#    define STDC
--#  endif
--#  if __STDC_VERSION__ >= 199901L
--#    ifndef STDC99
--#      define STDC99
--#    endif
--#  endif
--#endif
--#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
--#  define STDC
--#endif
--#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
--#  define STDC
--#endif
--#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
--#  define STDC
--#endif
--#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
--#  define STDC
--#endif
--
--#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
--#  define STDC
--#endif
--
--#ifndef STDC
--#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
--#    define const       /* note: need a more gentle solution here */
--#  endif
--#endif
--
--#if defined(ZLIB_CONST) && !defined(z_const)
--#  define z_const const
--#else
--#  define z_const
--#endif
--
--#ifdef Z_SOLO
--   typedef unsigned long z_size_t;
--#else
--#  define z_longlong long long
--#  if defined(NO_SIZE_T)
--     typedef unsigned NO_SIZE_T z_size_t;
--#  elif defined(STDC)
--#    include <stddef.h>
--     typedef size_t z_size_t;
--#  else
--     typedef unsigned long z_size_t;
--#  endif
--#  undef z_longlong
--#endif
--
--/* Maximum value for memLevel in deflateInit2 */
--#ifndef MAX_MEM_LEVEL
--#  ifdef MAXSEG_64K
--#    define MAX_MEM_LEVEL 8
--#  else
--#    define MAX_MEM_LEVEL 9
--#  endif
--#endif
--
--/* Maximum value for windowBits in deflateInit2 and inflateInit2.
-- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
-- * created by gzip. (Files created by minigzip can still be extracted by
-- * gzip.)
-- */
--#ifndef MAX_WBITS
--#  define MAX_WBITS   15 /* 32K LZ77 window */
--#endif
--
--/* The memory requirements for deflate are (in bytes):
--            (1 << (windowBits+2)) +  (1 << (memLevel+9))
-- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
-- plus a few kilobytes for small objects. For example, if you want to reduce
-- the default memory requirements from 256K to 128K, compile with
--     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
-- Of course this will generally degrade compression (there's no free lunch).
--
--   The memory requirements for inflate are (in bytes) 1 << windowBits
-- that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
-- for small objects.
--*/
--
--                        /* Type declarations */
--
--#ifndef OF /* function prototypes */
--#  ifdef STDC
--#    define OF(args)  args
--#  else
--#    define OF(args)  ()
--#  endif
--#endif
--
--#ifndef Z_ARG /* function prototypes for stdarg */
--#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
--#    define Z_ARG(args)  args
--#  else
--#    define Z_ARG(args)  ()
--#  endif
--#endif
--
--/* The following definitions for FAR are needed only for MSDOS mixed
-- * model programming (small or medium model with some far allocations).
-- * This was tested only with MSC; for other MSDOS compilers you may have
-- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
-- * just define FAR to be empty.
-- */
--#ifdef SYS16BIT
--#  if defined(M_I86SM) || defined(M_I86MM)
--     /* MSC small or medium model */
--#    define SMALL_MEDIUM
--#    ifdef _MSC_VER
--#      define FAR _far
--#    else
--#      define FAR far
--#    endif
--#  endif
--#  if (defined(__SMALL__) || defined(__MEDIUM__))
--     /* Turbo C small or medium model */
--#    define SMALL_MEDIUM
--#    ifdef __BORLANDC__
--#      define FAR _far
--#    else
--#      define FAR far
--#    endif
--#  endif
--#endif
--
--#if defined(WINDOWS) || defined(WIN32)
--   /* If building or using zlib as a DLL, define ZLIB_DLL.
--    * This is not mandatory, but it offers a little performance increase.
--    */
--#  ifdef ZLIB_DLL
--#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
--#      ifdef ZLIB_INTERNAL
--#        define ZEXTERN extern __declspec(dllexport)
--#      else
--#        define ZEXTERN extern __declspec(dllimport)
--#      endif
--#    endif
--#  endif  /* ZLIB_DLL */
--   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
--    * define ZLIB_WINAPI.
--    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
--    */
--#  ifdef ZLIB_WINAPI
--#    ifdef FAR
--#      undef FAR
--#    endif
--#    include <windows.h>
--     /* No need for _export, use ZLIB.DEF instead. */
--     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
--#    define ZEXPORT WINAPI
--#    ifdef WIN32
--#      define ZEXPORTVA WINAPIV
--#    else
--#      define ZEXPORTVA FAR CDECL
--#    endif
--#  endif
--#endif
--
--#if defined (__BEOS__)
--#  ifdef ZLIB_DLL
--#    ifdef ZLIB_INTERNAL
--#      define ZEXPORT   __declspec(dllexport)
--#      define ZEXPORTVA __declspec(dllexport)
--#    else
--#      define ZEXPORT   __declspec(dllimport)
--#      define ZEXPORTVA __declspec(dllimport)
--#    endif
--#  endif
--#endif
--
--#ifndef ZEXTERN
--#  define ZEXTERN extern
--#endif
--#ifndef ZEXPORT
--#  define ZEXPORT
--#endif
--#ifndef ZEXPORTVA
--#  define ZEXPORTVA
--#endif
--
--#ifndef FAR
--#  define FAR
--#endif
--
--#if !defined(__MACTYPES__)
--typedef unsigned char  Byte;  /* 8 bits */
--#endif
--typedef unsigned int   uInt;  /* 16 bits or more */
--typedef unsigned long  uLong; /* 32 bits or more */
--
--#ifdef SMALL_MEDIUM
--   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
--#  define Bytef Byte FAR
--#else
--   typedef Byte  FAR Bytef;
--#endif
--typedef char  FAR charf;
--typedef int   FAR intf;
--typedef uInt  FAR uIntf;
--typedef uLong FAR uLongf;
--
--#ifdef STDC
--   typedef void const *voidpc;
--   typedef void FAR   *voidpf;
--   typedef void       *voidp;
--#else
--   typedef Byte const *voidpc;
--   typedef Byte FAR   *voidpf;
--   typedef Byte       *voidp;
--#endif
--
--#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
--#  include <limits.h>
--#  if (UINT_MAX == 0xffffffffUL)
--#    define Z_U4 unsigned
--#  elif (ULONG_MAX == 0xffffffffUL)
--#    define Z_U4 unsigned long
--#  elif (USHRT_MAX == 0xffffffffUL)
--#    define Z_U4 unsigned short
--#  endif
--#endif
--
--#ifdef Z_U4
--   typedef Z_U4 z_crc_t;
--#else
--   typedef unsigned long z_crc_t;
--#endif
--
--#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
--#  define Z_HAVE_UNISTD_H
--#endif
--
--#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
--#  define Z_HAVE_STDARG_H
--#endif
--
--#ifdef STDC
--#  ifndef Z_SOLO
--#    include <sys/types.h>      /* for off_t */
--#  endif
--#endif
--
--#if defined(STDC) || defined(Z_HAVE_STDARG_H)
--#  ifndef Z_SOLO
--#    include <stdarg.h>         /* for va_list */
--#  endif
--#endif
--
--#ifdef _WIN32
--#  ifndef Z_SOLO
--#    include <stddef.h>         /* for wchar_t */
--#  endif
--#endif
--
--/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
-- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
-- * though the former does not conform to the LFS document), but considering
-- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
-- * equivalently requesting no 64-bit operations
-- */
--#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
--#  undef _LARGEFILE64_SOURCE
--#endif
--
--#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
--#  define Z_HAVE_UNISTD_H
--#endif
--#ifndef Z_SOLO
--#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
--#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
--#    ifdef VMS
--#      include <unixio.h>       /* for off_t */
--#    endif
--#    ifndef z_off_t
--#      define z_off_t off_t
--#    endif
--#  endif
--#endif
--
--#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
--#  define Z_LFS64
--#endif
--
--#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
--#  define Z_LARGE64
--#endif
--
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
--#  define Z_WANT64
--#endif
--
--#if !defined(SEEK_SET) && !defined(Z_SOLO)
--#  define SEEK_SET        0       /* Seek from beginning of file.  */
--#  define SEEK_CUR        1       /* Seek from current position.  */
--#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
--#endif
--
--#ifndef z_off_t
--#  define z_off_t long
--#endif
--
--#if !defined(_WIN32) && defined(Z_LARGE64)
--#  define z_off64_t off64_t
--#else
--#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
--#    define z_off64_t __int64
--#  else
--#    define z_off64_t z_off_t
--#  endif
--#endif
--
--/* MVS linker does not support external names larger than 8 bytes */
--#if defined(__MVS__)
--  #pragma map(deflateInit_,"DEIN")
--  #pragma map(deflateInit2_,"DEIN2")
--  #pragma map(deflateEnd,"DEEND")
--  #pragma map(deflateBound,"DEBND")
--  #pragma map(inflateInit_,"ININ")
--  #pragma map(inflateInit2_,"ININ2")
--  #pragma map(inflateEnd,"INEND")
--  #pragma map(inflateSync,"INSY")
--  #pragma map(inflateSetDictionary,"INSEDI")
--  #pragma map(compressBound,"CMBND")
--  #pragma map(inflate_table,"INTABL")
--  #pragma map(inflate_fast,"INFA")
--  #pragma map(inflate_copyright,"INCOPY")
--#endif
--
--#endif /* ZCONF_H */
-diff --git a/submodules/linphone/CMakeLists.txt b/submodules/linphone/CMakeLists.txt
-index 2ef372018..34e65de25 100644
---- a/submodules/linphone/CMakeLists.txt
-+++ b/submodules/linphone/CMakeLists.txt
-@@ -51,8 +51,8 @@ option(ENABLE_JAVA_WRAPPER "Build the Java wrapper for Liblinphone." OFF)
- option(ENABLE_JAVADOC "Add a target to generate documentation for Java API" NO)
- option(ENABLE_LDAP "Enable LDAP support." NO)
- option(ENABLE_LIME "Enable Instant Messaging Encryption." YES)
--option(ENABLE_RELATIVE_PREFIX "Find resources relatively to the installation directory." NO)
--option(ENABLE_STRICT "Build with strict compile options." YES)
-+option(ENABLE_RELATIVE_PREFIX "Find resources relatively to the installation directory." YES)
-+option(ENABLE_STRICT "Build with strict compile options." NO)
- option(ENABLE_TOOLS "Turn on or off compilation of tools." YES)
- option(ENABLE_TUNNEL "Turn on compilation of tunnel support." NO)
- option(ENABLE_TUTORIALS "Enable compilation of tutorials." YES)
diff --git a/linphone-desktop.patch b/linphone-desktop.patch
new file mode 100644
index 000000000000..4601079ffdf2
--- /dev/null
+++ b/linphone-desktop.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b9d0501d..efda8f09 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,6 +26,9 @@ project(linphoneqt VERSION 4.1.1)
+ set(APP_LIBRARY app-library)
+ include(application_info.cmake)
+ 
++# Pointing RPATH to /opt/linphone-desktop/lib{,64} to be used when installing
++SET(CMAKE_INSTALL_RPATH "/opt/linphone-desktop/lib:/opt/linphone-desktop/lib64")
++
+ # ------------------------------------------------------------------------------
+ 
+ set(TARGET_NAME linphone-qt)
diff --git a/linphone.patch b/linphone.patch
new file mode 100644
index 000000000000..370dcdeb4121
--- /dev/null
+++ b/linphone.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2ef372018..34e65de25 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,8 +51,8 @@ option(ENABLE_JAVA_WRAPPER "Build the Java wrapper for Liblinphone." OFF)
+ option(ENABLE_JAVADOC "Add a target to generate documentation for Java API" NO)
+ option(ENABLE_LDAP "Enable LDAP support." NO)
+ option(ENABLE_LIME "Enable Instant Messaging Encryption." YES)
+-option(ENABLE_RELATIVE_PREFIX "Find resources relatively to the installation directory." NO)
+-option(ENABLE_STRICT "Build with strict compile options." YES)
++option(ENABLE_RELATIVE_PREFIX "Find resources relatively to the installation directory." YES)
++option(ENABLE_STRICT "Build with strict compile options." NO)
+ option(ENABLE_TOOLS "Turn on or off compilation of tools." YES)
+ option(ENABLE_TUNNEL "Turn on compilation of tunnel support." NO)
+ option(ENABLE_TUTORIALS "Enable compilation of tutorials." YES)
diff --git a/soci.patch b/soci.patch
new file mode 100644
index 000000000000..2c9c10943324
--- /dev/null
+++ b/soci.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/SociConfig.cmake b/cmake/SociConfig.cmake
+index 5ac4ce06..8e936a68 100644
+--- a/cmake/SociConfig.cmake
++++ b/cmake/SociConfig.cmake
+@@ -51,7 +51,7 @@ if (MSVC)
+ else()
+ 
+   set(SOCI_GCC_CLANG_COMMON_FLAGS
+-    "-pedantic -Werror -Wno-error=parentheses -Wall -Wextra -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Woverloaded-virtual -Wredundant-decls -Wno-long-long")
++    "-pedantic -Wno-error=parentheses -Wall -Wextra -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Woverloaded-virtual -Wredundant-decls -Wno-long-long")
+ 
+   set(SOCI_CXX_VERSION_FLAGS "-std=c++11")
+ 
diff --git a/vo-amrwbenc.patch b/vo-amrwbenc.patch
new file mode 100644
index 000000000000..74e542757530
--- /dev/null
+++ b/vo-amrwbenc.patch
@@ -0,0 +1,13 @@
+diff --git a/amrwbenc/src/q_pulse.c b/amrwbenc/src/q_pulse.c
+index d658602..47fcae6 100644
+--- a/amrwbenc/src/q_pulse.c
++++ b/amrwbenc/src/q_pulse.c
+@@ -188,7 +188,7 @@ Word32 quant_4p_4N(                        /* (o) return 4*N bits             */
+ 		Word16 pos[],                         /* (i) position of the pulse 1..4  */
+ 		Word16 N)                             /* (i) number of bits for position */
+ {
+-	Word16 nb_pos, mask __unused, n_1, tmp;
++	Word16 nb_pos, mask, __unused, n_1, tmp;
+ 	Word16 posA[4], posB[4];
+ 	Word32 i, j, k, index;
+