b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

libjack2: remove clang patch

Browse source 
/cc ZHF #36454
This commit is contained in:
Daiderd Jordan 2018-03-08 21:24:37 +01:00
parent db6fb869fb
commit f2661ed72b
No known key found for this signature in database
GPG key ID: D02435D05B810C96
2 changed files with 1 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/misc/jackaudio/clang.patch
View file

@ -1,22 +0,0 @@
diff --git a/tests/test.cpp b/tests/test.cpp
index 8a8a811..31e8459 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg)
jack_nframes_t delta_time = cur_time - last_time;
Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time);
- if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) {
+ if (delta_time > 0 && (jack_nframes_t)fabs(delta_time - cur_buffer_size) > tolerance) {
printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance);
}
@@ -1064,7 +1064,7 @@ int main (int argc, char *argv[])
}
jack_sleep(1 * 1000);
cur_buffer_size = jack_get_buffer_size(client1);
- if (abs((old_buffer_size * factor) - cur_buffer_size) > 5) { // Tolerance needed for dummy driver...
+ if (fabs((old_buffer_size * factor) - cur_buffer_size) > 5) { // Tolerance needed for dummy driver...
printf("!!! ERROR !!! Buffer size has not been changed !\n");
printf("!!! Maybe jack was compiled without the '--enable-resize' flag...\n");
} else {

2
pkgs/misc/jackaudio/default.nix
View file

@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optionals stdenv.isDarwin [ aften AudioToolbox CoreAudio CoreFoundation ];
# CoreFoundation 10.10 doesn't include CFNotificationCenter.h yet.
patches = stdenv.lib.optionals stdenv.isDarwin [ ./clang.patch ./darwin-cf.patch ];
patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin-cf.patch ];
prePatch = ''
substituteInPlace svnversion_regenerate.sh \