Skip to content
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

Jump to bottom

live555: 2018.02.28 -> 2018.10.17 #50612

Merged
merged 2 commits into from
Nov 18, 2018
Merged

live555: 2018.02.28 -> 2018.10.17 #50612

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
fb81d62
live555: 2018.02.28 -> 2018.10.17
peterhoeg Oct 22, 2018
525e397
live555: broken on aarch64
c0bw3b Nov 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions pkgs/applications/video/vlc/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,17 @@ stdenv.mkDerivation rec {
systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive
libkate libtiger libv4l samba liboggz libass libdvbpsi libva
xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate live555
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
fluidsynth wayland wayland-protocols
] ++ optionals withQt5 [ qtbase qtsvg qtx11extras ]
] ++ optional (!stdenv.hostPlatform.isAarch64) live555
++ optionals withQt5 [ qtbase qtsvg qtx11extras ]
++ optional jackSupport libjack2;

nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ];

enableParallelBuilding = true;

LIVE555_PREFIX = live555;
LIVE555_PREFIX = if (!stdenv.hostPlatform.isAarch64) then live555 else null;

# vlc depends on a c11-gcc wrapper script which we don't have so we need to
# set the path to the compiler
Expand Down
19 changes: 14 additions & 5 deletions pkgs/development/libraries/live555/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
{ stdenv, fetchurl, lib, darwin }:

# Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD
let
version = "2018.02.28";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "live555-${version}";
version = "2018.10.17";

src = fetchurl { # the upstream doesn't provide a stable URL
url = "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz";
sha256 = "0zi47asv1qmb09g321m02q684i3c90vci0mgkdh1mlmx2rbg1d1d";
sha256 = "1s69ipvdc6ldscp0cr1zpsll8xc3qcagr95nl84x7b1rbg4xjs3w";
};

postPatch = ''
Expand All @@ -23,28 +21,39 @@ stdenv.mkDerivation {
'';

configurePhase = ''
runHook preConfigure

./genMakefiles ${{
x86_64-darwin = "macosx";
i686-linux = "linux";
x86_64-linux = "linux-64bit";
aarch64-linux = "linux-64bit";
}.${stdenv.hostPlatform.system}}

runHook postConfigure
'';

installPhase = ''
runHook preInstall

for dir in BasicUsageEnvironment groupsock liveMedia UsageEnvironment; do
install -dm755 $out/{bin,lib,include/$dir}
install -m644 $dir/*.a "$out/lib"
install -m644 $dir/include/*.h* "$out/include/$dir"
done

runHook postInstall
'';

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

enableParallelBuilding = true;

meta = with lib; {
description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)";
homepage = http://www.live555.com/liveMedia/;
license = licenses.lgpl21Plus;
platforms = platforms.unix;
broken = stdenv.hostPlatform.isAarch64;
};
}