Merge pull request #280963 from atorres1985-contrib/live555
Live555 updates
This commit is contained in:
commit
94cbab5a90
95
pkgs/by-name/li/live555/package.nix
Normal file
95
pkgs/by-name/li/live555/package.nix
Normal file
@ -0,0 +1,95 @@
|
|||||||
|
{ lib
|
||||||
|
, darwin
|
||||||
|
, fetchurl
|
||||||
|
, fetchpatch
|
||||||
|
, openssl
|
||||||
|
, stdenv
|
||||||
|
, vlc
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
|
pname = "live555";
|
||||||
|
version = "2023.11.30";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
urls = [
|
||||||
|
"http://www.live555.com/liveMedia/public/live.${finalAttrs.version}.tar.gz"
|
||||||
|
"https://src.rrz.uni-hamburg.de/files/src/live555/live.${finalAttrs.version}.tar.gz"
|
||||||
|
"https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz"
|
||||||
|
"mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz"
|
||||||
|
];
|
||||||
|
hash = "sha256-xue+9YtdAM2XkzAY6dU2PZ3n6bvPwlULIHqBqc8wuSU=";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
name = "cflags-when-darwin.patch";
|
||||||
|
url = "https://github.com/rgaufman/live555/commit/16701af5486bb3a2d25a28edaab07789c8a9ce57.patch?full_index=1";
|
||||||
|
hash = "sha256-IDSdByBu/EBLsUTBe538rWsDwH61RJfAEhvT68Nb9rU=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeBuildInputs = lib.optionals stdenv.isDarwin [
|
||||||
|
darwin.cctools
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
openssl
|
||||||
|
];
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
|
|
||||||
|
# Since NIX_CFLAGS_COMPILE does not differentiate C and C++ toolchains, we
|
||||||
|
# set CXXFLAGS directly
|
||||||
|
env.CXXFLAGS = "-std=c++20";
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace config.macosx-catalina \
|
||||||
|
--replace '/usr/lib/libssl.46.dylib' "${lib.getLib openssl}/lib/libssl.dylib" \
|
||||||
|
--replace '/usr/lib/libcrypto.44.dylib' "${lib.getLib openssl}/lib/libcrypto.dylib"
|
||||||
|
sed -i -e 's|/bin/rm|rm|g' genMakefiles
|
||||||
|
sed -i \
|
||||||
|
-e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \
|
||||||
|
config.linux
|
||||||
|
''
|
||||||
|
# condition from icu/base.nix
|
||||||
|
+ lib.optionalString (stdenv.hostPlatform.libc == "glibc"
|
||||||
|
|| stdenv.hostPlatform.libc == "musl") ''
|
||||||
|
substituteInPlace liveMedia/include/Locale.hh \
|
||||||
|
--replace '<xlocale.h>' '<locale.h>'
|
||||||
|
'';
|
||||||
|
|
||||||
|
configurePhase = let
|
||||||
|
platform = if stdenv.isLinux
|
||||||
|
then "linux"
|
||||||
|
else if stdenv.isDarwin
|
||||||
|
then "macosx-catalina"
|
||||||
|
else throw "Unsupported platform: ${stdenv.hostPlatform.system}";
|
||||||
|
in ''
|
||||||
|
runHook preConfigure
|
||||||
|
|
||||||
|
./genMakefiles ${platform}
|
||||||
|
|
||||||
|
runHook postConfigure
|
||||||
|
'';
|
||||||
|
|
||||||
|
makeFlags = [
|
||||||
|
"PREFIX=${placeholder "out"}"
|
||||||
|
];
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.tests = {
|
||||||
|
# Downstream dependency
|
||||||
|
inherit vlc;
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = "http://www.live555.com/liveMedia/";
|
||||||
|
description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)";
|
||||||
|
changelog = "http://www.live555.com/liveMedia/public/changelog.txt";
|
||||||
|
license = with lib.licenses; [ lgpl21Plus ];
|
||||||
|
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||||
|
platforms = lib.platforms.unix;
|
||||||
|
};
|
||||||
|
})
|
@ -1,75 +0,0 @@
|
|||||||
{ lib
|
|
||||||
, stdenv
|
|
||||||
, fetchurl
|
|
||||||
, darwin
|
|
||||||
, openssl
|
|
||||||
|
|
||||||
# major and only downstream dependency
|
|
||||||
, vlc
|
|
||||||
}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "live555";
|
|
||||||
version = "2023.05.10";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
urls = [
|
|
||||||
"http://www.live555.com/liveMedia/public/live.${version}.tar.gz"
|
|
||||||
"https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
|
|
||||||
"mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
|
|
||||||
];
|
|
||||||
sha256 = "sha256-6ph9x4UYELkkJVIE9r25ycc5NOYbPcgAy9LRZebvGFY=";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools;
|
|
||||||
|
|
||||||
buildInputs = [ openssl ];
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace config.macosx-catalina \
|
|
||||||
--replace '/usr/lib/libssl.46.dylib' "${lib.getLib openssl}/lib/libssl.dylib" \
|
|
||||||
--replace '/usr/lib/libcrypto.44.dylib' "${lib.getLib openssl}/lib/libcrypto.dylib"
|
|
||||||
sed -i -e 's|/bin/rm|rm|g' genMakefiles
|
|
||||||
sed -i \
|
|
||||||
-e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \
|
|
||||||
config.linux
|
|
||||||
'' # condition from icu/base.nix
|
|
||||||
+ lib.optionalString (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") ''
|
|
||||||
substituteInPlace liveMedia/include/Locale.hh \
|
|
||||||
--replace '<xlocale.h>' '<locale.h>'
|
|
||||||
'';
|
|
||||||
|
|
||||||
configurePhase = ''
|
|
||||||
runHook preConfigure
|
|
||||||
|
|
||||||
./genMakefiles ${
|
|
||||||
if stdenv.isLinux then
|
|
||||||
"linux"
|
|
||||||
else if stdenv.isDarwin then
|
|
||||||
"macosx-catalina"
|
|
||||||
else
|
|
||||||
throw "Unsupported platform ${stdenv.hostPlatform.system}"}
|
|
||||||
|
|
||||||
runHook postConfigure
|
|
||||||
'';
|
|
||||||
|
|
||||||
makeFlags = [
|
|
||||||
"DESTDIR=${placeholder "out"}"
|
|
||||||
"PREFIX="
|
|
||||||
];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
passthru.tests = {
|
|
||||||
inherit vlc;
|
|
||||||
};
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
homepage = "http://www.live555.com/liveMedia/";
|
|
||||||
description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)";
|
|
||||||
changelog = "http://www.live555.com/liveMedia/public/changelog.txt";
|
|
||||||
license = licenses.lgpl21Plus;
|
|
||||||
maintainers = with maintainers; [ AndersonTorres ];
|
|
||||||
platforms = platforms.unix;
|
|
||||||
};
|
|
||||||
}
|
|
@ -23825,8 +23825,6 @@ with pkgs;
|
|||||||
|
|
||||||
litehtml = callPackage ../development/libraries/litehtml { };
|
litehtml = callPackage ../development/libraries/litehtml { };
|
||||||
|
|
||||||
live555 = callPackage ../development/libraries/live555 { };
|
|
||||||
|
|
||||||
llhttp = callPackage ../development/libraries/llhttp { };
|
llhttp = callPackage ../development/libraries/llhttp { };
|
||||||
|
|
||||||
log4cpp = callPackage ../development/libraries/log4cpp { };
|
log4cpp = callPackage ../development/libraries/log4cpp { };
|
||||||
|
Loading…
Reference in New Issue
Block a user