diff options
| author | Thomas Orgis | 2017-09-27 09:56:08 +0200 |
|---|---|---|
| committer | Thomas Orgis | 2017-09-27 09:56:22 +0200 |
| commit | d25707e614d4bb03356e31523951ccc0d20293fd (patch) | |
| tree | ed23bb0aa0b8ea16d67371d74909691131f6e35a /audio-drivers | |
| parent | c677b7b873e4e7f02c23e15776a78df3d7e91438 (diff) | |
jack2: fix build
Diffstat (limited to 'audio-drivers')
| -rw-r--r-- | audio-drivers/jack2/HISTORY | 3 | ||||
| -rwxr-xr-x | audio-drivers/jack2/PRE_BUILD | 3 | ||||
| -rw-r--r-- | audio-drivers/jack2/jack2-1.9.10-buildfix.patch | 31 |
3 files changed, 37 insertions, 0 deletions
diff --git a/audio-drivers/jack2/HISTORY b/audio-drivers/jack2/HISTORY index ecf805a1f7..afb6dd4ccb 100644 --- a/audio-drivers/jack2/HISTORY +++ b/audio-drivers/jack2/HISTORY @@ -1,3 +1,6 @@ +2017-09-27 Thomas Orgis <sobukus@sourcemage.org> + * PRE_BUILD, jack2-buildfix.patch: fix build + 2014-10-02 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: added primary dropbox mirror diff --git a/audio-drivers/jack2/PRE_BUILD b/audio-drivers/jack2/PRE_BUILD new file mode 100755 index 0000000000..c9670846df --- /dev/null +++ b/audio-drivers/jack2/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd "$SOURCE_DIRECTORY" && +patch -p0 < "$SCRIPT_DIRECTORY/jack2-1.9.10-buildfix.patch" diff --git a/audio-drivers/jack2/jack2-1.9.10-buildfix.patch b/audio-drivers/jack2/jack2-1.9.10-buildfix.patch new file mode 100644 index 0000000000..19dc5a1a55 --- /dev/null +++ b/audio-drivers/jack2/jack2-1.9.10-buildfix.patch @@ -0,0 +1,31 @@ +--- tests/test.cpp.orig 2017-09-27 09:33:27.704970834 +0200 ++++ tests/test.cpp 2017-09-27 09:35:50.973979582 +0200 +@@ -480,7 +480,7 @@ + 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)abs((long long)(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); + } + +--- tests/iodelay.cpp.orig 2017-09-27 09:41:22.342999815 +0200 ++++ tests/iodelay.cpp 2017-09-27 09:43:49.582008805 +0200 +@@ -167,8 +167,8 @@ + static jack_port_t *jack_capt; + static jack_port_t *jack_play; + +-jack_latency_range_t capture_latency = {-1, -1}; +-jack_latency_range_t playback_latency = {-1, -1}; ++jack_latency_range_t capture_latency = {(jack_nframes_t)-1, (jack_nframes_t)-1}; ++jack_latency_range_t playback_latency = {(jack_nframes_t)-1, (jack_nframes_t)-1}; + + void + latency_cb (jack_latency_callback_mode_t mode, void *arg) +@@ -266,4 +266,4 @@ + return 0; + } + +-// -------------------------------------------------------------------------------- +\ No newline at end of file ++// -------------------------------------------------------------------------------- |