Merge pull request #89556 from helsinki-systems/freeswitch-formats

freeswitch: Add support for mod_opusfile
This commit is contained in:
Lassulus 2020-06-06 11:51:11 +02:00 committed by GitHub
commit 4b891a5643
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions

View file

@ -3,7 +3,7 @@
, openssl, perl, sqlite, libjpeg, speex, pcre
, ldns, libedit, yasm, which, libsndfile, libtiff
, curl, lua, libmysqlclient, postgresql, libopus, libctb, gsmlib
, callPackage
, SystemConfiguration
@ -13,9 +13,7 @@
let
availableModules = import ./modules.nix {
inherit curl lua libmysqlclient postgresql libopus libctb gsmlib;
};
availableModules = callPackage ./modules.nix { };
# the default list from v1.8.7, except with applications/mod_signalwire also disabled
defaultModules = mods: with mods; [

View file

@ -1,8 +1,12 @@
{ libopus
, opusfile
, libopusenc
, libogg
, libctb
, gsmlib
, lua
, curl
, ffmpeg
, libmysqlclient
, postgresql
}:
@ -17,7 +21,7 @@ in
{
applications = {
abstraction = mk "applications/mod_abstraction" [];
av = mk "applications/mod_av" [];
av = mk "applications/mod_av" [ ffmpeg ];
avmd = mk "applications/mod_avmd" [];
bert = mk "applications/mod_bert" [];
blacklist = mk "applications/mod_blacklist" [];
@ -161,6 +165,7 @@ in
imagick = mk "formats/mod_imagick" [];
local_stream = mk "formats/mod_local_stream" [];
native_file = mk "formats/mod_native_file" [];
opusfile = mk "formats/mod_opusfile" [ libopus opusfile libopusenc libogg ];
png = mk "formats/mod_png" [];
portaudio_stream = mk "formats/mod_portaudio_stream" [];
shell_stream = mk "formats/mod_shell_stream" [];
@ -169,6 +174,7 @@ in
ssml = mk "formats/mod_ssml" [];
tone_stream = mk "formats/mod_tone_stream" [];
vlc = mk "formats/mod_vlc" [];
webm = mk "formats/mod_webm" [];
};
languages = {