jackaudio: 1.9.10 -> 1.9.11-RC1

This commit is contained in:
Bart Brouns 2017-06-15 01:47:09 +02:00
parent 11b113541d
commit 9d0441434d
5 changed files with 8 additions and 121 deletions

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2Unstable, libpulseaudio }:
{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio }:
stdenv.mkDerivation rec {
version = "1.1.0";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0mw197l4bci1cjc2z877gxwsvk8r43dr7qiwci2hwl2cjlcnqr2p";
};
buildInputs = [ cmake alsaLib libjack2Unstable libpulseaudio ];
buildInputs = [ cmake alsaLib libjack2 libpulseaudio ];
meta = with stdenv.lib; {
description = "Cross platform audio input and output";

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, python2Packages, makeWrapper
, bash, libsamplerate, libsndfile, readline
{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
, bash, libsamplerate, libsndfile, readline, eigen, celt
# Optional Dependencies
, dbus ? null, libffado ? null, alsaLib ? null
@ -24,32 +24,24 @@ let
in
stdenv.mkDerivation rec {
name = "${prefix}jack2-${version}";
version = "1.9.10";
version = "1.9.11-RC1";
src = fetchFromGitHub {
owner = "jackaudio";
repo = "jack2";
rev = "v${version}";
sha256 = "1a2213l7x6sgqg2hq3yhnpvvvqyskhsmx8j3z0jgjsqwz9xa3wbr";
sha256 = "0i708ar3ll5p8yj0h7ffg84nrn49ap47l2yy75rxyw30cyywhxp4";
};
nativeBuildInputs = [ pkgconfig python makeWrapper ];
buildInputs = [ python libsamplerate libsndfile readline
buildInputs = [ python libsamplerate libsndfile readline eigen celt
optDbus optPythonDBus optLibffado optAlsaLib optLibopus
];
prePatch = ''
patchPhase = ''
substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash
'';
patches = [
./jack-gcc5.patch
(fetchpatch {
url = "https://github.com/jackaudio/jack2/commit/ff1ed2c4524095055140370c1008a2d9cccc5645.patch";
sha256 = "0vywakbmlskvs9ginij9ilk39wjyzg7w6cf1qxp11hb0hj69fir5";
})
];
configurePhase = ''
python waf configure --prefix=$out \
${optionalString (optDbus != null) "--dbus"} \

View file

@ -1,26 +0,0 @@
From d3c8e2d8d78899fba40a3e677ed4dbe388d82269 Mon Sep 17 00:00:00 2001
From: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Date: Thu, 18 Sep 2014 18:29:23 +0200
Subject: [PATCH] Fix FTBFS with clang++
Forwarded from http://bugs.debian.org/757820
---
common/memops.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/memops.c b/common/memops.c
index 27f6194..2d416b6 100644
--- a/common/memops.c
+++ b/common/memops.c
@@ -198,7 +198,7 @@ static inline __m128i float_24_sse(__m128 s)
*/
static unsigned int seed = 22222;
-inline unsigned int fast_rand() {
+static inline unsigned int fast_rand() {
seed = (seed * 96314165) + 907633515;
return seed;
}
--
2.4.0

View file

@ -1,78 +0,0 @@
{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
, bash, libsamplerate, libsndfile, readline, eigen, celt
# Optional Dependencies
, dbus ? null, libffado ? null, alsaLib ? null
, libopus ? null
# Extra options
, prefix ? ""
}:
with stdenv.lib;
let
inherit (python2Packages) python dbus-python;
shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
libOnly = prefix == "lib";
optDbus = shouldUsePkg dbus;
optPythonDBus = if libOnly then null else shouldUsePkg dbus-python;
optLibffado = if libOnly then null else shouldUsePkg libffado;
optAlsaLib = if libOnly then null else shouldUsePkg alsaLib;
optLibopus = shouldUsePkg libopus;
in
stdenv.mkDerivation rec {
name = "${prefix}jack2-unstable-${version}";
version = "2017-02-23";
src = fetchFromGitHub {
owner = "jackaudio";
repo = "jack2";
rev = "4cf826c82c8f865c281833f92f8182d457277b3a";
sha256 = "100pkc324m57ci3fb99d3api6wh6g58lya6ssly9hxyhdsa3i7bk";
};
nativeBuildInputs = [ pkgconfig python makeWrapper ];
buildInputs = [
python
libsamplerate libsndfile readline eigen celt
optDbus optPythonDBus optLibffado optAlsaLib optLibopus
];
patchPhase = ''
substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash
'';
configurePhase = ''
python waf configure --prefix=$out \
${optionalString (optDbus != null) "--dbus"} \
--classic \
${optionalString (optLibffado != null) "--firewire"} \
${optionalString (optAlsaLib != null) "--alsa"} \
--autostart=${if (optDbus != null) then "dbus" else "classic"} \
'';
buildPhase = ''
python waf build
'';
installPhase = ''
python waf install
'' + (if libOnly then ''
rm -rf $out/{bin,share}
rm -rf $out/lib/{jack,libjacknet*,libjackserver*}
'' else ''
wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH
'');
meta = {
description = "JACK audio connection kit, version 2 with jackdbus";
homepage = "http://jackaudio.org";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ goibhniu wkennington ];
};
}

View file

@ -18380,7 +18380,6 @@ with pkgs;
libopus = libopus.override { withCustomModes = true; };
};
libjack2 = jack2Full.override { prefix = "lib"; };
libjack2Unstable = callPackage ../misc/jackaudio/unstable.nix { };
keynav = callPackage ../tools/X11/keynav { };