Fix build with new boost (e.g. on Arch) (#2868)

diff --git a/cscript b/cscript
index 36a6e1ed8a923c52fa863ee7a34f4c31a7a39e58..b440f7490f396a70604b2612bbec693f8c019b13 100644 (file)
--- 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 384db5cde137be48177afc3cb3ceca8df95f090f..5dafd5785712af7068d88df562aab366e3578d0a 100644 (file)
--- 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 c1c36c4a4e370dbc3d74edd305fdf30c6270f167..19671670597257bf20c93190b66d847d40ba562a 100644 (file)
--- 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 f207bd49f79c66ef6202aebd7225ecb9264e47a2..9d8658ce4c088a3061a2cfa4418d65248d8cc023 100644 (file)
--- 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]