diff --git a/jack-audio-connection-kit.spec b/jack-audio-connection-kit.spec index afdd7bd..b29fa0e 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: 1%{?dist} +Release: 2%{?dist} # The entire source (~500 files) is a mixture of these three licenses License: GPLv2 and GPLv2+ and LGPLv2+ Group: System Environment/Daemons @@ -32,6 +32,8 @@ Patch3: jack-realtime-compat.patch Patch4: jack-portnames.patch # Fix ppc64 mpd startup issue RHBZ#799552 Patch5: jack-ppc64-long.patch +# Fix building with gcc5 +Patch6: jack-gcc5.patch BuildRequires: alsa-lib-devel BuildRequires: dbus-devel @@ -99,6 +101,7 @@ Small example clients that use the Jack Audio Connection Kit. %patch3 -p1 -b .priority %patch4 -p1 -b .portnames %patch5 -p1 -b .mpd +%patch6 -p1 -b .gcc5 # Fix encoding issues for file in ChangeLog README TODO; do @@ -255,6 +258,9 @@ exit 0 %changelog +* Tue May 12 2015 Nils Philippsen - 1.9.10-2 +- fix building with gcc5 + * Fri Nov 28 2014 Orcan Ogetbil - 1.9.10-1 - update to 1.9.10 diff --git a/jack-gcc5.patch b/jack-gcc5.patch new file mode 100644 index 0000000..f18042c --- /dev/null +++ b/jack-gcc5.patch @@ -0,0 +1,26 @@ +From d3c8e2d8d78899fba40a3e677ed4dbe388d82269 Mon Sep 17 00:00:00 2001 +From: Adrian Knoth +Date: Thu, 18 Sep 2014 18:29:23 +0200 +Subject: [PATCH] Fix FTBFS with clang++ + +Forwarded from http://bugs.debian.org/757820 +--- + common/memops.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/memops.c b/common/memops.c +index 27f6194..2d416b6 100644 +--- a/common/memops.c ++++ b/common/memops.c +@@ -198,7 +198,7 @@ static inline __m128i float_24_sse(__m128 s) + */ + static unsigned int seed = 22222; + +-inline unsigned int fast_rand() { ++static inline unsigned int fast_rand() { + seed = (seed * 96314165) + 907633515; + return seed; + } +-- +2.4.0 +