Hello community,
here is the log from the commit of package jack for openSUSE:Factory checked in
at 2017-04-24 09:45:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jack (Old)
and /work/SRC/openSUSE:Factory/.jack.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jack"
Mon Apr 24 09:45:45 2017 rev:59 rq:484400 version:1.9.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/jack/jack.changes 2016-04-30
23:27:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.jack.new/jack.changes 2017-04-24
09:45:48.681182007 +0200
@@ -1,0 +2,6 @@
+Sun Apr 2 11:26:15 UTC 2017 - davejpla...@gmail.com
+
+- Fix gcc7 build failure with jack-fixgcc7.patch, sent to github
+ jack2 issue#253
+
+-------------------------------------------------------------------
Old:
----
jack-1.9.10.tar.bz2
New:
----
jack-1.9.10.tar.gz
jack-fixgcc7.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jack.spec ++++++
--- /var/tmp/diff_new_pack.spzxDT/_old 2017-04-24 09:45:49.801023618 +0200
+++ /var/tmp/diff_new_pack.spzxDT/_new 2017-04-24 09:45:49.805023053 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jack
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,15 +19,9 @@
#FIXME: Waf error when using doc build atm
%define buildoc 1
%define debug_package_requires %{name} = %{version}-%{release}
-%if 0%{?suse_version} > 1110
# Switch the --dbus on and off, on = 1
%define wdbus 1
-%if 0%{?suse_version} > 1140
BuildRequires: pkgconfig(libffado) >= 2.0.1.2040
-%endif
-%else
-%define wdbus 0
-%endif
Name: jack
Version: 1.9.10
Release: 0
@@ -36,9 +30,7 @@
License: GPL-2.0+ and LGPL-2.1+
Group: System/Sound Daemons
Url: http://jackaudio.org/
-# http://www.grame.fr/~letz/
-# Source url invalid http://jackaudio.org/downloads/ converted .tgz to bz2
-Source0: %{name}-%{version}.tar.bz2
+Source0:
https://github.com/jackaudio/jack2/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: baselibs.conf
# Without this, there is a link error on SPARC
Patch2: jack-sparcv9.diff
@@ -48,6 +40,8 @@
Patch7: reproducible.patch
# PATCH-FIX-OPENSUSE gcc6-fixes.diff ti...@suse.de -- fix for gcc6 build
failures
Patch8: gcc6-fixes.diff
+# PATCH-FIX-UPSTREAM gcc6-fixes.diff dav...@gmail.com -- fix for gcc 7 build
failures.
+Patch3: jack-fixgcc7.patch
BuildRequires: dos2unix
BuildRequires: doxygen
BuildRequires: fdupes
@@ -115,14 +109,21 @@
communicate with jack clients/servers.
%prep
-%setup -q
+%setup -q -n %{name}2-%{version}
%patch2
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch3
%build
+%if 1 == 0
+%define gcc_version 7
+export CC=gcc-7
+export CPP=cpp-7
+export CXX=g++-7
+%endif
export CFLAGS="%{optflags} -ggdb -fPIC"
export CXXFLAGS="$CFLAGS"
@@ -133,9 +134,7 @@
%if 0%{?wdbus} == 1
--dbus \
%endif
-%if 0%{?suse_version} > 1140
--firewire \
-%endif
%if %{buildoc} == 1
--doxygen \
%endif
@@ -198,9 +197,7 @@
%{_libdir}/%{name}/%{name}_loopback.so*
%{_libdir}/%{name}/%{name}_netone.so*
%{_libdir}/%{name}/jack_alsarawmidi.so
-%if 0%{?suse_version} > 1140
%{_libdir}/%{name}/%{name}_firewire.so
-%endif
%if 0%{?wdbus} == 1
%{_datadir}/dbus-1/services/org.jackaudio.service
%endif
++++++ jack-fixgcc7.patch ++++++
Index: tests/test.cpp
===================================================================
--- tests/test.cpp.orig 2014-07-19 15:34:15.000000000 +0200
+++ tests/test.cpp 2017-04-02 13:02:23.615321226 +0200
@@ -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((int)delta_time -
(int)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);
}
