From: Carl Hetherington <cth@carlh.net>
Date: Tue, 29 Apr 2014 18:34:13 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~849
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=034feb503b0a38eb82c21ae8d9f83522fc63a25c

Merge master.
---

034feb503b0a38eb82c21ae8d9f83522fc63a25c
diff --cc ChangeLog
index 1bbaed6e5,00d83bf59..38a8ea5ce
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,11 +1,15 @@@
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +	* Add subtitle view.
 +
+ 2014-04-29  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 1.67.1 released.
+ 
+ 2014-04-29  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 1.67.0 released.
+ 
  2014-04-27  Carl Hetherington  <cth@carlh.net>
  
  	* Version 1.66.16 released.
diff --cc cscript
index 890c937e6,5b2aebbbb..e1a987fde
--- a/cscript
+++ b/cscript
@@@ -143,8 -143,8 +143,8 @@@ def make_control(debian_version, bits, 
          print >>f,''
  
  def dependencies(target):
-     return (('ffmpeg-cdist', 'a0db025'),
+     return (('ffmpeg-cdist', 'bba68a5'),
 -            ('libdcp', '8af7b48'))
 +            ('libdcp', '1.0'))
  
  def build(target, options):
      cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
diff --cc wscript
index 64026191e,6a4a702cb..1abaf5c2f
--- a/wscript
+++ b/wscript
@@@ -49,12 -49,12 +49,12 @@@ def static_openjpeg(conf)
  
  def dynamic_openjpeg(conf):
      conf.check_cfg(package='libopenjpeg', args='--cflags --libs', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True)
-     conf.check_cfg(package='libopenjpeg', args='--cflags --libs', max_version='1.5.1', mandatory=True)
+     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-1.0', atleast_version='0.92', 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.STLIB_DCP = ['dcp-1.0', 'asdcp-libdcp', 'kumu-libdcp']
      conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
  
      if static_boost: