diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-03-29 15:55:18 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-03-29 15:55:18 +0000 |
| commit | 88816c72895b90f29083235cc0f111c893b15d93 (patch) | |
| tree | 9e6ca582dd065e5d0fb6eacb3ef5a9a6af9b9852 | |
| parent | 1f04a10aee553fa4552dd94b73f63ca502d08d0e (diff) | |
Add episode/promo content types.
| -rw-r--r-- | cscript | 4 | ||||
| -rw-r--r-- | src/lib/dcp_content_type.cc | 2 | ||||
| -rw-r--r-- | wscript | 4 |
3 files changed, 6 insertions, 4 deletions
@@ -331,8 +331,8 @@ def dependencies(target): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.6.5')) - deps.append(('libsub', 'v1.4.5')) + deps.append(('libdcp', 'v1.6.6')) + deps.append(('libsub', 'v1.4.6')) deps.append(('rtaudio-cdist', 'aad62d7')) return deps diff --git a/src/lib/dcp_content_type.cc b/src/lib/dcp_content_type.cc index b2455ba21..613ed15a5 100644 --- a/src/lib/dcp_content_type.cc +++ b/src/lib/dcp_content_type.cc @@ -53,6 +53,8 @@ DCPContentType::setup_dcp_content_types () _dcp_content_types.push_back (new DCPContentType (_("Policy"), dcp::POLICY, N_("POL"))); _dcp_content_types.push_back (new DCPContentType (_("Public Service Announcement"), dcp::PUBLIC_SERVICE_ANNOUNCEMENT, N_("PSA"))); _dcp_content_types.push_back (new DCPContentType (_("Advertisement"), dcp::ADVERTISEMENT, N_("ADV"))); + _dcp_content_types.push_back (new DCPContentType (_("Episode"), dcp::EPISODE, N_("EPS"))); + _dcp_content_types.push_back (new DCPContentType (_("Promo"), dcp::PROMO, N_("PRO"))); } DCPContentType const * @@ -305,12 +305,12 @@ def configure(conf): # libdcp if conf.options.static_dcp: - conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.2', args='--cflags', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.6', args='--cflags', uselib_store='DCP', mandatory=True) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-cth', 'kumu-cth', 'openjp2'] conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt'] else: - conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.2', args='--cflags --libs', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.6', args='--cflags --libs', uselib_store='DCP', mandatory=True) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] # libsub |