From 6f0d7a32334dc8c9fe03f91219c05b1ee69b6fa5 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Sat, 13 Feb 2016 18:50:02 -0500 Subject: [PATCH] fix building with gcc6 --- jack-audio-connection-kit.spec | 9 ++++++++- jack-gcc6.patch | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 jack-gcc6.patch diff --git a/jack-audio-connection-kit.spec b/jack-audio-connection-kit.spec index 8d8636d..1c578eb 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: 4%{?dist} +Release: 5%{?dist} # The entire source (~500 files) is a mixture of these three licenses License: GPLv2 and GPLv2+ and LGPLv2+ Group: System Environment/Daemons @@ -34,6 +34,9 @@ Patch4: jack-portnames.patch Patch5: jack-ppc64-long.patch # Fix building with gcc5 Patch6: jack-gcc5.patch +# Fix building with gcc6 +Patch7: jack-gcc6.patch + BuildRequires: alsa-lib-devel BuildRequires: dbus-devel @@ -102,6 +105,7 @@ Small example clients that use the Jack Audio Connection Kit. %patch4 -p1 -b .portnames %patch5 -p1 -b .mpd %patch6 -p1 -b .gcc5 +%patch7 -p1 -b .gcc6 # Fix encoding issues for file in ChangeLog README TODO; do @@ -258,6 +262,9 @@ exit 0 %changelog +* Sat Feb 13 2016 Orcan Ogetbil - 1.9.10-5 +- fix building with gcc6 + * Thu Feb 04 2016 Fedora Release Engineering - 1.9.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/jack-gcc6.patch b/jack-gcc6.patch new file mode 100644 index 0000000..098e08c --- /dev/null +++ b/jack-gcc6.patch @@ -0,0 +1,21 @@ +diff -rupN jack-1.9.10.org/tests/iodelay.cpp jack-1.9.10/tests/iodelay.cpp +--- jack-1.9.10.org/tests/iodelay.cpp 2014-07-18 08:28:13.000000000 -0400 ++++ jack-1.9.10/tests/iodelay.cpp 2016-02-13 18:38:33.280737975 -0500 +@@ -167,8 +167,8 @@ static jack_client_t *jack_handle; + 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 @@ int main (int ac, char *av []) + return 0; + } + +-// -------------------------------------------------------------------------------- +\ No newline at end of file ++// --------------------------------------------------------------------------------