Including missing dependencies. Removing duplicated source linphone-sdk.

2 files changed, 51 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3901343e1632..a5fa1ced379d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,17 +10,20 @@ pkgbase = linphone-desktop-all-git
 	makedepends = git
 	makedepends = graphviz
 	makedepends = ladspa
+	makedepends = libbsd
 	makedepends = nasm
 	makedepends = python-pystache
 	makedepends = yasm
+	depends = alsa-utils
+	depends = glew
 	depends = qt5-graphicaleffects
 	depends = qt5-quickcontrols
 	depends = qt5-quickcontrols2
 	depends = qt5-svg
 	depends = qt5-tools
+	depends = v4l-utils
 	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
@@ -113,7 +116,6 @@ pkgbase = linphone-desktop-all-git
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = SKIP
 	sha256sums = 346d983f503873811b3a4f72772e5afe4990275526c9e15c1b5cde2ad69a0544
 	sha256sums = e7574cdb0a5f8d334b1ed1d938fd6c7639e5785b80f01d39e81a682595af4171
 	sha256sums = 2d174bd6b3d55fc9140b5a94a60bfb0274d0853e780ff0269125bcc6fd501922
diff --git a/PKGBUILD b/PKGBUILD
index 0afa44f956c4..9fa065db4de7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,58 +11,58 @@ depends=("alsa-utils" "glew" "qt5-graphicaleffects" "qt5-quickcontrols" "qt5-qui
 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"
-        "${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"
+        "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-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"
+        "bv16-floatingpoint::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/bv16-floatingpoint.git"
+        "codec2::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/codec2.git"
+        "decaf::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/decaf.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"
+        "opencore-amr::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/opencore-amr.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"
+        "vo-amrwbenc::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/vo-amrwbenc.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"
+        "zxing-cpp::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/zxing-cpp.git"
+        "lime::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/lime.git"
+        "${pkgname%-desktop-all-git}-cmake-builder::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/${pkgname%-desktop-all-git}-cmake-builder.git"
+        "${pkgname%-desktop-all-git}-sdk::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/${pkgname%-desktop-all-git}-sdk.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"
+        "mscodec2::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/mscodec2.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"
+        "ortp::git+https://gitlab.${pkgname%-desktop-all-git}.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}.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"
+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"
             "346d983f503873811b3a4f72772e5afe4990275526c9e15c1b5cde2ad69a0544"
             "e7574cdb0a5f8d334b1ed1d938fd6c7639e5785b80f01d39e81a682595af4171"
             "2d174bd6b3d55fc9140b5a94a60bfb0274d0853e780ff0269125bcc6fd501922"
@@ -110,7 +110,7 @@ prepare() {
   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.cmake-builder.url "${srcdir}/${pkgname%-desktop-all-git}-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"