Merge branch 'main' into v2.17.x

6 files changed, 61 insertions, 13 deletions

diff --git a/platform/osx/set_paths.sh b/platform/osx/set_paths.sh
index 91d67ba94..24baa6cd6 100644
--- a/platform/osx/set_paths.sh
+++ b/platform/osx/set_paths.sh
@@ -1,11 +1,23 @@
-base=$HOME/workspace
-env=$HOME/osx-environment/x86_64/10.10
+SDK=$1
+if [[ "$SDK" == 11 ]]; then
+	isysroot="-isysroot $HOME/SDK/MacOS11.0.sdk"
+	base=$HOME/workspace
+	export MACOSX_DEPLOYMENT_TARGET=10.10
+else
+	base=/usr/local
+fi
+
+arch=$(uname -m)
+if [[ "$arch" == arm64 ]]; then
+	env=$HOME/osx-environment/arm64/11.0
+else
+	env=$HOME/osx-environment/x86_64/10.10
+fi
 sdk=$HOME/SDK
 
-export CPPFLAGS= LDFLAGS="-L$base/lib -L$env/lib -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
-export LINKFLAGS="-L$base/lib -L$env/lib -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
-export MACOSX_DEPLOYMENT_TARGET=10.10
-export CXXFLAGS="-I$base/include -I$env/include -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
-export CFLAGS="-I$base/include -I$env/include -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
+export CPPFLAGS= LDFLAGS="-L$base/lib -L$env/lib $isysroot -arch $arch"
+export LINKFLAGS="-L$base/lib -L$env/lib $isysroot -arch $arch"
+export CXXFLAGS="-I$base/include -I$env/include $isysroot -arch $arch"
+export CFLAGS="-I$base/include -I$env/include $isysroot -arch $arch"
 export PATH=$env/bin:$PATH
 export PKG_CONFIG_PATH=$env/lib/pkgconfig:$base/lib/pkgconfig
diff --git a/run/dcpomatic b/run/dcpomatic
index 429139dac..45f857ae2 100755
--- a/run/dcpomatic
+++ b/run/dcpomatic
@@ -4,9 +4,23 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source $DIR/environment
 binary=$build/src/tools/dcpomatic2
 
+if [[ "$(uname -m)" == arm64 ]]; then
+    env=arm64/11.0
+else
+    env=x86_64/10.10
+fi
+
+export DYLD_LIBRARY_PATH=/Users/cah/osx-environment/$env/lib:/usr/local/lib
+
+# export ASAN_OPTIONS=verbosity=1:malloc_context_size=20:detect_leaks=1
+
 if [ "$1" == "--debug" ]; then
     shift
-    gdb --args $binary $*
+    if [[ "$(uname)" == Darwin ]]; then
+        /Applications/Xcode.app/Contents/Developer/usr/bin/lldb $binary $*
+    else
+        gdb --args $binary $*
+    fi
 elif [ "$1" == "--valgrind" ]; then
     shift
     valgrind --tool="memcheck" --suppressions=suppressions --track-fds=yes --show-leak-kinds=all --leak-check=full $binary $*
diff --git a/run/dcpomatic_disk b/run/dcpomatic_disk
index 8c13183b6..ff5d8e7e5 100755
--- a/run/dcpomatic_disk
+++ b/run/dcpomatic_disk
@@ -3,6 +3,14 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source $DIR/environment
 
+if [[ "$(uname -m)" == arm64 ]]; then
+    env=arm64/11.0
+else
+    env=x86_64/10.10
+fi
+
+export DYLD_LIBRARY_PATH=/Users/cah/osx-environment/$env/lib:/usr/local/lib
+
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args build/src/tools/dcpomatic2_disk $*
diff --git a/run/dcpomatic_disk_writer b/run/dcpomatic_disk_writer
index b2e1a872d..2dff961fb 100755
--- a/run/dcpomatic_disk_writer
+++ b/run/dcpomatic_disk_writer
@@ -3,9 +3,15 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source $DIR/environment
 
+if [[ "$(uname -m)" == arm64 ]]; then
+    env=arm64/11.0
+else
+    env=x86_64/10.10
+fi
+
+export DYLD_LIBRARY_PATH=/Users/cah/osx-environment/$env/lib:/usr/local/lib
+
 exe=build/src/tools/dcpomatic2_disk_writer
-sudo chown root $exe
-sudo chmod 4755 $exe
 
 if [ "$1" == "--debug" ]; then
     shift
@@ -29,5 +35,5 @@ elif [ "$1" == "--scaled" ]; then
     shift
     ~/src/run_scaled/run_scaled --sleep=5 --scale=0.5 $exe $*
 else
-    $exe $*
+    sudo DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH $exe $*
 fi
diff --git a/src/lib/wscript b/src/lib/wscript
index 89a7531b0..296a77805 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -231,7 +231,7 @@ def build(bld):
     obj.uselib = """
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
-                 SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++
+                 SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB XML++
                  CURL ZIP BZ2 FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG JPEG LEQM_NRT
                  LIBZ
                  """
diff --git a/wscript b/wscript
index f6907f3a2..f4e33328f 100644
--- a/wscript
+++ b/wscript
@@ -112,9 +112,16 @@ def configure(conf):
                                        '-Wall',
                                        '-Wextra',
                                        '-Wwrite-strings',
-                                       '-Wno-error=deprecated',
                                        # getMessengerLogger() in the grok code triggers these warnings
                                        '-Wno-nonnull',
+                                       # 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
+                                       '-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',
@@ -217,6 +224,7 @@ def configure(conf):
     if conf.env.TARGET_OSX:
         conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-DGL_SILENCE_DEPRECATION'])
         conf.env.append_value('LINKFLAGS', '-headerpad_max_install_names')
+        conf.env.append_value('LINKFLAGS', '-llzma')
 
     #
     # Dependencies.