diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2018-03-08 21:24:37 +0100 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2018-03-08 21:24:37 +0100 |
commit | f2661ed72b23583a75fdd415d07c7638bc19d98e (patch) | |
tree | dc85263d657c7619f831ac0f51cc76758d8358d8 /pkgs/misc/jackaudio | |
parent | db6fb869fbf70f38de4170edf49f0e7fbabd69b3 (diff) |
libjack2: remove clang patch
/cc ZHF #36454
Diffstat (limited to 'pkgs/misc/jackaudio')
-rw-r--r-- | pkgs/misc/jackaudio/clang.patch | 22 | ||||
-rw-r--r-- | pkgs/misc/jackaudio/default.nix | 2 |
2 files changed, 1 insertions, 23 deletions
diff --git a/pkgs/misc/jackaudio/clang.patch b/pkgs/misc/jackaudio/clang.patch deleted file mode 100644 index 131f8c4c04dd4..0000000000000 --- a/pkgs/misc/jackaudio/clang.patch +++ /dev/null @@ -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 { diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index a242f0261c770..a6396fc8c28bf 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -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 \ |