summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-09-24 01:26:17 +0200
committerCarl Hetherington <cth@carlh.net>2024-09-24 01:26:17 +0200
commita5a3624943ccb9769d363a84797e00cf24bbf958 (patch)
tree8a34ad85f81ae68c6f037027a28da7f8b57b2bb0
parentffa9430ad7519fb1b291af74f3bdae74cc26f453 (diff)
Fix build with new boost (e.g. on Arch) (#2868)
-rw-r--r--cscript2
-rw-r--r--src/lib/config.cc2
-rw-r--r--src/wx/full_config_dialog.cc2
-rw-r--r--wscript2
4 files changed, 4 insertions, 4 deletions
diff --git a/cscript b/cscript
index 36a6e1ed8..b440f7490 100644
--- a/cscript
+++ b/cscript
@@ -536,7 +536,7 @@ def dependencies(target, options):
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', 'v1.8.108'))
+ deps.append(('libdcp', 'v1.8.110'))
deps.append(('libsub', 'v1.6.52'))
deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23'))
deps.append(('rtaudio', 'f619b76'))
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 384db5cde..5dafd5785 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -1514,7 +1514,7 @@ void
Config::copy_and_link (boost::filesystem::path new_file) const
{
write ();
- dcp::filesystem::copy_file(config_read_file(), new_file, boost::filesystem::copy_option::overwrite_if_exists);
+ dcp::filesystem::copy_file(config_read_file(), new_file, dcp::filesystem::CopyOptions::OVERWRITE_EXISTING);
link (new_file);
}
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index c1c36c4a4..196716705 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -187,7 +187,7 @@ private:
);
if (dialog.ShowModal() == wxID_OK) {
- dcp::filesystem::copy_file(Config::instance()->cinemas_file(), wx_to_std(dialog.GetPath()), boost::filesystem::copy_option::overwrite_if_exists);
+ dcp::filesystem::copy_file(Config::instance()->cinemas_file(), wx_to_std(dialog.GetPath()), dcp::filesystem::CopyOptions::OVERWRITE_EXISTING);
}
}
diff --git a/wscript b/wscript
index f207bd49f..9d8658ce4 100644
--- a/wscript
+++ b/wscript
@@ -35,7 +35,7 @@ except ImportError:
from waflib import Logs, Context
APPNAME = 'dcpomatic'
-libdcp_version = '1.8.107'
+libdcp_version = '1.8.110'
libsub_version = '1.6.49'
this_version = subprocess.Popen(['git', 'tag', '-l', '--points-at', 'HEAD'], stdout=subprocess.PIPE).communicate()[0]