jack: upgrade 1.19.16 -> 1.19.17

removed patch was merged

1.9.17

    Fix jack_control stopping after first command iteration
    Fix library compat/current version under macOS
    Fix return codes of jackd on success
    Ignore DB_VERSION_MISMATCH error on windows, it is expected
    Remove old workaround for asio4all, as it breaks with jack-router

External changes, related to macOS/Windows installer:

    Add jack-router to Windows installer, opt-in
    Fix registry keys for Windows, add 32bit compat ones on 64bit
    Support for arm64 macOS builds
    Show welcome and license pages on windows installer
    Update QjackCtl used in macOS/Windows installers to v0.9.0, with some commits cherry-picked from develop branch

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Andreas Müller
2021-01-21 23:54:55 +01:00
committed by Khem Raj
parent 09eb0ad187
commit 2e5414c838
2 changed files with 1 additions and 64 deletions
@@ -1,62 +0,0 @@
From 83068f9b71aea16d1ad036fdcc326de1027b5585 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 15 Nov 2020 22:13:29 -0800
Subject: [PATCH] Use SYS_futex instead of __NR_futex
SYS_futex is expected from system C library.
in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex)
rv32 is using 64bit time_t from get go unlike other 32bit architectures
in glibc, therefore it wont have NR_futex defined but just NR_futex_time64
this aliases it to NR_futex so that SYS_futex is then defined for rv32
Upstream-Status: Submitted [https://github.com/jackaudio/jack2/pull/670]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
linux/JackLinuxFutex.cpp | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/linux/JackLinuxFutex.cpp b/linux/JackLinuxFutex.cpp
index deff006b..aef99cd2 100644
--- a/linux/JackLinuxFutex.cpp
+++ b/linux/JackLinuxFutex.cpp
@@ -29,6 +29,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <syscall.h>
#include <linux/futex.h>
+#if !defined(SYS_futex) && defined(SYS_futex_time64)
+#define SYS_futex SYS_futex_time64
+#endif
+
namespace Jack
{
@@ -67,7 +71,7 @@ bool JackLinuxFutex::Signal()
if (! fFutex->internal) return true;
}
- ::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1, NULL, NULL, 0);
+ ::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1, NULL, NULL, 0);
return true;
}
@@ -94,7 +98,7 @@ bool JackLinuxFutex::Wait()
if (__sync_bool_compare_and_swap(&fFutex->futex, 1, 0))
return true;
- if (::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, NULL, NULL, 0) != 0 && errno != EWOULDBLOCK)
+ if (::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, NULL, NULL, 0) != 0 && errno != EWOULDBLOCK)
return false;
}
}
@@ -122,7 +126,7 @@ bool JackLinuxFutex::TimedWait(long usec)
if (__sync_bool_compare_and_swap(&fFutex->futex, 1, 0))
return true;
- if (::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, &timeout, NULL, 0) != 0 && errno != EWOULDBLOCK)
+ if (::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, &timeout, NULL, 0) != 0 && errno != EWOULDBLOCK)
return false;
}
}
--
2.29.2
@@ -16,9 +16,8 @@ DEPENDS = "libsamplerate0 libsndfile1 readline"
SRC_URI = "git://github.com/jackaudio/jack2.git \
file://0001-example-clients-Use-c-compiler-for-jack_simdtests.patch \
file://0001-Use-SYS_futex-instead-of-__NR_futex.patch \
"
SRCREV = "5b78c2ef158c2d9ffe09818a7dd80209ed251c5f"
SRCREV = "9e23888b8def6527774889cf4ef6348fb78c7154"
S = "${WORKDIR}/git"