Removing vo-amrwbenc.patch which is no longer needed. Temporal fix to opencore-amr while they update to last commit number in linphone-sdk.

3 files changed, 13 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0eeae61dd013..6c100b21b757 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.r630.cc9f2e84
+	pkgver = 4.1.1.r640.f923ab1a
 	pkgrel = 1
 	url = https://www.linphone.org/
 	arch = x86_64
@@ -16,10 +16,14 @@ pkgbase = linphone-desktop-all-git
 	depends = alsa-utils
 	depends = desktop-file-utils
 	depends = glew
+	depends = gsm
+	depends = java-runtime
 	depends = libbsd
+	depends = pulseaudio
 	depends = qt5-graphicaleffects
 	depends = qt5-quickcontrols
 	depends = qt5-quickcontrols2
+	depends = qt5-speech
 	depends = qt5-svg
 	depends = qt5-tools
 	depends = v4l-utils
@@ -76,7 +80,6 @@ pkgbase = linphone-desktop-all-git
 	source = linphone-desktop.patch
 	source = linphone.patch
 	source = soci.patch
-	source = vo-amrwbenc.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -125,7 +128,6 @@ pkgbase = linphone-desktop-all-git
 	sha256sums = e7574cdb0a5f8d334b1ed1d938fd6c7639e5785b80f01d39e81a682595af4171
 	sha256sums = 88bc7f2f6ca9cf9ad54c1e4f42fe02597070aa2cb6c8d21c3b619739550a6651
 	sha256sums = 61a9a107267658971348343433a0709af7e1160d4227867faa8decd255f0289c
-	sha256sums = 4aa74b282d3696c722756b72f69ee1a3f0013364803374a698e7fd5998382520
 
 pkgname = linphone-desktop-all-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 29b9d3bde620..ac75abde37a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Fredy García <frealgagu at gmail dot com>
 
 pkgname=linphone-desktop-all-git
-pkgver=4.1.1.r630.cc9f2e84
+pkgver=4.1.1.r640.f923ab1a
 pkgrel=1
 pkgdesc="A free VoIP and video softphone based on the SIP protocol (Installed in /opt with all deps included)."
 arch=("x86_64")
@@ -58,8 +58,7 @@ source=("${pkgname%-all-git}::git+https://gitlab.${pkgname%-desktop-all-git}.org
         "${pkgname%-desktop-all-git}.desktop"
         "${pkgname%-all-git}.patch"
         "${pkgname%-desktop-all-git}.patch"
-        "soci.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"
@@ -67,8 +66,7 @@ sha256sums=("SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP
             "346d983f503873811b3a4f72772e5afe4990275526c9e15c1b5cde2ad69a0544"
             "e7574cdb0a5f8d334b1ed1d938fd6c7639e5785b80f01d39e81a682595af4171"
             "88bc7f2f6ca9cf9ad54c1e4f42fe02597070aa2cb6c8d21c3b619739550a6651"
-            "61a9a107267658971348343433a0709af7e1160d4227867faa8decd255f0289c"
-            "4aa74b282d3696c722756b72f69ee1a3f0013364803374a698e7fd5998382520")
+            "61a9a107267658971348343433a0709af7e1160d4227867faa8decd255f0289c")
 
 prepare() {
   cd "${srcdir}/${pkgname%-all-git}"
@@ -132,13 +130,14 @@ prepare() {
 
   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 "${srcdir}/soci.patch"
+  
+  #Temporal fix
+  cd "${srcdir}/${pkgname%-all-git}/${pkgname%-desktop-all-git}-sdk/external/opencore-amr"
+  
+  git checkout 6e799838855bca868ef50a0953f0c771924321c3
 }
 
 pkgver() {
diff --git a/vo-amrwbenc.patch b/vo-amrwbenc.patch
deleted file mode 100644
index 2ae13940fed6..000000000000
--- a/vo-amrwbenc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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, n_1, tmp;
- 	Word16 posA[4], posB[4];
- 	Word32 i, j, k, index;
-