From 39370aff7b43c26b7335134db12b1ee1fb687729 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 2 Dec 2025 13:56:49 +0100 Subject: [PATCH 1/4] Fix crash when selecting multiple regions see also 7a5591121b9bd, action was renamed. --- gtk2_ardour/editor_selection.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index cd217d6102..a0f7e18826 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -1523,7 +1523,7 @@ Editor::sensitize_the_right_region_actions (bool because_canvas_crossing) if (rs.size() > 1) { _region_actions->get_action("show-region-list-editor")->set_sensitive (false); - _region_actions->get_action("show-region-properties")->set_sensitive (false); + _region_actions->get_action("edit-region-dedicated-window")->set_sensitive (false); _region_actions->get_action("rename-region")->set_sensitive (false); /* XXX need to check whether there is than 1 per playlist, because otherwise this makes no sense. From 6ce8358709b283f649d7d15dcdf11494f3fd151e Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 2 Dec 2025 14:00:59 +0100 Subject: [PATCH 2/4] Remove yet another irrelevant unistd.h --- libs/pbd/pbd/abstract_ui.inc.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/pbd/pbd/abstract_ui.inc.cc b/libs/pbd/pbd/abstract_ui.inc.cc index f3f735c973..dbc0061060 100644 --- a/libs/pbd/pbd/abstract_ui.inc.cc +++ b/libs/pbd/pbd/abstract_ui.inc.cc @@ -21,7 +21,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include #include #include From d0109bed16ebbec90f11e68464d9244fcede9250 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 2 Dec 2025 16:38:42 +0100 Subject: [PATCH 3/4] Move unistd.h detection to the correct wscript This fixes macOS builds (getpid()) --- gtk2_ardour/nsmclient.cc | 1 - gtk2_ardour/wscript | 2 ++ libs/ardour/wscript | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/nsmclient.cc b/gtk2_ardour/nsmclient.cc index 4bcd7b43ad..7df9b7fcf3 100644 --- a/gtk2_ardour/nsmclient.cc +++ b/gtk2_ardour/nsmclient.cc @@ -29,7 +29,6 @@ #ifndef COMPILER_MSVC #pragma GCC diagnostic ignored "-Wunused-parameter" #else -#include // Needed for 'getpid()' #include #define LO_TT_IMMEDIATE lo_get_tt_immediate() diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index be9cb36b81..1bcf456152 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -492,6 +492,8 @@ def configure(conf): autowaf.check_pkg(conf, 'pangoft2', uselib_store='PANGOFT2', atleast_version='1.36.8', mandatory=False) autowaf.check_pkg(conf, 'fontconfig', uselib_store='FONTCONFIG') + conf.check(header_name='unistd.h', define_name='HAVE_UNISTD_H',mandatory=False) + if conf.env.CC_NAME == 'gcc' and Options.options.strict: conf.define('GLIB_DISABLE_DEPRECATION_WARNINGS', 1) for var in ['CFLAGS', 'CXXFLAGS']: diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 1f940d57c7..b6b55fb697 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -341,7 +341,6 @@ def configure(conf): conf.check(header_name='sys/vfs.h', define_name='HAVE_SYS_VFS_H',mandatory=False) conf.check(header_name='sys/statvfs.h', define_name='HAVE_SYS_STATVFS_H',mandatory=False) - conf.check(header_name='unistd.h', define_name='HAVE_UNISTD_H',mandatory=False) have_sys_ioprio = conf.check_cc( msg="Checking for 'ioprio_set' syscall support", From c08531f96e04d28c83bfb0f85fb82a2fd01bbb69 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 2 Dec 2025 16:54:05 +0100 Subject: [PATCH 4/4] Fix macOS builds (missing header) implicit instantiation of undefined template 'std::array<..>' --- libs/surfaces/mackie/surface.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/surfaces/mackie/surface.h b/libs/surfaces/mackie/surface.h index dd0e2b0e08..a9f32659ba 100644 --- a/libs/surfaces/mackie/surface.h +++ b/libs/surfaces/mackie/surface.h @@ -20,6 +20,7 @@ #ifndef mackie_surface_h #define mackie_surface_h +#include #include #include