Merge pull request #96987 from helsinki-systems/upd/freeswitch
freeswitch: 1.10.3 -> 1.10.5
This commit is contained in:
commit
c6b8a82121
|
@ -1,19 +1,22 @@
|
|||
{ stdenv, fetchurl, glib, openssl, pkgconfig }:
|
||||
{ stdenv, fetchFromGitHub, glib, openssl, pkgconfig, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sofia-sip-1.12.11";
|
||||
pname = "sofia-sip";
|
||||
version = "1.13.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/sofia-sip/${name}.tar.gz";
|
||||
sha256 = "10bwsdfijpbk9ahlfpk94kzdapxiahl9mljpgwghvq1630pbq09b";
|
||||
src = fetchFromGitHub {
|
||||
owner = "freeswitch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "01xj30hhm1ji76igkqkn63rw42vvzq3azkr9qz6fy83iwqaybgyn";
|
||||
};
|
||||
|
||||
buildInputs = [ glib openssl ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification";
|
||||
homepage = "http://sofia-sip.sourceforge.net/";
|
||||
homepage = "https://github.com/freeswitch/sofia-sip";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.lgpl2;
|
||||
};
|
||||
|
|
|
@ -1,23 +1,24 @@
|
|||
{stdenv, fetchurl, audiofile, libtiff}:
|
||||
{ stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook }:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.0.6";
|
||||
version = "3.0.0";
|
||||
pname = "spandsp";
|
||||
src=fetchurl {
|
||||
url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz";
|
||||
sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc";
|
||||
src = fetchFromGitHub {
|
||||
owner = "freeswitch";
|
||||
repo = pname;
|
||||
rev = "6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6"; # upstream does not seem to believe in tags
|
||||
sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
propagatedBuildInputs = [audiofile libtiff];
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
propagatedBuildInputs = [ audiofile libtiff ];
|
||||
|
||||
meta = {
|
||||
description = "A portable and modular SIP User-Agent with audio and video support";
|
||||
homepage = "http://www.creytiv.com/baresip.html";
|
||||
homepage = "https://github.com/freeswitch/spandsp";
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
maintainers = with stdenv.lib.maintainers; [raskin];
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
|
||||
inherit version;
|
||||
updateWalker = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ fetchFromGitHub, stdenv, lib, pkgconfig, autoreconfHook
|
||||
{ fetchFromGitHub, fetchpatch, stdenv, lib, pkgconfig, autoreconfHook
|
||||
, ncurses, gnutls, readline
|
||||
, openssl, perl, sqlite, libjpeg, speex, pcre
|
||||
, openssl, perl, sqlite, libjpeg, speex, pcre, libuuid
|
||||
, ldns, libedit, yasm, which, libsndfile, libtiff
|
||||
|
||||
, callPackage
|
||||
|
@ -88,13 +88,21 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freeswitch";
|
||||
version = "1.10.3";
|
||||
version = "1.10.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalwire";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0rp4sxqxd2wsb5iyv0mh11l16zxvh7rbgfg0vcgns823gvh8lqai";
|
||||
sha256 = "18dhyb19k28dcm1i8mhqvvgm2phsrmrwyjmfn79glk8pdlalvcha";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/signalwire/freeswitch/pull/812 fix mod_spandsp, mod_gsmopen build, drop when updating from 1.10.5
|
||||
(fetchpatch {
|
||||
url = "https://github.com/signalwire/freeswitch/commit/51fba83ed3ed2d9753d8e6b13e13001aca50b493.patch";
|
||||
sha256 = "0h2bmifsyyasxjka3pczbmqym1chvz91fmb589njrdbwpkjyvqh3";
|
||||
})
|
||||
];
|
||||
postPatch = ''
|
||||
patchShebangs libs/libvpx/build/make/rtcd.pl
|
||||
substituteInPlace libs/libvpx/build/make/configure.sh \
|
||||
|
@ -114,6 +122,7 @@ stdenv.mkDerivation rec {
|
|||
openssl ncurses gnutls readline perl libjpeg
|
||||
sqlite pcre speex ldns libedit yasm which
|
||||
libsndfile libtiff
|
||||
libuuid
|
||||
]
|
||||
++ lib.unique (lib.concatMap (mod: mod.inputs) enabledModules)
|
||||
++ lib.optionals stdenv.isDarwin [ SystemConfiguration ];
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
, ffmpeg
|
||||
, libmysqlclient
|
||||
, postgresql
|
||||
, spandsp
|
||||
, sofia_sip
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -68,7 +70,7 @@ in
|
|||
snom = mk "applications/mod_snom" [];
|
||||
sonar = mk "applications/mod_sonar" [];
|
||||
soundtouch = mk "applications/mod_soundtouch" [];
|
||||
spandsp = mk "applications/mod_spandsp" [];
|
||||
spandsp = mk "applications/mod_spandsp" [ spandsp ];
|
||||
spy = mk "applications/mod_spy" [];
|
||||
stress = mk "applications/mod_stress" [];
|
||||
translate = mk "applications/mod_translate" [];
|
||||
|
@ -136,7 +138,7 @@ in
|
|||
rtc = mk "endpoints/mod_rtc" [];
|
||||
rtmp = mk "endpoints/mod_rtmp" [];
|
||||
skinny = mk "endpoints/mod_skinny" [];
|
||||
sofia = mk "endpoints/mod_sofia" [];
|
||||
sofia = mk "endpoints/mod_sofia" [ sofia_sip ];
|
||||
verto = mk "endpoints/mod_verto" [];
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue