diff options
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | src/lib/config.cc | 2 | ||||
| -rw-r--r-- | src/wx/full_config_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/supporters.cc | 1 | ||||
| -rw-r--r-- | src/wx/verify_dcp_result_panel.cc | 3 | ||||
| -rw-r--r-- | wscript | 2 |
6 files changed, 8 insertions, 4 deletions
@@ -535,7 +535,7 @@ def make_spec(filename, version, target, options, requires=None): print('/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :', file=f) def dependencies(target, options): - deps = [('libdcp', 'v1.9.21', {'c++17': target.platform.startswith('osx')})] + deps = [('libdcp', 'v1.9.22', {'c++17': target.platform.startswith('osx')})] 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 b30006498..cd285abd1 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -1513,7 +1513,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 585caa2db..0291d4fa6 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -196,7 +196,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/src/wx/supporters.cc b/src/wx/supporters.cc index 1a5f7ce27..5d7b2f1e2 100644 --- a/src/wx/supporters.cc +++ b/src/wx/supporters.cc @@ -570,6 +570,7 @@ supported_by.Add (wxT ("Big Island Drive In")); supported_by.Add (wxT ("Dayton Movies Inc")); supported_by.Add (wxT ("Buttons Sound Inc")); supported_by.Add (wxT ("Paramount Twin Inc")); +supported_by.Add (wxT ("A Cut Above Video Productions, Inc.")); supported_by.Add (wxT ("Mya Studios Inc.")); supported_by.Add (wxT ("Gold Pictures Inc.")); supported_by.Add (wxT ("First Nations Film And Video Festival Inc.")); diff --git a/src/wx/verify_dcp_result_panel.cc b/src/wx/verify_dcp_result_panel.cc index 9f60a41f4..d6232f984 100644 --- a/src/wx/verify_dcp_result_panel.cc +++ b/src/wx/verify_dcp_result_panel.cc @@ -596,6 +596,9 @@ VerifyDCPResultPanel::fill(shared_ptr<VerifyDCPJob> job) case dcp::VerificationNote::Code::VALID_CONTENT_VERSION_LABEL_TEXT: /* These are all "OK" messages which we don't report here */ break; + case dcp::VerificationNote::Code::INVALID_PKL_NAMESPACE: + add(i.second, _("The PKL %f has an invalid namespace %n")); + break; } } @@ -35,7 +35,7 @@ except ImportError: from waflib import Logs, Context APPNAME = 'dcpomatic' -libdcp_version = '1.9.21' +libdcp_version = '1.9.22' libsub_version = '1.6.49' this_version = subprocess.Popen(['git', 'tag', '-l', '--points-at', 'HEAD'], stdout=subprocess.PIPE).communicate()[0] |