Bump version to 2.23.1

Update NEWS.rst
Merge jackaudio/develop into LADI/main
2023-12-20 12:49:50 +02:00 · 2023-12-20 12:44:57 +02:00 · 2023-12-20 12:42:32 +02:00 · 2023-12-20 12:38:20 +02:00 · 2023-12-09 20:32:37 +01:00 · 2023-12-09 15:21:22 +01:00
3 changed files with 4 additions and 3 deletions
--- a/NEWS.rst
+++ b/NEWS.rst
@ -1,7 +1,7 @@

 #########

-* LADI jack2 2.23.0 (20XX-XX-XX)
+* LADI jack2 2.23.1 (2023-12-20)

  * Upgrade waf to 2.0.26
    xcode support was dropped.
@ -37,6 +37,7 @@
  * The string returned by jack_get_version_string()
    now contains libjackserver.so.0 mtime
  * Make jack_get_descriptor internal client message a verbose log
+  * Fix deadlock with pthread_cond_timedwait() (by Florian Walpen)

 * LADI jack2 2.22.1 (2023-02-18)

--- a/posix/JackPosixProcessSync.cpp
+++ b/posix/JackPosixProcessSync.cpp
@ -122,7 +122,7 @@ bool JackPosixProcessSync::TimedWait(long usec)
    time.tv_nsec = (next_date_usec % 1000000) * 1000;

    res = pthread_cond_timedwait(&fCond, &fMutex, &time);
-    if (res != 0) {
+    if (res != 0 && res != ETIMEDOUT) {
        jack_error("JackPosixProcessSync::TimedWait error usec = %ld err = %s", usec, strerror(res));
    } else {
        fOwner = pthread_self();
--- a/2
+++ b/2
@ -34,7 +34,7 @@ from waftoolchainflags import WafToolchainFlags
 APPNAME = 'ladi-jack'
 JACK_VERSION_MAJOR = 2
 JACK_VERSION_MINOR = 23
-JACK_VERSION_PATCH = 0
+JACK_VERSION_PATCH = 1

 VERSION = str(JACK_VERSION_MAJOR) + '.' + str(JACK_VERSION_MINOR) + '.' + str(JACK_VERSION_PATCH)
Author	SHA1	Message	Date
Nedko Arnaudov	7b534b955c	Bump version to 2.23.1	2023-12-20 12:49:50 +02:00
Nedko Arnaudov	dc5bc8e453	Update NEWS.rst	2023-12-20 12:44:57 +02:00
Nedko Arnaudov	ebb23d5ad6	Merge jackaudio/develop into LADI/main * Fix deadlock with pthread_cond_timedwait() (by Florian Walpen)	2023-12-20 12:42:32 +02:00
Nedko Arnaudov	6ca3e69d93	Quazi-merge jackaudio/develop (with -s ours) into LADI/main	2023-12-20 12:38:20 +02:00
Florian Walpen	886b35c3bd	JackPosixProcessSync: Fix mutex owner on TimedWait() timeout. Per POSIX definition, pthread_cond_timedwait() re-acquires the mutex when a timeout occurs and ETIMEDOUT is returned. In that case also mark the waiting thread as owner again, for consistency. Otherwise subsequent attempts to unlock the mutex will fail, leaving the mutex locked forever.	2023-12-09 20:32:37 +01:00
Florian Walpen	f14409bb92	CI: Update FreeBSD images to 13.2-RELEASE and 14.0-RELEASE.	2023-12-09 15:21:22 +01:00
falkTX	806da09a12	Allow portaudio driver on any system, use device reservation too Signed-off-by: falkTX <falktx@falktx.com>	2023-12-03 12:29:07 +01:00
falkTX	7d08d7f24e	Add to last commit, make use of HAVE_DBUS_1 Signed-off-by: falkTX <falktx@falktx.com>	2023-12-03 12:27:49 +01:00
falkTX	0dc60f526c	Add 'libdbus' option for classic builds with device reservation Signed-off-by: falkTX <falktx@falktx.com>	2023-12-03 11:24:56 +01:00