git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #96987 from helsinki-systems/upd/freeswitch

freeswitch: 1.10.3 -> 1.10.5

commitc6b8a8212174b930df151caab7b6aed3d8c00e9f authorMichael Raskin <7c6f434c@mail.ru> dateTue 17 Nov 2020, 09:08 (6 years ago) parent0ccc3ec8385c2f
4 files changed+38−23
pkgs/development/libraries/sofia-sip/default.nix+10−7 pkgs/development/libraries/spandsp/default.nix+11−10 pkgs/servers/sip/freeswitch/default.nix+13−4 pkgs/servers/sip/freeswitch/modules.nix+4−2
pkgs/development/libraries/sofia-sip/default.nix+10−7
@@ -1,19 +1,22 @@
1−{ stdenv, fetchurl, glib, openssl, pkgconfig }:
1+{ stdenv, fetchFromGitHub, glib, openssl, pkgconfig, autoreconfHook }:
22
33stdenv.mkDerivation rec {
4− name = "sofia-sip-1.12.11";
4+ pname = "sofia-sip";
5+ version = "1.13.2";
56
6− src = fetchurl {
7− url = "mirror://sourceforge/sofia-sip/${name}.tar.gz";
8− sha256 = "10bwsdfijpbk9ahlfpk94kzdapxiahl9mljpgwghvq1630pbq09b";
7+ src = fetchFromGitHub {
8+ owner = "freeswitch";
9+ repo = pname;
10+ rev = "v${version}";
11+ sha256 = "01xj30hhm1ji76igkqkn63rw42vvzq3azkr9qz6fy83iwqaybgyn";
912 };
1013
1114 buildInputs = [ glib openssl ];
12− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
1316
1417 meta = with stdenv.lib; {
1518 description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification";
16− homepage = "http://sofia-sip.sourceforge.net/";
19+ homepage = "https://github.com/freeswitch/sofia-sip";
1720 platforms = platforms.linux;
1821 license = licenses.lgpl2;
1922 };
pkgs/development/libraries/spandsp/default.nix+11−10
@@ -1,23 +1,24 @@
1−{stdenv, fetchurl, audiofile, libtiff}:
1+{ stdenv, fetchFromGitHub, audiofile, libtiff, autoreconfHook }:
22stdenv.mkDerivation rec {
3− version = "0.0.6";
3+ version = "3.0.0";
44 pname = "spandsp";
5− src=fetchurl {
6− url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz";
7− sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc";
5+ src = fetchFromGitHub {
6+ owner = "freeswitch";
7+ repo = pname;
8+ rev = "6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6"; # upstream does not seem to believe in tags
9+ sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7";
810 };
911
1012 outputs = [ "out" "dev" ];
1113
12− propagatedBuildInputs = [audiofile libtiff];
14+ nativeBuildInputs = [ autoreconfHook ];
15+ propagatedBuildInputs = [ audiofile libtiff ];
16+
1317 meta = {
1418 description = "A portable and modular SIP User-Agent with audio and video support";
15− homepage = "http://www.creytiv.com/baresip.html";
19+ homepage = "https://github.com/freeswitch/spandsp";
1620 platforms = with stdenv.lib.platforms; linux;
1721 maintainers = with stdenv.lib.maintainers; [raskin];
1822 license = stdenv.lib.licenses.gpl2;
19− downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
20− inherit version;
21− updateWalker = true;
2223 };
2324}
pkgs/servers/sip/freeswitch/default.nix+13−4
@@ -1,6 +1,6 @@
1−{ fetchFromGitHub, stdenv, lib, pkgconfig, autoreconfHook
1+{ fetchFromGitHub, fetchpatch, stdenv, lib, pkgconfig, autoreconfHook
22, ncurses, gnutls, readline
3−, openssl, perl, sqlite, libjpeg, speex, pcre
3+, openssl, perl, sqlite, libjpeg, speex, pcre, libuuid
44, ldns, libedit, yasm, which, libsndfile, libtiff
55
66, callPackage
@@ -88,13 +88,21 @@ in
8888
8989stdenv.mkDerivation rec {
9090 pname = "freeswitch";
91− version = "1.10.3";
91+ version = "1.10.5";
9292 src = fetchFromGitHub {
9393 owner = "signalwire";
9494 repo = pname;
9595 rev = "v${version}";
96− sha256 = "0rp4sxqxd2wsb5iyv0mh11l16zxvh7rbgfg0vcgns823gvh8lqai";
96+ sha256 = "18dhyb19k28dcm1i8mhqvvgm2phsrmrwyjmfn79glk8pdlalvcha";
9797 };
98+
99+ patches = [
100+ # https://github.com/signalwire/freeswitch/pull/812 fix mod_spandsp, mod_gsmopen build, drop when updating from 1.10.5
101+ (fetchpatch {
102+ url = "https://github.com/signalwire/freeswitch/commit/51fba83ed3ed2d9753d8e6b13e13001aca50b493.patch";
103+ sha256 = "0h2bmifsyyasxjka3pczbmqym1chvz91fmb589njrdbwpkjyvqh3";
104+ })
105+ ];
98106 postPatch = ''
99107 patchShebangs libs/libvpx/build/make/rtcd.pl
100108 substituteInPlace libs/libvpx/build/make/configure.sh \
@@ -114,6 +122,7 @@ stdenv.mkDerivation rec {
114122 openssl ncurses gnutls readline perl libjpeg
115123 sqlite pcre speex ldns libedit yasm which
116124 libsndfile libtiff
125+ libuuid
117126 ]
118127 ++ lib.unique (lib.concatMap (mod: mod.inputs) enabledModules)
119128 ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ];
pkgs/servers/sip/freeswitch/modules.nix+4−2
@@ -9,6 +9,8 @@
99, ffmpeg
1010, libmysqlclient
1111, postgresql
12+, spandsp
13+, sofia_sip
1214}:
1315
1416let
@@ -68,7 +70,7 @@ in
6870 snom = mk "applications/mod_snom" [];
6971 sonar = mk "applications/mod_sonar" [];
7072 soundtouch = mk "applications/mod_soundtouch" [];
71− spandsp = mk "applications/mod_spandsp" [];
73+ spandsp = mk "applications/mod_spandsp" [ spandsp ];
7274 spy = mk "applications/mod_spy" [];
7375 stress = mk "applications/mod_stress" [];
7476 translate = mk "applications/mod_translate" [];
@@ -136,7 +138,7 @@ in
136138 rtc = mk "endpoints/mod_rtc" [];
137139 rtmp = mk "endpoints/mod_rtmp" [];
138140 skinny = mk "endpoints/mod_skinny" [];
139− sofia = mk "endpoints/mod_sofia" [];
141+ sofia = mk "endpoints/mod_sofia" [ sofia_sip ];
140142 verto = mk "endpoints/mod_verto" [];
141143 };
142144