Merge pull request #34800 from adisbladis/linphone-3_12_0

linphone: 3.10.2 -> 3.12.0

pkgs/development/libraries/bctoolbox/default.nix

@@ -2,13 +2,13 @@
 stdenv.mkDerivation rec {
   name = "${baseName}-${version}";
   baseName = "bctoolbox";
-  version = "0.2.0";
+  version = "0.6.0";
   buildInputs = [cmake mbedtls bcunit srtp];
   src = fetchFromGitHub {
     owner = "BelledonneCommunications";
     repo = "${baseName}";
     rev = "${version}";
-    sha256 = "09mjqdfjxy4jy1z68b2i99hgkbnhhk7vnbfhj9sdpd1p3jk2ha33";
+    sha256 = "1cxx243wyzkd4xnvpyqf97n0rjhfckpvw1vhwnbwshq3q6fra909";
   };
 
   meta = {

pkgs/development/libraries/belcard/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, belr }:
+
+stdenv.mkDerivation rec {
+  baseName = "belcard";
+  version = "1.0.2";
+  name = "${baseName}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "BelledonneCommunications";
+    repo = "${baseName}";
+    rev = "${version}";
+    sha256 = "1pwji83vpsdrfma24rnj3rz1x0a0g6zk3v4xjnip7zf2ys3zcnlk";
+  };
+
+  buildInputs = [ bctoolbox belr ];
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib;{
+    description = "Belcard is a C++ library to manipulate VCard standard format";
+    homepage = https://github.com/BelledonneCommunications/belcard;
+    license = licenses.lgpl21;
+    platforms = platforms.all;
+  };
+}

pkgs/development/libraries/belle-sip/default.nix

@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   baseName = "belle-sip";
-  version = "1.5.0";
+  version = "1.6.3";
   name = "${baseName}-${version}";
 
   src = fetchFromGitHub {
     owner = "BelledonneCommunications";
     repo = "${baseName}";
     rev = "${version}";
-    sha256 = "0hnm64hwgq003wicz6c485fryjfhi820fgin8ndknq60kvwxsrzn";
+    sha256 = "0q70db1klvhca1af29bm9paka3gyii5hfbzrj4178gclsg7cj8fk";
   };
 
   nativeBuildInputs = [ jre cmake ];

pkgs/development/libraries/belr/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox }:
+
+stdenv.mkDerivation rec {
+  baseName = "belr";
+  version = "0.1.3";
+  name = "${baseName}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "BelledonneCommunications";
+    repo = "${baseName}";
+    rev = "${version}";
+    sha256 = "0mf8lsyq1z3b5p47c00lnwc8n7v9nzs1fd2g9c9hnz6fjd2ka44w";
+  };
+
+  buildInputs = [ bctoolbox ];
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib;{
+    description = "Belr is Belledonne Communications' language recognition library";
+    homepage = https://github.com/BelledonneCommunications/belr;
+    license = licenses.lgpl21;
+    platforms = platforms.all;
+  };
+}

pkgs/development/libraries/bzrtp/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, sqlite }:
+
+stdenv.mkDerivation rec {
+  baseName = "bzrtp";
+  version = "1.0.6";
+  name = "${baseName}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "BelledonneCommunications";
+    repo = "${baseName}";
+    rev = "${version}";
+    sha256 = "0438zzxp82bj5fmvqnwlljkgrz9ab5qm5lgpwwgmg1cp78bp2l45";
+  };
+
+  buildInputs = [ bctoolbox sqlite ];
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "BZRTP is an opensource implementation of ZRTP keys exchange protocol";
+    homepage = https://github.com/BelledonneCommunications/bzrtp;
+    license = licenses.lgpl21;
+    platforms = platforms.all;
+  };
+}

pkgs/development/libraries/mediastreamer/default.nix

@@ -1,22 +1,29 @@
 { stdenv, fetchurl, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm
 , libopus, ffmpeg, libX11, libXv, mesa, glew, libtheora, libvpx, SDL, libupnp
 , ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen
-, python, libXext, libmatroska, openssl
+, python, libXext, libmatroska, openssl, fetchpatch
 }:
 
 stdenv.mkDerivation rec {
   baseName = "mediastreamer2";
-  version = "2.14.0";
+  version = "2.16.1";
   name = "${baseName}-${version}";
 
   src = fetchFromGitHub {
     owner = "BelledonneCommunications";
     repo = "${baseName}";
     rev = "${version}";
-    sha256 = "1b59rzsaw54mhy4pz9hndmim4rgidkn7s6c4iyl34mz58lwxpmqp";
+    sha256 = "02745bzl2r1jqvdqzyv94fjd4w92zr976la4c4nfvsy52waqah7j";
   };
 
-  patches = [ ./plugins_dir.patch ];
+  patches = [
+    (fetchpatch {
+      name = "allow-build-without-git.patch";
+      url = "https://github.com/BelledonneCommunications/mediastreamer2/commit/de3a24b795d7a78e78eab6b974e7ec5abf2259ac.patch";
+      sha256 = "1zqkrab42n4dha0knfsyj4q0wc229ma125gk9grj67ps7r7ipscy";
+    })
+    ./plugins_dir.patch
+  ];
 
   nativeBuildInputs = [ pkgconfig intltool cmake doxygen python ];
 

pkgs/development/libraries/ortp/default.nix

@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   baseName = "ortp";
-  version = "0.27.0";
+  version = "1.0.2";
   name = "${baseName}-${version}";
 
   src = fetchFromGitHub {
     owner = "BelledonneCommunications";
     repo = "${baseName}";
     rev = "${version}";
-    sha256 = "0gjaaph4pamay9gn1yn7ky5wyzhj93r53rwak7h8s48vf08fqyv7";
+    sha256 = "12cwv593bsdnxs0zfcp07vwyk7ghlz2wv7vdbs1ksv293w3vj2rv";
   };
 
   buildInputs = [ bctoolbox ];