From 3b4a217cb71a0cdac8033edcf516bcb1f1d0d343 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 6 Apr 2015 15:06:50 -0700 Subject: [PATCH] mediastreamer: 2.10.0 -> 2.11.1 --- .../libraries/mediastreamer/default.nix | 39 ++++++++++++++----- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index d8a2ea6ee377..586a10bd1a87 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,20 +1,39 @@ -{ stdenv, fetchurl, pkgconfig, alsaLib, ffmpeg, speex, ortp, pulseaudio, -libv4l, libtheora, intltool, libvpx, gsm, mesa, libX11, libXv, libXext, -glew, libopus, libupnp, vim }: +{ stdenv, fetchurl, pkgconfig, intltool, alsaLib, pulseaudio, speex, gsm +, libopus, ffmpeg, libX11, libXv, mesa, glew, libtheora, libvpx, SDL, libupnp +, ortp, libv4l, libpcap, srtp, vim +}: stdenv.mkDerivation rec { - name = "mediastreamer-2.10.0"; + name = "mediastreamer-2.11.1"; src = fetchurl { url = "mirror://savannah/linphone/mediastreamer/${name}.tar.gz"; - sha256 = "1sp1vjcz0rx518l7cfmkb4802xa5wyylr2b5hxlpjk3ygg28g3c0"; + sha256 = "0gfv4k2rsyvyq838xjgsrxmmn0fkw40apqs8vakzjwzsz2c9z8pd"; }; -# TODO: make it load plugins from *_PLUGIN_PATH - nativeBuildInputs = [pkgconfig intltool]; + postPatch = '' + sed -i "s/\(SRTP_LIBS=\"\$SRTP_LIBS -lsrtp\"\)/SRTP_LIBS=\"$(pkg-config --libs-only-l libsrtp)\"/g" configure + ''; - propagatedBuildInputs = [ alsaLib ffmpeg speex ortp pulseaudio libX11 - libXv libXext libv4l libtheora libvpx gsm mesa glew libopus libupnp vim ]; + # TODO: make it load plugins from *_PLUGIN_PATH + nativeBuildInputs = [ pkgconfig intltool ]; - configureFlags = "--enable-external-ortp"; + propagatedBuildInputs = [ + alsaLib pulseaudio speex gsm libopus + ffmpeg libX11 libXv mesa glew libtheora libvpx SDL libupnp + ortp libv4l libpcap srtp + vim + ]; + + configureFlags = [ + "--enable-external-ortp" + "--with-srtp=${srtp}" + ]; + + meta = with stdenv.lib; { + description = "a powerful and lightweight streaming engine specialized for voice/video telephony applications"; + homepage = http://www.linphone.org/technical-corner/mediastreamer2/overview; + license = licenses.gpl2; + platforms = platforms.linux; + }; }