Update to 1.9.14

epel8
Guido Aulisi 5 years ago
parent 8fb166dca3
commit 4b42ea2522

1
.gitignore vendored

@ -6,3 +6,4 @@ jack-1.9.5.tar.bz2
/jack-1.9.10.tar.bz2
/jack2-1.9.12.tar.gz
/jack2-1.9.13.tar.gz
/jack2-1.9.14.tar.gz

@ -1,13 +0,0 @@
diff --git a/dbus/sigsegv.c b/dbus/sigsegv.c
index de316429..0f135ec0 100644
--- a/dbus/sigsegv.c
+++ b/dbus/sigsegv.c
@@ -64,7 +64,7 @@ static void signal_segv(int signum, siginfo_t* info, void*ptr) {
const char *si_code_str;
ucontext_t *ucontext = (ucontext_t*)ptr;
-#if defined(HAVE_UCONTEXT) && defined(HAVE_NGREG)
+#if ( defined(HAVE_UCONTEXT) && defined(HAVE_NGREG) ) || defined(HAVE_EXECINFO_H)
size_t i;
#endif
#if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64)

@ -1,13 +0,0 @@
diff --git a/linux/alsarawmidi/JackALSARawMidiPort.cpp b/linux/alsarawmidi/JackALSARawMidiPort.cpp
index 70e1fa71..8ef0ab65 100644
--- a/linux/alsarawmidi/JackALSARawMidiPort.cpp
+++ b/linux/alsarawmidi/JackALSARawMidiPort.cpp
@@ -109,7 +109,7 @@ JackALSARawMidiPort::JackALSARawMidiPort(const char *client_name, snd_rawmidi_in
}
try {
CreateNonBlockingPipe(fds);
- } catch (std::exception e) {
+ } catch (std::exception& e) {
error_message = e.what();
func = "CreateNonBlockingPipe";
goto close;

@ -1,56 +1,13 @@
diff --git a/doxyfile.in b/doxyfile.in
index ff7bd963..f92e264a 100644
index f92e264a..2335adab 100644
--- a/doxyfile.in
+++ b/doxyfile.in
@@ -38,7 +38,7 @@ PROJECT_NUMBER = @VERSION@
# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
-OUTPUT_DIRECTORY =
+OUTPUT_DIRECTORY = default/
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
# 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -574,21 +574,7 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = @SRCDIR@/common \
- @SRCDIR@/posix \
- @SRCDIR@/macosx \
- @SRCDIR@/macosx/coreaudio/ \
- @SRCDIR@/macosx/coremidi/ \
- @SRCDIR@/linux \
- @SRCDIR@/linux/alsa \
- @SRCDIR@/linux/alsarawmidi \
- @SRCDIR@/linux/firewire \
- @SRCDIR@/windows \
- @SRCDIR@/windows/portaudio \
- @SRCDIR@/windows/winmme \
- @SRCDIR@/solaris \
- @SRCDIR@/solaris/oss \
- @SRCDIR@/common/jack/
+INPUT = @SRCDIR@/common/jack/
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -806,7 +792,7 @@ HTML_HEADER =
@@ -792,7 +792,7 @@ HTML_HEADER =
# each generated HTML page. If it is left blank doxygen will generate a
# standard footer.
-HTML_FOOTER =
+HTML_FOOTER = @SRCDIR@/no_date_footer.html
-HTML_FOOTER = @SRCDIR@/no_date_footer.html
+HTML_FOOTER =
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
# style sheet that is used by each HTML page. It can be used to
diff --git a/no_date_footer.html b/no_date_footer.html
new file mode 100644
index 00000000..8bf8be6b
--- /dev/null
+++ b/no_date_footer.html
@@ -0,0 +1,5 @@
+<hr size="1"><address style="text-align: right;"><small>
+Generated for $projectname by <a href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a>
+$doxygenversion</small></address>
+</body>
+</html>

@ -1,110 +0,0 @@
diff --git a/common/wscript b/common/wscript
index afc251a2..70503788 100644
--- a/common/wscript
+++ b/common/wscript
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
# encoding: utf-8
import re
diff --git a/compat/alloca/wscript b/compat/alloca/wscript
index 36798973..9e740f1c 100644
--- a/compat/alloca/wscript
+++ b/compat/alloca/wscript
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# encoding: utf-8
#
# Copyright (C) 2018 Karl Linden <karl.j.linden@gmail.com>
diff --git a/compat/wscript b/compat/wscript
index e3ec8d33..25eb2a3f 100644
--- a/compat/wscript
+++ b/compat/wscript
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# encoding: utf-8
#
# Copyright (C) 2018 Karl Linden <karl.j.linden@gmail.com>
diff --git a/dbus/wscript b/dbus/wscript
index 535d4121..fa40b4f1 100644
--- a/dbus/wscript
+++ b/dbus/wscript
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
# encoding: utf-8
import os.path
diff --git a/example-clients/jack_control b/example-clients/jack_control
index 61ac40c1..54277543 100755
--- a/example-clients/jack_control
+++ b/example-clients/jack_control
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
from __future__ import print_function
name_base = 'org.jackaudio'
diff --git a/example-clients/wscript b/example-clients/wscript
index 6163d222..a8857aa7 100644
--- a/example-clients/wscript
+++ b/example-clients/wscript
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
# encoding: utf-8
example_programs = {
diff --git a/man/wscript b/man/wscript
index 9e4d3043..def57078 100644
--- a/man/wscript
+++ b/man/wscript
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
# encoding: utf-8
import re
diff --git a/systemd/wscript b/systemd/wscript
index fc8b8f15..d10bdf96 100644
--- a/systemd/wscript
+++ b/systemd/wscript
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
# encoding: utf-8
diff --git a/tests/wscript b/tests/wscript
index 756fd3bb..96a63bc9 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
# encoding: utf-8
test_programs = {
diff --git a/waf b/waf
index a2efc852..845fba5e 100755
--- a/waf
+++ b/waf
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# encoding: latin-1
# Thomas Nagy, 2005-2018
#
diff --git a/wscript b/wscript
index 5e8485e6..7e48f750 100644
--- a/wscript
+++ b/wscript
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
# encoding: utf-8
from __future__ import print_function

@ -10,25 +10,21 @@
Summary: The Jack Audio Connection Kit
Name: jack-audio-connection-kit
Version: 1.9.13
Release: 3%{?dist}
Version: 1.9.14
Release: 1%{?dist}
# The entire source (~500 files) is a mixture of these three licenses
License: GPLv2 and GPLv2+ and LGPLv2+
URL: http://www.jackaudio.org
Source0: https://github.com/jackaudio/jack2/releases/download/v%{version}/jack2-%{version}.tar.gz
Source0: https://github.com/jackaudio/jack2/releases/download/v%{version}/v%{version}.tar.gz#/jack2-%{version}.tar.gz
Source1: %{name}-README.Fedora
Source2: %{name}-script.pa
Source3: %{name}-limits.conf
# Generate this file in the GIT repo by running ./svnversion_regenerate.sh svnversion.h
Source4: svnversion.h
# Patch doxygen documentation
Patch0: %{name}-doxygen.patch
# Adjust default priority. RHBZ#795094
Patch1: jack-realtime-compat.patch
# Proper Python2 shebangs
Patch2: %{name}-python-shebang.patch
# Catch exception by reference, patch sent upstream https://github.com/jackaudio/jack2/pull/511
Patch3: %{name}-catchbyreference.patch
# Fix compilation on arm, patch sent upstream https://github.com/jackaudio/jack2/pull/512
Patch4: %{name}-arm.patch
BuildRequires: alsa-lib-devel
BuildRequires: dbus-devel
@ -89,6 +85,7 @@ Small example clients that use the Jack Audio Connection Kit.
%autosetup -p1 -n jack2-%{version}
%build
cp -p %{SOURCE4} .
%set_build_flags
export PREFIX=%{_prefix}
python3 ./waf configure \
@ -231,6 +228,9 @@ exit 0
%changelog
* Fri Dec 06 2019 Guido Aulisi <guido.aulisi@gmail.com> - 1.9.14-1
- Update to 1.9.14
* Tue Oct 29 2019 Jan Beran <jaberan@redhat.com> - 1.9.13-3
- Do not use libffado if building flatpak

@ -1 +1 @@
SHA512 (jack2-1.9.13.tar.gz) = dd83a6535cf92a3c45b5ed31edda5f1cb4a6c1db2ac683d4ea709e226bc30d55b366ce80ee543dfaa600f871079f3754e9314124093e230dc7deeceb828de8aa
SHA512 (jack2-1.9.14.tar.gz) = ca9738fd5aadcb7e125f98a358437905959afebe0b792cab316fc31410e89ea3aefdb85154792a9d0a80fa988aa7eff379ff5c7ac6c4bfa1d57ad3d7de7b5fdd

@ -0,0 +1 @@
#define SVN_VERSION "0+b54a09bf7ef760d81fdb8544ad10e45575394624"
Loading…
Cancel
Save