diff --git a/x11-packages/ardour/build.sh b/x11-packages/ardour/build.sh index b505dee34b..a383a898dd 100644 --- a/x11-packages/ardour/build.sh +++ b/x11-packages/ardour/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://ardour.org/ TERMUX_PKG_DESCRIPTION="A professional digital workstation for working with audio and MIDI" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="8.7" +TERMUX_PKG_VERSION="8.8" TERMUX_PKG_SRCURL=git+https://github.com/Ardour/ardour TERMUX_PKG_GIT_BRANCH=$TERMUX_PKG_VERSION TERMUX_PKG_DEPENDS="aubio, fftw, fontconfig, gdk-pixbuf, glib, gtk2, gtkmm2, libandroid-execinfo, libarchive, libatkmm-1.6, libc++, libcairo, libcairomm-1.0, libcurl, libglibmm-2.4, liblo, liblrdf, libpangomm-1.4, libsamplerate, libsigc++-2.0, libsndfile, libusb, libwebsockets, libx11, libxml2, lilv, pango, pulseaudio, rubberband, suil, taglib, vamp-plugin-sdk" diff --git a/x11-packages/ardour/pthread_attr_setinheritsched.patch b/x11-packages/ardour/pthread_attr_setinheritsched.patch index bfe9a584da..ff7567fae5 100644 --- a/x11-packages/ardour/pthread_attr_setinheritsched.patch +++ b/x11-packages/ardour/pthread_attr_setinheritsched.patch @@ -1,29 +1,16 @@ -diff -u -r ../cache/tmp-checkout/libs/ardour/io_tasklist.cc ./libs/ardour/io_tasklist.cc ---- ../cache/tmp-checkout/libs/ardour/io_tasklist.cc 2024-09-12 10:52:22.692516638 +0000 -+++ ./libs/ardour/io_tasklist.cc 2024-09-12 10:54:29.286128872 +0000 -@@ -62,7 +62,9 @@ - #endif - pthread_attr_setschedparam (&attr, &parm); - pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM); -+#if !defined __ANDROID__ || __ANDROID_API__ >= 28 - pthread_attr_setinheritsched (&attr, PTHREAD_EXPLICIT_SCHED); -+#endif - - DEBUG_TRACE (PBD::DEBUG::IOTaskList, string_compose ("IOTaskList starting %1 threads with priority = %2\n", _n_threads, parm.sched_priority)); - diff -u -r ../cache/tmp-checkout/libs/pbd/pthread_utils.cc ./libs/pbd/pthread_utils.cc --- ../cache/tmp-checkout/libs/pbd/pthread_utils.cc 2024-09-12 10:52:22.779516386 +0000 +++ ./libs/pbd/pthread_utils.cc 2024-09-12 10:52:23.445514465 +0000 -@@ -355,7 +380,9 @@ +@@ -412,7 +412,9 @@ pthread_attr_setschedpolicy (&attr, policy); pthread_attr_setschedparam (&attr, &parm); pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM); -+#if !defined __ANDROID__ || __ANDROID_API__ >= 28 ++#if !defined __ANDROID__ || __ANDROID_API__ >= 28 pthread_attr_setinheritsched (&attr, PTHREAD_EXPLICIT_SCHED); +#endif - pthread_attr_setstacksize (&attr, stacksize + pbd_stack_size ()); - rv = pthread_create (thread, &attr, start_routine, arg); - pthread_attr_destroy (&attr); + if (stacksize > 0) { + pthread_attr_setstacksize (&attr, stacksize + pbd_stack_size ()); + } diff -u -r ../cache/tmp-checkout/libs/zita-convolver/zita-convolver.cc ./libs/zita-convolver/zita-convolver.cc --- ../cache/tmp-checkout/libs/zita-convolver/zita-convolver.cc 2024-09-12 10:52:22.933515941 +0000 +++ ./libs/zita-convolver/zita-convolver.cc 2024-09-12 10:52:23.443514471 +0000 diff --git a/x11-packages/ardour/pthread_cancel.patch b/x11-packages/ardour/pthread_cancel.patch index 934384223b..69b02aeed6 100644 --- a/x11-packages/ardour/pthread_cancel.patch +++ b/x11-packages/ardour/pthread_cancel.patch @@ -79,10 +79,11 @@ return 0; --- a/libs/pbd/pthread_utils.cc +++ b/libs/pbd/pthread_utils.cc -@@ -84,9 +84,26 @@ +@@ -171,10 +171,24 @@ + , name (s) {} }; - +- +#ifdef __ANDROID__ +static void +thread_signal_handler (int signum) @@ -90,7 +91,6 @@ + pthread_exit (0); +} +#endif -+ static void* fake_thread_start (void* arg) { @@ -102,30 +102,30 @@ + actions.sa_handler = thread_signal_handler; + sigaction (SIGUSR2, &actions, NULL); +#endif -+ ThreadStartWithName* ts = (ThreadStartWithName*)arg; void* (*thread_work) (void*) = ts->thread_work; void* thread_arg = ts->arg; -@@ -188,7 +205,11 @@ - ++nxt; - - if (!pthread_equal ((*i), pthread_self ())) { -+#ifndef __ANDROID__ - pthread_cancel ((*i)); -+#else -+ pthread_kill ((*i), SIGUSR2); -+#endif +@@ -281,7 +295,11 @@ + continue; } - - i = nxt; -@@ -208,7 +229,11 @@ + DEBUG_TRACE (PBD::DEBUG::Threads, string_compose ("Cancel: '%1'\n", t.second)); ++#ifndef __ANDROID__ + pthread_cancel (t.first); ++#else ++ pthread_kill ((t.first), SIGUSR2); ++#endif + } + all_threads.clear (); + pthread_mutex_unlock (&thread_map_lock); +@@ -297,8 +315,11 @@ + break; } } - +- +#ifndef __ANDROID__ pthread_cancel (thread); +#else -+ pthread_kill (thread, SIGUSR2); ++ pthread_kill ((thread), SIGUSR2); +#endif pthread_mutex_unlock (&thread_map_lock); }