Merge branch 'main' into v2.17.x

diff --cc cscript
Simple merge

diff --cc platform/osx/make_dmg.sh
Simple merge

diff --cc src/lib/player.cc
Simple merge

diff --cc src/lib/player.h
Simple merge

diff --cc src/tools/dcpomatic.cc
Simple merge

diff --cc src/wx/about_dialog.cc
Simple merge

diff --cc src/wx/recipient_dialog.cc
Simple merge

diff --cc test/data
index a5b12872bf034712039414fad58e7e68c068b772,4cb08962ba07e99c442cb12091c0347d84d8fd89..ddf878730354cdec8a802a59543591f6f943f5c0
--- 1/test/data
--- 2/test/data
+++ b/test/data
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit a5b12872bf034712039414fad58e7e68c068b772
 -Subproject commit 4cb08962ba07e99c442cb12091c0347d84d8fd89
++Subproject commit ddf878730354cdec8a802a59543591f6f943f5c0

diff --cc wscript
index f4e33328f0b2e3c2ec592941b489086d107ebb6b,4c40e34b110799177e499fce0d51246fc5f85171..2ca54488e32df843e184c57d82939c66f8e155b3
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -112,16 -111,7 +113,9 @@@ def configure(conf)
                                         '-Wall',
                                         '-Wextra',
                                         '-Wwrite-strings',
-                                        # These next 5 are for Xcode 15.0.1 with the v2.16.x-era
-                                        # dependencies; maybe they aren't necessary when building
-                                        # v2.1{7,8}.x
 +                                       # getMessengerLogger() in the grok code triggers these warnings
 +                                       '-Wno-nonnull',
                                         '-Wno-error=deprecated',
-                                        '-Wno-deprecated-builtins',
-                                        '-Wno-deprecated-declarations',
-                                        '-Wno-enum-constexpr-conversion',
-                                        '-Wno-deprecated-copy',
                                         # I tried and failed to ignore these with _Pragma
                                         '-Wno-ignored-qualifiers',
                                         '-D_FILE_OFFSET_BITS=64',