JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #153751 from elohmeier/baresip-update

Browse Source 
baresip: 0.6.5 -> 1.1.0
This commit is contained in:
7c6f434c 2022-01-06 19:18:15 +00:00 committed by GitHub
commit 9a394ae4d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 114 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
pkgs/applications/networking/instant-messengers/baresip/default.nix
View File

@ -1,17 +1,60 @@
{ lib, stdenv, fetchurl, zlib, openssl, libre, librem, pkg-config, gst_all_1
, cairo, mpg123, alsa-lib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg
, gsm, speex, portaudio, spandsp, libuuid, libvpx
{ lib
, stdenv
, fetchFromGitHub
, zlib
, openssl
, libre
, librem
, pkg-config
, gst_all_1
, cairo
, mpg123
, alsa-lib
, SDL2
, libv4l
, celt
, libsndfile
, srtp
, ffmpeg
, gsm
, speex
, portaudio
, spandsp3
, libuuid
, libvpx
}:
stdenv.mkDerivation rec {
version = "0.6.5";
version = "1.1.0";
pname = "baresip";
src=fetchurl {
url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
sha256 = "13di0ycdcr2q2a20mjvyaqfmvk5xldwqaxklqsz7470jnbc5n0rb";
src = fetchFromGitHub {
owner = "baresip";
repo = "baresip";
rev = "v${version}";
sha256 = "sha256-9mc1Beo7/iNhDXSDC/jiTL+lJRt8ah/1xF1heoHTE+g=";
};
postPatch = ''
patchShebangs modules/ctrl_dbus/gen.sh
'';
nativeBuildInputs = [ pkg-config ];
buildInputs = [zlib openssl libre librem cairo mpg123
alsa-lib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid
buildInputs = [
zlib
openssl
libre
librem
cairo
mpg123
alsa-lib
SDL2
libv4l
celt
libsndfile
srtp
ffmpeg
gsm
speex
portaudio
spandsp3
libuuid
libvpx
] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]);
makeFlags = [
@ -23,15 +66,42 @@ stdenv.mkDerivation rec {
"USE_VIDEO=1"
"CCACHE_DISABLE=1"
"USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1"
"USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST1=1"
"USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1" "USE_VPX=1"
"USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1"
"USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1"
"USE_STDIO=1" "USE_SYSLOG=1" "USE_UUID=1" "USE_V4L2=1" "USE_X11=1"
"USE_ALSA=1"
"USE_AMR=1"
"USE_CAIRO=1"
"USE_CELT=1"
"USE_CONS=1"
"USE_EVDEV=1"
"USE_FFMPEG=1"
"USE_GSM=1"
"USE_GST1=1"
"USE_L16=1"
"USE_MPG123=1"
"USE_OSS=1"
"USE_PLC=1"
"USE_VPX=1"
"USE_PORTAUDIO=1"
"USE_SDL=1"
"USE_SNDFILE=1"
"USE_SPEEX=1"
"USE_SPEEX_AEC=1"
"USE_SPEEX_PP=1"
"USE_SPEEX_RESAMP=1"
"USE_SRTP=1"
"USE_STDIO=1"
"USE_SYSLOG=1"
"USE_UUID=1"
"USE_V4L2=1"
"USE_X11=1"
"USE_BV32=" "USE_COREAUDIO=" "USE_G711=1" "USE_G722=1" "USE_G722_1="
"USE_ILBC=" "USE_OPUS=" "USE_SILK="
"USE_BV32="
"USE_COREAUDIO="
"USE_G711=1"
"USE_G722=1"
"USE_G722_1="
"USE_ILBC="
"USE_OPUS="
"USE_SILK="
]
++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"
@ -40,13 +110,11 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = '' -I${librem}/include/rem -I${gsm}/include/gsm
-DHAVE_INTTYPES_H -D__GLIBC__
-D__need_timeval -D__need_timespec -D__need_time_t '';
meta = {
homepage = "http://www.creytiv.com/baresip.html";
platforms = with lib.platforms; linux;
maintainers = with lib.maintainers; [raskin];
description = "A modular SIP User-Agent with audio and video support";
homepage = "https://github.com/baresip/baresip";
maintainers = with lib.maintainers; [ elohmeier raskin ];
license = lib.licenses.bsd3;
downloadPage = "http://www.creytiv.com/pub/";
updateWalker = true;
downloadURLRegexp = "/baresip-.*[.]tar[.].*";
};
}

20
pkgs/development/libraries/libre/default.nix
View File

@ -1,10 +1,12 @@
{lib, stdenv, fetchurl, zlib, openssl}:
{ lib, stdenv, fetchFromGitHub, zlib, openssl }:
stdenv.mkDerivation rec {
version = "0.6.1";
version = "2.0.1";
pname = "libre";
src = fetchurl {
url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
sha256 = "0hzyc0hdlw795nyx6ik7h2ihs8wapbj32x8c40xq0484ciwzqnyd";
src = fetchFromGitHub {
owner = "baresip";
repo = "re";
rev = "v${version}";
sha256 = "sha256-/1J9cs0W96CtnHAoX/jg3FLGD9coa0eOEgf8uMQHuUk=";
};
buildInputs = [ zlib openssl ];
makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ]
@ -13,12 +15,8 @@ stdenv.mkDerivation rec {
;
meta = {
description = "A library for real-time communications with async IO support and a complete SIP stack";
homepage = "http://www.creytiv.com/re.html";
platforms = with lib.platforms; linux;
maintainers = with lib.maintainers; [raskin];
homepage = "https://github.com/baresip/re";
maintainers = with lib.maintainers; [ elohmeier raskin ];
license = lib.licenses.bsd3;
downloadPage = "http://www.creytiv.com/pub/";
updateWalker = true;
downloadURLRegexp = "/re-.*[.]tar[.].*";
};
}

20
pkgs/development/libraries/librem/default.nix
View File

@ -1,10 +1,12 @@
{lib, stdenv, fetchurl, zlib, openssl, libre}:
{ lib, stdenv, fetchFromGitHub, zlib, openssl, libre }:
stdenv.mkDerivation rec {
version = "0.6.0";
version = "1.0.0";
pname = "librem";
src=fetchurl {
url = "http://www.creytiv.com/pub/rem-${version}.tar.gz";
sha256 = "0b17wma5w9acizk02isk5k83vv47vf1cf9zkmsc1ail677d20xj1";
src = fetchFromGitHub {
owner = "baresip";
repo = "rem";
rev = "v${version}";
sha256 = "sha256-6Xe9zT0qLLGe1+QCQ9NALoDTaRhHpaTLbCbA+kV7hOA=";
};
buildInputs = [ zlib openssl libre ];
makeFlags = [
@ -17,12 +19,8 @@ stdenv.mkDerivation rec {
;
meta = {
description = "A library for real-time audio and video processing";
homepage = "http://www.creytiv.com/rem.html";
platforms = with lib.platforms; linux;
maintainers = with lib.maintainers; [raskin];
homepage = "https://github.com/baresip/rem";
maintainers = with lib.maintainers; [ elohmeier raskin ];
license = lib.licenses.bsd3;
downloadPage = "http://www.creytiv.com/pub/";
updateWalker = true;
downloadURLRegexp = "/rem-.*[.]tar[.].*";
};
}