Skip to content

live555: 2019.11.22 -> 2022.01.21 #155725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndersonTorres merged 2 commits into from
Jan 26, 2022
Merged

live555: 2019.11.22 -> 2022.01.21 #155725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
460fdfc
live555: 2019.11.22 -> 2022.01.21
FliegendeWurst Jan 19, 2022
ca07883
vlc: patch for recent live555 versions
FliegendeWurst Jan 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkgs/applications/video/vlc/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,16 @@ stdenv.mkDerivation rec {
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/4250fe8f28c220d883db454cec2b2c76a07473eb/trunk/vlc-3.0.11.1-srt_1.4.2.patch";
sha256 = "53poWjZfwq/6l316sqiCp0AtcGweyXBntcLDFPSokHQ=";
})
# patches to build with recent live555
# upstream issue: https://code.videolan.org/videolan/vlc/-/issues/25473
(fetchpatch {
url = "https://code.videolan.org/videolan/vlc/uploads/3c84ea58d7b94d7a8d354eaffe4b7d55/0001-Get-addr-by-ref.-from-getConnectionEndpointAddress.patch";
sha256 = "171d3qjl9a4dm13sqig3ra8s2zcr76wfnqz4ba4asg139cyc1axd";
})
(fetchpatch {
url = "https://code.videolan.org/videolan/vlc/uploads/eb1c313d2d499b8a777314f789794f9d/0001-Add-lssl-and-lcrypto-to-liblive555_plugin_la_LIBADD.patch";
sha256 = "0kyi8q2zn2ww148ngbia9c7qjgdrijf4jlvxyxgrj29cb5iy1kda";
})
];

postPatch = ''
Expand Down
13 changes: 9 additions & 4 deletions pkgs/development/libraries/live555/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
{ stdenv, fetchurl, lib, darwin }:
{ stdenv, fetchurl, lib, darwin, openssl }:

# Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD
stdenv.mkDerivation rec {
pname = "live555";
version = "2019.11.22";
version = "2022.01.21";

src = fetchurl { # the upstream doesn't provide a stable URL
urls = [
"mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
"https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
];
sha256 = "144y2wsfpaclkj7srx85f3y3parzn7vbjmzc2afc62wdsb9gn46d";
sha256 = "03m9wgw06vs93nbd55yq8qjpm92mcg9j7cih8j6blfnv8b0pj9bn";
};

postPatch = ''
sed 's,/bin/rm,rm,g' -i genMakefiles
substituteInPlace config.macosx-catalina \
--replace '/usr/lib/libssl.46.dylib' "${openssl.out}/lib/libssl.dylib" \
--replace '/usr/lib/libcrypto.44.dylib' "${openssl.out}/lib/libcrypto.dylib"
sed \
-e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \
-i config.linux
Expand All @@ -27,7 +30,7 @@ stdenv.mkDerivation rec {
runHook preConfigure

./genMakefiles ${{
x86_64-darwin = "macosx";
x86_64-darwin = "macosx-catalina";
i686-linux = "linux";
x86_64-linux = "linux-64bit";
aarch64-linux = "linux-64bit";
Expand All @@ -50,6 +53,8 @@ stdenv.mkDerivation rec {

nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools;

buildInputs = [ openssl ];

enableParallelBuilding = true;

meta = with lib; {
Expand Down