Merge pull request #106267 from gebner/linphone

linphone: unstable-2020-03-06 -> 4.2.4

6 files changed, 47 insertions, 53 deletions

diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix
index 34b0560f3f469..ae9b1e6e43c55 100644
--- a/pkgs/development/libraries/belcard/default.nix
+++ b/pkgs/development/libraries/belcard/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   pname = "belcard";
-  version = "4.4.0";
+  version = "4.4.13";
 
   src = fetchFromGitLab {
     domain = "gitlab.linphone.org";
diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix
index a935372656e75..788e656301ba8 100644
--- a/pkgs/development/libraries/belle-sip/default.nix
+++ b/pkgs/development/libraries/belle-sip/default.nix
@@ -2,7 +2,6 @@
 , bctoolbox
 , cmake
 , fetchFromGitLab
-, jre
 , libantlr3c
 , mbedtls
 , stdenv
@@ -11,20 +10,18 @@
 
 stdenv.mkDerivation rec {
   pname = "belle-sip";
-  # Using master branch for linphone-desktop caused a chain reaction that many
-  # of its dependencies needed to use master branch too.
-  version = "unstable-2020-02-18";
+  version = "4.4.13";
 
   src = fetchFromGitLab {
     domain = "gitlab.linphone.org";
     owner = "public";
     group = "BC";
     repo = pname;
-    rev = "0dcb13416eae87edf140771b886aedaf6be8cf60";
-    sha256 = "0pzxk8mkkg6zsnmj1bwggbdjv864psx89gglfm51h8s501kg11fv";
+    rev = version;
+    sha256 = "1ad7sqc5y4f3gc8glwmb3rvfzapnvhg981g13x90cg4nzikjvka0";
   };
 
-  nativeBuildInputs = [ jre cmake ];
+  nativeBuildInputs = [ cmake antlr3_4 ];
 
   buildInputs = [ zlib ];
 
@@ -37,10 +34,7 @@ stdenv.mkDerivation rec {
     "-Wno-error=cast-function-type"
   ];
 
-  propagatedBuildInputs = [ antlr3_4 libantlr3c mbedtls bctoolbox ];
-
-  # Fails to build with lots of parallel jobs
-  enableParallelBuilding = false;
+  propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox ];
 
   meta = with stdenv.lib; {
     homepage = "https://linphone.org/technical-corner/belle-sip";
diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix
index 1c414b9dd8664..21f9833a5d56a 100644
--- a/pkgs/development/libraries/liblinphone/default.nix
+++ b/pkgs/development/libraries/liblinphone/default.nix
@@ -46,43 +46,18 @@
 , xsd
 , zlib
 }:
-let
-  # Got the following error when building:
-  #
-  #   Your version of Doxygen (1.8.17) is known to malfunction with some of our
-  #   macro definitions, which causes errors while wrapprers generation. Please
-  #   install an older version of Doxygen (< 1.8.17) or disable documentation
-  #   and wrapper generation.
-  #
-  # So, let's then use 1.8.16 version of doxygen in this derivation. Hopefully
-  # this workaround can be removed with some newer release of liblinphone.
-  doxygen_1_8_16 = doxygen.overrideAttrs (
-    oldAttrs: rec {
-      name = "doxygen-1.8.16";
-      src = fetchurl {
-        urls = [
-          "mirror://sourceforge/doxygen/${name}.src.tar.gz" # faster, with https, etc.
-          "http://doxygen.nl/files/${name}.src.tar.gz"
-        ];
-        sha256 = "10iwv8bcz5b5cd85gg8pgn0bmyg04n9hs36xn7ggjjnvynv1z67z";
-      };
-      buildInputs = oldAttrs.buildInputs ++ [ git ];
-    }
-  );
-in
+
 stdenv.mkDerivation rec {
   pname = "liblinphone";
-  # Using master branch for linphone-desktop caused a chain reaction that many
-  # of its dependencies needed to use master branch too.
-  version = "unstable-2020-03-20";
+  version = "4.4.15";
 
   src = fetchFromGitLab {
     domain = "gitlab.linphone.org";
     owner = "public";
     group = "BC";
     repo = pname;
-    rev = "1d762a3e0e304aa579798aed4400d2cee2c1ffa0";
-    sha256 = "0ja38payyqbd8z6q5l5w6hi7xarmfj5021gh0qdk0j832br4c6c3";
+    rev = version;
+    sha256 = "16a31c0n5lix4r5xk7p447xlxbrhdlmj11kb4y1krb5fx8hf65cl";
   };
 
   # Do not build static libraries
@@ -103,7 +78,6 @@ stdenv.mkDerivation rec {
     cyrus_sasl
     ffmpeg_3
     gdk-pixbuf
-    git
     glib
     gtk2
     libX11
@@ -133,7 +107,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     bcunit
     cmake
-    doxygen_1_8_16
+    doxygen
     graphviz
     intltool
     makeWrapper
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index 81c7c8fcacf34..64ddba517df8f 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -33,17 +33,15 @@
 
 stdenv.mkDerivation rec {
   pname = "mediastreamer2";
-  # Using master branch for linphone-desktop caused a chain reaction that many
-  # of its dependencies needed to use master branch too.
-  version = "unstable-2020-03-20";
+  version = "4.4.13";
 
   src = fetchFromGitLab {
     domain = "gitlab.linphone.org";
     owner = "public";
     group = "BC";
     repo = pname;
-    rev = "c5eecb72cb44376d142949051dd0cb7c982608fb";
-    sha256 = "1vp260jxvjlmrmjdl4p23prg4cjln20a7z6zq8dqvfh4iq3ya033";
+    rev = version;
+    sha256 = "0w84v1ajhyysr41qaj7x4njwdak84cc10lq33hl8lq68a52fc2vw";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/minizip2/default.nix b/pkgs/development/libraries/minizip2/default.nix
new file mode 100644
index 0000000000000..6c6d8b3ef86c4
--- /dev/null
+++ b/pkgs/development/libraries/minizip2/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, cmake, pkg-config, zlib, bzip2, xz, zstd, openssl }:
+
+stdenv.mkDerivation rec {
+  pname = "minizip";
+  version = "2.10.4";
+
+  src = fetchFromGitHub {
+    owner = "nmoinvaz";
+    repo = pname;
+    rev = version;
+    sha256 = "15bbagngvm738prkzv7lfs64pn4pq7jkhwz571j0w0nb5nw9c01x";
+  };
+
+  nativeBuildInputs = [ cmake pkg-config ];
+
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=YES"
+    "-DMZ_OPENSSL=ON"
+  ];
+
+  buildInputs = [ zlib bzip2 xz zstd openssl ];
+
+  meta = with stdenv.lib; {
+    description = "Compression library implementing the deflate compression method found in gzip and PKZIP";
+    homepage = "https://github.com/nmoinvaz/minizip";
+    license = licenses.zlib;
+    maintainers = with maintainers; [ gebner ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix
index 53636f05b7896..f84f3ab1d83ed 100644
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@@ -6,17 +6,15 @@
 
 stdenv.mkDerivation rec {
   pname = "ortp";
-  # Using master branch for linphone-desktop caused a chain reaction that many
-  # of its dependencies needed to use master branch too.
-  version = "unstable-2020-03-17";
+  version = "4.4.9";
 
   src = fetchFromGitLab {
     domain = "gitlab.linphone.org";
     owner = "public";
     group = "BC";
     repo = pname;
-    rev = "804dfc4f90d1a4301127c7af10a74fd2935dd5d8";
-    sha256 = "1yr8j8am68spyy5d9vna8zcq3qn039mi16cv9jf5n4chs9rxf7xx";
+    rev = version;
+    sha256 = "0igiw863gnf9f626v0igg1pj3fv4anvlvlk6xx3bk2zdi52a9kcc";
   };
 
   # Do not build static libraries