summary refs log tree commit diff
path: root/pkgs/development/libraries/mediastreamer
diff options
context:
space:
mode:
authorc0bw3b <c0bw3b@users.noreply.github.com>2019-11-23 18:48:14 +0100
committerc0bw3b <c0bw3b@users.noreply.github.com>2019-11-23 19:11:16 +0100
commitda3877710a801f3d9873e8969c75561ef84c7b79 (patch)
treeeb35b25a6e53d7d71544b07af764d3770213e9e1 /pkgs/development/libraries/mediastreamer
parent7247c2bea6886dd81ca423274ca44cb98ce46c12 (diff)
downloadnixpkgs-da3877710a801f3d9873e8969c75561ef84c7b79.tar
nixpkgs-da3877710a801f3d9873e8969c75561ef84c7b79.tar.gz
nixpkgs-da3877710a801f3d9873e8969c75561ef84c7b79.tar.bz2
nixpkgs-da3877710a801f3d9873e8969c75561ef84c7b79.tar.lz
nixpkgs-da3877710a801f3d9873e8969c75561ef84c7b79.tar.xz
nixpkgs-da3877710a801f3d9873e8969c75561ef84c7b79.tar.zst
nixpkgs-da3877710a801f3d9873e8969c75561ef84c7b79.zip
mediastreamer-openh264: 0.0pre20160801 -> 1.2.1
Diffstat (limited to 'pkgs/development/libraries/mediastreamer')
-rw-r--r--pkgs/development/libraries/mediastreamer/msopenh264.nix23
1 files changed, 15 insertions, 8 deletions
diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix
index 38261bd1e53..f1e9fc30151 100644
--- a/pkgs/development/libraries/mediastreamer/msopenh264.nix
+++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix
@@ -1,23 +1,30 @@
 { stdenv, autoreconfHook, pkgconfig, mediastreamer, openh264
-, fetchgit, cmake
+, fetchurl, fetchpatch, cmake
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "mediastreamer-openh264";
-  version = "0.0pre20160801";
+  version = "1.2.1";
 
-  src = fetchgit {
-    url = "git://git.linphone.org/msopenh264.git";
-    rev = "4cb4b134bf0f1538fd0c2c928eee2d5388115abc";
-    sha256 = "001km4xy1ifwbg1c19ncc75h867fzfcxy9pxvl4pxqb64169xc1k";
+  src = fetchurl {
+    url = "https://www.linphone.org/releases/sources/plugins/msopenh264/msopenh264-${version}.tar.gz";
+    sha256 = "0rdxgazm52560g52pp6mp3mwx6j1z3h2zyizzfycp8y8zi92fqm8";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "msopenh264-build-with-openh264-v2.patch";
+      url = "https://git.pld-linux.org/?p=packages/mediastreamer-plugin-msopenh264.git;a=blob_plain;f=mediastreamer-plugin-msopenh264-openh264.patch;hb=344b8af379701a7e58b4ffb3cbac1517eff079fd";
+      sha256 = "10c24b0afchx78q28176pd8iz7i1nlf57f6v6lyqxpz60fm5nrcc";
+    })
+  ];
+
   nativeBuildInputs = [ autoreconfHook cmake pkgconfig ];
   buildInputs = [ mediastreamer openh264 ];
 
   meta = with stdenv.lib; {
     description = "H.264 encoder/decoder plugin for mediastreamer2";
-    homepage = http://www.linphone.org/technical-corner/mediastreamer2/overview;
+    homepage = "https://www.linphone.org/technical-corner/mediastreamer2";
     license = licenses.gpl2;
     platforms = platforms.linux;
   };