From 07975dbeaad3f7173874faae4e0a702a4d6efa75 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 25 Jun 2014 10:42:48 +0100 Subject: More attempts to fix various debian builds. --- wscript | 2 ++ 1 file changed, 2 insertions(+) (limited to 'wscript') diff --git a/wscript b/wscript index 353543815..92250a50c 100644 --- a/wscript +++ b/wscript @@ -13,6 +13,7 @@ def options(opt): opt.add_option('--disable-gui', action='store_true', default=False, help='disable building of GUI tools') opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to make a Windows package') opt.add_option('--target-debian', action='store_true', default=False, help='set up to compile for a Debian/Ubuntu package') + opt.add_option('--debian-unstable', action='store_true', default=False, help='add extra libraries to static-build correctly on Debian unstable') opt.add_option('--target-centos', action='store_true', default=False, help='set up to compile for a Centos package') opt.add_option('--magickpp-config', action='store', default='Magick++-config', help='path to Magick++-config') opt.add_option('--wx-config', action='store', default='wx-config', help='path to wx-config') @@ -163,6 +164,7 @@ def configure(conf): conf.env.TARGET_WINDOWS = conf.options.target_windows conf.env.DISABLE_GUI = conf.options.disable_gui conf.env.TARGET_DEBIAN = conf.options.target_debian + conf.env.DEBIAN_UNSTABLE = conf.options.debian_unstable conf.env.TARGET_CENTOS = conf.options.target_centos conf.env.VERSION = VERSION conf.env.TARGET_OSX = sys.platform == 'darwin' -- cgit v1.2.3 From ade05a3c11320f8d4558e660bd37277bb88606d8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 25 Jun 2014 22:13:36 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index ad48437c1..e5b575991 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-25 Carl Hetherington + + * Version 1.69.36 released. + 2014-06-25 Carl Hetherington * Support pixel format 46 in make_black(). diff --git a/debian/changelog b/debian/changelog index 0470cab2b..04b503466 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.69.35-1) UNRELEASED; urgency=low +dcpomatic (1.69.36-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -159,8 +159,9 @@ dcpomatic (1.69.35-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sun, 22 Jun 2014 21:49:09 +0100 + -- Carl Hetherington Wed, 25 Jun 2014 22:13:36 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 92250a50c..71c6b2541 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.35devel' +VERSION = '1.69.36' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From e1d69b8b64e89bdb322bee504a981f72ad625984 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 25 Jun 2014 22:13:36 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 71c6b2541..d8e4cf036 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.36' +VERSION = '1.69.36devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 6b1f20815736346ada4f08865194e3b7a957690e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 25 Jun 2014 23:21:21 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index e5b575991..080c74a9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-25 Carl Hetherington + + * Version 1.69.37 released. + 2014-06-25 Carl Hetherington * Version 1.69.36 released. diff --git a/debian/changelog b/debian/changelog index 04b503466..03a4f066f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.69.36-1) UNRELEASED; urgency=low +dcpomatic (1.69.37-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -160,8 +160,9 @@ dcpomatic (1.69.36-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Wed, 25 Jun 2014 22:13:36 +0100 + -- Carl Hetherington Wed, 25 Jun 2014 23:21:21 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index d8e4cf036..dc76ef6f1 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.36devel' +VERSION = '1.69.37' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From ebc5e532d6c5430ac2a2d735934cc9d7117a4bbd Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 25 Jun 2014 23:21:21 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index dc76ef6f1..afcaf8765 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.37' +VERSION = '1.69.37devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From e5f8fbb9e3664d1b904f1d74454f7108e42ff525 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 26 Jun 2014 10:26:32 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 080c74a9c..6be780b4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-26 Carl Hetherington + + * Version 1.70.0 released. + 2014-06-25 Carl Hetherington * Version 1.69.37 released. diff --git a/debian/changelog b/debian/changelog index 03a4f066f..7d30201ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.69.37-1) UNRELEASED; urgency=low +dcpomatic (1.70.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -161,8 +161,9 @@ dcpomatic (1.69.37-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Wed, 25 Jun 2014 23:21:21 +0100 + -- Carl Hetherington Thu, 26 Jun 2014 10:26:32 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index afcaf8765..64bc5ab61 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.37devel' +VERSION = '1.70.0' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From ee8f7f7edb1da818f60dfd2da11ca458aad0dc35 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 26 Jun 2014 10:26:32 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 64bc5ab61..82a56e237 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.70.0' +VERSION = '1.70.0devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From d1125d09c7741d05b57b1520531a0451663ad66c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 26 Jun 2014 14:35:33 +0100 Subject: Allow user to set video frame rate of video sources (to override the detected one). --- ChangeLog | 2 ++ cscript | 2 +- src/lib/video_content.cc | 15 +++++++++++++++ src/lib/video_content.h | 1 + src/wx/timing_panel.cc | 14 ++++++++------ wscript | 2 +- 6 files changed, 28 insertions(+), 8 deletions(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 6b004770c..39acb863e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-06-26 Carl Hetherington + * Allow override of detected video frame rates. + * Optimisation of uncertain effect to encoder and server thread handling. diff --git a/cscript b/cscript index fd8d36d1e..9080a1e09 100644 --- a/cscript +++ b/cscript @@ -157,7 +157,7 @@ def make_control(debian_version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', '67dc770'), - ('libdcp', 'v0.95.0')) + ('libdcp', '2224998')) def build(target, options): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 6f6b2c441..676a694da 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -405,6 +405,21 @@ VideoContent::scale_and_crop_to_fit_height () set_right_crop (crop / 2); } +void +VideoContent::set_video_frame_rate (float r) +{ + { + boost::mutex::scoped_lock lm (_mutex); + if (_video_frame_rate == r) { + return; + } + + _video_frame_rate = r; + } + + signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); +} + VideoContentScale::VideoContentScale (Ratio const * r) : _ratio (r) , _scale (true) diff --git a/src/lib/video_content.h b/src/lib/video_content.h index f23bf0abe..d0b907cb8 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -116,6 +116,7 @@ public: } void set_video_frame_type (VideoFrameType); + void set_video_frame_rate (float); void set_left_crop (int); void set_right_crop (int); diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 5d21d0a02..ef963bbfc 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -17,6 +17,7 @@ */ +#include #include "lib/content.h" #include "lib/image_content.h" #include "timing_panel.h" @@ -28,7 +29,7 @@ using std::cout; using std::string; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using boost::lexical_cast; +using libdcp::raw_convert; TimingPanel::TimingPanel (FilmEditor* e) /* horrid hack for apparent lack of context support with wxWidgets i18n code */ @@ -124,7 +125,7 @@ TimingPanel::film_content_changed (int property) if (content) { shared_ptr vc = dynamic_pointer_cast (content); if (vc) { - _video_frame_rate->SetValue (std_to_wx (lexical_cast (vc->video_frame_rate ()))); + _video_frame_rate->SetValue (std_to_wx (raw_convert (vc->video_frame_rate (), 5))); } else { _video_frame_rate->SetValue ("24"); } @@ -133,10 +134,11 @@ TimingPanel::film_content_changed (int property) } } + shared_ptr vc = dynamic_pointer_cast (content); shared_ptr ic = dynamic_pointer_cast (content); _full_length->set_editable (ic && ic->still ()); _play_length->set_editable (!ic || !ic->still ()); - _video_frame_rate->Enable (ic && !ic->still ()); + _video_frame_rate->Enable (vc); _set_video_frame_rate->Enable (false); } @@ -200,9 +202,9 @@ TimingPanel::set_video_frame_rate () { ContentList c = _editor->selected_content (); if (c.size() == 1) { - shared_ptr ic = dynamic_pointer_cast (c.front ()); - if (ic) { - ic->set_video_frame_rate (lexical_cast (wx_to_std (_video_frame_rate->GetValue ()))); + shared_ptr vc = dynamic_pointer_cast (c.front ()); + if (vc) { + vc->set_video_frame_rate (raw_convert (wx_to_std (_video_frame_rate->GetValue ()))); } _set_video_frame_rate->Enable (false); } diff --git a/wscript b/wscript index 82a56e237..866b230c5 100644 --- a/wscript +++ b/wscript @@ -56,7 +56,7 @@ def dynamic_openjpeg(conf): conf.check_cfg(package='libopenjpeg', args='--cflags --libs', max_version='1.5.2', mandatory=True) def static_dcp(conf, static_boost, static_xmlpp, static_xmlsec, static_ssh): - conf.check_cfg(package='libdcp', atleast_version='0.92', args='--cflags', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.95', 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', 'asdcp-libdcp', 'kumu-libdcp'] conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt'] -- cgit v1.2.3 From 8390d76f2f7353f8b717101dcb2e35d35d30d6a5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 26 Jun 2014 19:30:39 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index bcf3cdb79..14032c101 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-26 Carl Hetherington + + * Version 1.70.1 released. + 2014-06-26 Carl Hetherington * Support different KDM formulations. diff --git a/debian/changelog b/debian/changelog index 7d30201ca..7a38ec535 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.70.0-1) UNRELEASED; urgency=low +dcpomatic (1.70.1-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -162,8 +162,9 @@ dcpomatic (1.70.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Thu, 26 Jun 2014 10:26:32 +0100 + -- Carl Hetherington Thu, 26 Jun 2014 19:30:39 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 866b230c5..44bc44669 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.70.0devel' +VERSION = '1.70.1' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 20fa26ea6ecfdbecea8bb1230c8388cce3fd521f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 26 Jun 2014 19:30:39 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 44bc44669..2625ee852 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.70.1' +VERSION = '1.70.1devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3