Use CPL annotation text for ASSETMAP and PKL (#1048).

diff --git a/ChangeLog b/ChangeLog
index 84524fc23b18326d10f951921bb2400a7323778b..60d63edde6fefeb2956bc77d486fe52b00f819da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2017-02-12  Carl Hetherington  <cth@carlh.net>
 
+       * Use CPL's annotation text for ASSETMAP and PKL (#1048).
+
        * Fix missing keys in VF KDMs (#975).
 
 2017-02-10  Carl Hetherington  <cth@carlh.net>

diff --git a/cscript b/cscript
index 7ced0c91e1e7d2487fff377171c5cea3e7c5f2d4..4c1639a0539b7e2e4955d54e2f2e209313c07c15 100644 (file)
--- a/cscript
+++ b/cscript
@@ -268,8 +268,8 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', 'c7df8d5', ffmpeg_options),
-            ('libdcp', 'db86ed5'),
-            ('libsub', 'ad7f0ba'))
+            ('libdcp', '8f964bf'),
+            ('libsub', 'f6cb371'))
 
 def configure_options(target):
     opt = ''

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 49ba41a64c34d74fbc82c418f81f9e1b221aa17f..ccd6d74d1847aa3560a9fb1af04262942794fabb 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -496,6 +496,7 @@ Writer::finish ()
        }
 
        dcp::XMLMetadata meta;
+       meta.annotation_text = cpl->annotation_text ();
        meta.creator = Config::instance()->dcp_creator ();
        if (meta.creator.empty ()) {
                meta.creator = String::compose ("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit);