From 99dc59786fdaa6709197a9eaf51821c412e24146 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 12 Jul 2014 22:38:54 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 5a228368..3839f227 100644 --- a/wscript +++ b/wscript @@ -2,7 +2,7 @@ import subprocess import os APPNAME = 'libdcp' -VERSION = '0.95.0devel' +VERSION = '0.96.0' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 4fdc2b90779981f28295380e6155485e56644bd9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 12 Jul 2014 22:38:54 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 3839f227..f19662ec 100644 --- a/wscript +++ b/wscript @@ -2,7 +2,7 @@ import subprocess import os APPNAME = 'libdcp' -VERSION = '0.96.0' +VERSION = '0.96.0devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 4cc9386eb4cbb9386226be2ee532f09a2be3382d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 14 Jul 2014 11:40:04 +0100 Subject: Use a real DCP for this test. --- test/cpl_sar.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cpl_sar.cc b/test/cpl_sar.cc index c91ce287..a878e6b4 100644 --- a/test/cpl_sar.cc +++ b/test/cpl_sar.cc @@ -29,7 +29,7 @@ using boost::shared_ptr; */ BOOST_AUTO_TEST_CASE (cpl_sar) { - shared_ptr mp (new libdcp::MonoPictureAsset ("build/test/foo", "video.mxf")); + shared_ptr mp (new libdcp::MonoPictureAsset ("test/ref/DCP/foo", "video.mxf")); mp->set_interop (true); { -- cgit v1.2.3 From 563c7fdffebca836c0412d21f21b50370383884f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 14 Jul 2014 11:40:29 +0100 Subject: Add to CPL asset entries; this is optional but apparently Technicolor like it. --- src/mxf_asset.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mxf_asset.cc b/src/mxf_asset.cc index f16fd35b..28ac1933 100644 --- a/src/mxf_asset.cc +++ b/src/mxf_asset.cc @@ -123,6 +123,7 @@ MXFAsset::write_to_cpl (xmlpp::Element* node) const if (!_key_id.empty ()) { a->add_child("KeyId")->add_child_text ("urn:uuid:" + _key_id); } + a->add_child ("Hash")->add_child_text (digest ()); } void -- cgit v1.2.3 From 46bcd0527dd5424b14e2b6db139fe1e70df5113b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 14 Jul 2014 23:06:33 +0100 Subject: Bump libcxml for Centos build fix. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscript b/cscript index 1bb7a35f..df370a29 100644 --- a/cscript +++ b/cscript @@ -1,7 +1,7 @@ import os def dependencies(target): - return (('libcxml', '7b4ecc3'), ('openjpeg-cdist', '13b69c2')) + return (('libcxml', '911c706'), ('openjpeg-cdist', '13b69c2')) def build(target, options): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From 009e07f1afe3290dabaf389c6b2909fee9e6fa2e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 14 Jul 2014 23:33:09 +0100 Subject: Disable building of tests on --static Linux package builds. --- cscript | 2 +- wscript | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cscript b/cscript index df370a29..38ac40dd 100644 --- a/cscript +++ b/cscript @@ -6,7 +6,7 @@ def dependencies(target): def build(target, options): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() if target.platform == 'linux': - cmd += ' --static' + cmd += ' --static --disable-tests' elif target.platform == 'windows': cmd += ' --target-windows' elif target.platform == 'osx': diff --git a/wscript b/wscript index f19662ec..0a15a5dd 100644 --- a/wscript +++ b/wscript @@ -11,6 +11,7 @@ def options(opt): opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation') opt.add_option('--static', action='store_true', default=False, help='build libdcp and in-tree dependencies statically, and link statically to openjpeg and cxml') opt.add_option('--valgrind', action='store_true', default=False, help='build with instructions to Valgrind to reduce false positives') + opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests') def configure(conf): conf.load('compiler_cxx') @@ -21,6 +22,7 @@ def configure(conf): conf.env.STATIC = conf.options.static conf.env.OSX = conf.options.osx conf.env.ENABLE_DEBUG = conf.options.enable_debug + conf.env.DISABLE_TESTS = conf.options.disable_tests if conf.options.target_windows: conf.env.append_value('CXXFLAGS', '-DLIBDCP_WINDOWS') @@ -105,7 +107,8 @@ def configure(conf): lib = ['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix], uselib_store = 'BOOST_DATETIME') - conf.recurse('test') + if not conf.env.DISABLE_TESTS: + conf.recurse('test') conf.recurse('asdcplib') def build(bld): @@ -124,7 +127,8 @@ def build(bld): bld.recurse('src') bld.recurse('tools') - bld.recurse('test') + if not bld.env.DISABLE_TESTS: + bld.recurse('test') bld.recurse('asdcplib') bld.recurse('examples') -- cgit v1.2.3 From 7f029e724dc021c4a4751a393bf11f46ebfd5de4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 2 Aug 2014 00:46:18 +0100 Subject: cdist updates. --- cscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cscript b/cscript index 38ac40dd..10e2c9f2 100644 --- a/cscript +++ b/cscript @@ -1,10 +1,10 @@ import os def dependencies(target): - return (('libcxml', '911c706'), ('openjpeg-cdist', '13b69c2')) + return (('libcxml', '7a487a8'), ('openjpeg-cdist', '5d8bffd')) def build(target, options): - cmd = './waf configure --prefix=%s' % target.work_dir_cscript() + cmd = './waf configure --prefix=%s' % target.directory if target.platform == 'linux': cmd += ' --static --disable-tests' elif target.platform == 'windows': -- cgit v1.2.3 From 93f428ac5ecda7675f538c34b766e5538d5bd75b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 26 Aug 2014 21:44:30 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 0a15a5dd..e1113111 100644 --- a/wscript +++ b/wscript @@ -2,7 +2,7 @@ import subprocess import os APPNAME = 'libdcp' -VERSION = '0.96.0devel' +VERSION = '0.97.0' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 0c5d6669860461feddb5a97ffba907445be45c5a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 26 Aug 2014 21:44:30 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index e1113111..c79a9904 100644 --- a/wscript +++ b/wscript @@ -2,7 +2,7 @@ import subprocess import os APPNAME = 'libdcp' -VERSION = '0.97.0' +VERSION = '0.97.0devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 2001bef5b3a6256eedf1cada4977a3ba8a3732cd Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 10 Sep 2014 18:24:22 +0100 Subject: Build with 0.11.0 of libcxml. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscript b/cscript index 10e2c9f2..3bca50ec 100644 --- a/cscript +++ b/cscript @@ -1,7 +1,7 @@ import os def dependencies(target): - return (('libcxml', '7a487a8'), ('openjpeg-cdist', '5d8bffd')) + return (('libcxml', 'v0.11.0'), ('openjpeg-cdist', '5d8bffd')) def build(target, options): cmd = './waf configure --prefix=%s' % target.directory -- cgit v1.2.3 From 7dd9b27c1c17716ad0086bbd66266c35d454ad3a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 14 Sep 2014 20:29:39 +0100 Subject: Missing include. --- src/signer.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/signer.cc b/src/signer.cc index 11cf5eb8..a6978885 100644 --- a/src/signer.cc +++ b/src/signer.cc @@ -17,6 +17,7 @@ */ +#include #include #include #include -- cgit v1.2.3 From d67cea162e75b964967a820ad1f75f89dd0aacd5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 14 Sep 2014 20:34:26 +0100 Subject: Remove unused using statement. --- asdcplib/src/h__Writer.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/asdcplib/src/h__Writer.cpp b/asdcplib/src/h__Writer.cpp index d743e300..676267ce 100755 --- a/asdcplib/src/h__Writer.cpp +++ b/asdcplib/src/h__Writer.cpp @@ -32,7 +32,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "AS_DCP_internal.h" #include "KLV.h" -using std::cout; using namespace ASDCP; using namespace ASDCP::MXF; -- cgit v1.2.3 From 8afd7786c87b571118d1e098a730ab69b7b3908b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 6 Oct 2014 20:37:08 +0100 Subject: Fix test running when LD_LIBRARY_PATH is set in the environment. --- run/tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/tests b/run/tests index 0bbc047b..588e756c 100755 --- a/run/tests +++ b/run/tests @@ -10,7 +10,7 @@ private=../libdcp-test-private work=build/test dcpinfo=build/tools/dcpinfo -export LD_LIBRARY_PATH=build/src:build/asdcplib/src +export LD_LIBRARY_PATH=build/src:build/asdcplib/src:$LD_LIBRARY_PATH # Run the unit tests in test/ if [ "$1" == "--debug" ]; then -- cgit v1.2.3 From f7b50fd54b249c294e686fc09d8bb33d2a992d42 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 6 Oct 2014 20:37:40 +0100 Subject: Fix heinous bug with conversion to libdcp::Time causing missing subtitles (and probably other problems). --- src/dcp_time.cc | 4 ++-- test/dcp_time_test.cc | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/dcp_time.cc b/src/dcp_time.cc index d597e3dc..4c16a91a 100644 --- a/src/dcp_time.cc +++ b/src/dcp_time.cc @@ -59,12 +59,12 @@ Time::set (double ss) t = (int (round (ss * 1000)) % 1000) / 4; s = floor (ss); - if (s > 60) { + if (s >= 60) { m = s / 60; s -= m * 60; } - if (m > 60) { + if (m >= 60) { h = m / 60; m -= h * 60; } diff --git a/test/dcp_time_test.cc b/test/dcp_time_test.cc index 6892711e..a8256998 100644 --- a/test/dcp_time_test.cc +++ b/test/dcp_time_test.cc @@ -59,4 +59,16 @@ BOOST_AUTO_TEST_CASE (dcp_time) BOOST_CHECK_EQUAL (libdcp::Time (4128391203LL).to_ticks(), 4128391203LL); BOOST_CHECK_EQUAL (libdcp::Time (60000).to_ticks(), 60000); + + a = libdcp::Time (3600 * 24, 24); + BOOST_CHECK_EQUAL (a.h, 1); + BOOST_CHECK_EQUAL (a.m, 0); + BOOST_CHECK_EQUAL (a.s, 0); + BOOST_CHECK_EQUAL (a.t, 0); + + a = libdcp::Time (60 * 24, 24); + BOOST_CHECK_EQUAL (a.h, 0); + BOOST_CHECK_EQUAL (a.m, 1); + BOOST_CHECK_EQUAL (a.s, 0); + BOOST_CHECK_EQUAL (a.t, 0); } -- cgit v1.2.3 From 83358c16fcfdad24e8e415df13d6cf8e9bb43556 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 7 Oct 2014 10:13:39 +0100 Subject: Add Subtitle::set_text() --- src/subtitle_asset.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h index a7ec641c..3dfbe7e2 100644 --- a/src/subtitle_asset.h +++ b/src/subtitle_asset.h @@ -78,6 +78,10 @@ public: return _text; } + void set_text (std::string t) { + _text = t; + } + float v_position () const { return _v_position; } -- cgit v1.2.3 From 3b0aac5e949be74845b176dce442f388feb612d8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 09:11:28 +0100 Subject: Bump required libcxml version. --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index c79a9904..7731de59 100644 --- a/wscript +++ b/wscript @@ -56,7 +56,7 @@ def configure(conf): conf.env.STLIB_CXML = ['cxml'] else: conf.check_cfg(package='libopenjpeg', args='--cflags --libs', uselib_store='OPENJPEG', mandatory=True) - conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags --libs', uselib_store='CXML', mandatory=True) + conf.check_cfg(package='libcxml', atleast_version='0.11.0', args='--cflags --libs', uselib_store='CXML', mandatory=True) if conf.options.target_windows: boost_lib_suffix = '-mt' -- cgit v1.2.3 From a55fc07bf282823f6c776ecf5c805946d3deb4de Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 09:12:35 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 7731de59..6e740edf 100644 --- a/wscript +++ b/wscript @@ -2,7 +2,7 @@ import subprocess import os APPNAME = 'libdcp' -VERSION = '0.97.0devel' +VERSION = '0.98.0' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 190dc3381a03b5cdbe12881015d16ff18303844a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 09:12:35 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 6e740edf..c02685b9 100644 --- a/wscript +++ b/wscript @@ -2,7 +2,7 @@ import subprocess import os APPNAME = 'libdcp' -VERSION = '0.98.0' +VERSION = '0.98.0devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3