freeswitch: 1.10.3 -> 1.10.5
now depends on spandsp and sofia_sip instead of carrying them in-tree
This commit is contained in:
parent
e184cede92
commit
8385c2f9c6
|
@ -1,6 +1,6 @@
|
||||||
{ fetchFromGitHub, stdenv, lib, pkgconfig, autoreconfHook
|
{ fetchFromGitHub, fetchpatch, stdenv, lib, pkgconfig, autoreconfHook
|
||||||
, ncurses, gnutls, readline
|
, ncurses, gnutls, readline
|
||||||
, openssl, perl, sqlite, libjpeg, speex, pcre
|
, openssl, perl, sqlite, libjpeg, speex, pcre, libuuid
|
||||||
, ldns, libedit, yasm, which, libsndfile, libtiff
|
, ldns, libedit, yasm, which, libsndfile, libtiff
|
||||||
|
|
||||||
, callPackage
|
, callPackage
|
||||||
|
@ -88,13 +88,21 @@ in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "freeswitch";
|
pname = "freeswitch";
|
||||||
version = "1.10.3";
|
version = "1.10.5";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "signalwire";
|
owner = "signalwire";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
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 = ''
|
postPatch = ''
|
||||||
patchShebangs libs/libvpx/build/make/rtcd.pl
|
patchShebangs libs/libvpx/build/make/rtcd.pl
|
||||||
substituteInPlace libs/libvpx/build/make/configure.sh \
|
substituteInPlace libs/libvpx/build/make/configure.sh \
|
||||||
|
@ -114,6 +122,7 @@ stdenv.mkDerivation rec {
|
||||||
openssl ncurses gnutls readline perl libjpeg
|
openssl ncurses gnutls readline perl libjpeg
|
||||||
sqlite pcre speex ldns libedit yasm which
|
sqlite pcre speex ldns libedit yasm which
|
||||||
libsndfile libtiff
|
libsndfile libtiff
|
||||||
|
libuuid
|
||||||
]
|
]
|
||||||
++ lib.unique (lib.concatMap (mod: mod.inputs) enabledModules)
|
++ lib.unique (lib.concatMap (mod: mod.inputs) enabledModules)
|
||||||
++ lib.optionals stdenv.isDarwin [ SystemConfiguration ];
|
++ lib.optionals stdenv.isDarwin [ SystemConfiguration ];
|
||||||
|
|
|
@ -9,6 +9,8 @@
|
||||||
, ffmpeg
|
, ffmpeg
|
||||||
, libmysqlclient
|
, libmysqlclient
|
||||||
, postgresql
|
, postgresql
|
||||||
|
, spandsp
|
||||||
|
, sofia_sip
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -68,7 +70,7 @@ in
|
||||||
snom = mk "applications/mod_snom" [];
|
snom = mk "applications/mod_snom" [];
|
||||||
sonar = mk "applications/mod_sonar" [];
|
sonar = mk "applications/mod_sonar" [];
|
||||||
soundtouch = mk "applications/mod_soundtouch" [];
|
soundtouch = mk "applications/mod_soundtouch" [];
|
||||||
spandsp = mk "applications/mod_spandsp" [];
|
spandsp = mk "applications/mod_spandsp" [ spandsp ];
|
||||||
spy = mk "applications/mod_spy" [];
|
spy = mk "applications/mod_spy" [];
|
||||||
stress = mk "applications/mod_stress" [];
|
stress = mk "applications/mod_stress" [];
|
||||||
translate = mk "applications/mod_translate" [];
|
translate = mk "applications/mod_translate" [];
|
||||||
|
@ -136,7 +138,7 @@ in
|
||||||
rtc = mk "endpoints/mod_rtc" [];
|
rtc = mk "endpoints/mod_rtc" [];
|
||||||
rtmp = mk "endpoints/mod_rtmp" [];
|
rtmp = mk "endpoints/mod_rtmp" [];
|
||||||
skinny = mk "endpoints/mod_skinny" [];
|
skinny = mk "endpoints/mod_skinny" [];
|
||||||
sofia = mk "endpoints/mod_sofia" [];
|
sofia = mk "endpoints/mod_sofia" [ sofia_sip ];
|
||||||
verto = mk "endpoints/mod_verto" [];
|
verto = mk "endpoints/mod_verto" [];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue