Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

diff --combined wscript
index 150e9cb1678e5fb45418adff8220e0da26309baf,3afb75caeaee8308985355888c4b10b4bea98f4e..8f6c487eeb21a510188ffd4bd21514817415c984
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -26,7 -26,7 +26,7 @@@ import distutils.spaw
  from waflib import Logs
  
  APPNAME = 'dcpomatic'
- VERSION = '2.3.4devel'
+ VERSION = '2.3.5devel'
  
  def options(opt):
      opt.load('compiler_cxx')
@@@ -159,8 -159,6 +159,8 @@@ def configure(conf)
      else:
          conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True)
  
 +    # uchardet
 +    conf.check_cfg(package='uchardet', args='--cflags --libs', uselib_store='UCHARDET', mandatory=True)
  
      # libsndfile
      conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=True)