From: Carl Hetherington <cth@carlh.net>
Date: Mon, 26 Jun 2023 22:16:01 +0000 (+0200)
Subject: Bump libdcp for changes to how hashes are handled.
X-Git-Tag: v2.16.60~13
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=5bcf273dc773cf068791df959f3365866f39e433;p=dcpomatic.git

Bump libdcp for changes to how hashes are handled.
---

diff --git a/cscript b/cscript
index eb73f88d0..45b02462e 100644
--- a/cscript
+++ b/cscript
@@ -506,7 +506,7 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.73'))
+    deps.append(('libdcp', 'v1.8.74'))
     deps.append(('libsub', 'v1.6.44'))
     deps.append(('leqm-nrt', '4560105773c66ac9216b62313a24093bb0a027ae'))
     deps.append(('rtaudio', 'f619b76'))
diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc
index 2f8dabc09..0871b864e 100644
--- a/src/wx/verify_dcp_dialog.cc
+++ b/src/wx/verify_dcp_dialog.cc
@@ -109,6 +109,9 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job
 		if (note.id()) {
 			message.Replace("%id", std_to_wx(note.id().get()));
 		}
+		if (note.other_id()) {
+			message.Replace("%other_id", std_to_wx(note.other_id().get()));
+		}
 		add_bullet (note.type(), message);
 		counts[note.type()]++;
 	};
@@ -428,6 +431,9 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job
 		case dcp::VerificationNote::Code::MISSING_LOAD_FONT:
 			add(i, "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node");
 			break;
+		case dcp::VerificationNote::Code::MISMATCHED_ASSET_MAP_ID:
+			add(i, _("The asset with ID %id in the asset map actually has an id of %other_id"));
+			break;
 		}
 	}