diff --git a/jack-audio-connection-kit.spec b/jack-audio-connection-kit.spec index 9e4f47f..fab1527 100644 --- a/jack-audio-connection-kit.spec +++ b/jack-audio-connection-kit.spec @@ -11,7 +11,7 @@ Summary: The Jack Audio Connection Kit Name: jack-audio-connection-kit Version: 1.9.10 -Release: 7%{?dist} +Release: 8%{?dist} # The entire source (~500 files) is a mixture of these three licenses License: GPLv2 and GPLv2+ and LGPLv2+ Group: System Environment/Daemons @@ -36,6 +36,8 @@ Patch5: jack-ppc64-long.patch Patch6: jack-gcc5.patch # Fix building with gcc6 Patch7: jack-gcc6.patch +# Fix building with gcc7 +Patch8: jack-gcc7.patch BuildRequires: alsa-lib-devel @@ -106,6 +108,7 @@ Small example clients that use the Jack Audio Connection Kit. %patch5 -p1 -b .mpd %patch6 -p1 -b .gcc5 %patch7 -p1 -b .gcc6 +%patch8 -p1 -b .gcc7 # Fix encoding issues for file in ChangeLog README TODO; do @@ -262,6 +265,9 @@ exit 0 %changelog +* Mon Feb 13 2017 Orcan Ogetbil - 1.9.10-8 +- fix building with gcc7 + * Fri Feb 10 2017 Fedora Release Engineering - 1.9.10-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/jack-gcc7.patch b/jack-gcc7.patch new file mode 100644 index 0000000..4dc43bd --- /dev/null +++ b/jack-gcc7.patch @@ -0,0 +1,12 @@ +diff -rupN jack-1.9.10.org/tests/test.cpp jack-1.9.10/tests/test.cpp +--- jack-1.9.10.org/tests/test.cpp 2014-07-18 08:28:13.000000000 -0400 ++++ jack-1.9.10/tests/test.cpp 2017-02-13 20:24:13.691773753 -0500 +@@ -480,7 +480,7 @@ int process4(jack_nframes_t nframes, voi + 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((int64_t)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); + } +