From: Carl Hetherington <cth@carlh.net>
Date: Mon, 1 Apr 2013 21:49:33 +0000 (+0100)
Subject: Merge branch 'master' into content-rework-take5
X-Git-Tag: v2.0.48~1337^2~487
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=6809fdcbf8c65afe3c986b0e2b430d55ce7b124c;hp=-c

Merge branch 'master' into content-rework-take5
---

6809fdcbf8c65afe3c986b0e2b430d55ce7b124c
diff --combined wscript
index 9040738fb,4e4db2178..9914b3292
--- a/wscript
+++ b/wscript
@@@ -3,7 -3,7 +3,7 @@@ import o
  import sys
  
  APPNAME = 'dvdomatic'
- VERSION = '0.78beta14'
+ VERSION = '0.78beta16'
  
  def options(opt):
      opt.load('compiler_cxx')
@@@ -55,7 -55,6 +55,7 @@@ def configure(conf)
  
      if not conf.options.static:
          conf.check_cfg(package = 'libdcp', atleast_version = '0.41', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True)
 +        conf.check_cfg(package = 'libcxml', atleast_version = '0.01', args = '--cflags --libs', uselib_store = 'CXML', mandatory = True)
          conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True)
          conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True)
          conf.check_cfg(package = 'libavcodec', args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = True)
@@@ -72,8 -71,6 +72,8 @@@
          conf.env.HAVE_DCP = 1
          conf.env.STLIB_DCP = ['dcp', 'asdcp-libdcp', 'kumu-libdcp']
          conf.env.LIB_DCP = ['glibmm-2.4', 'xml++-2.6', 'ssl', 'crypto', 'bz2']
 +        conf.env.HAVE_CXML = 1
 +        conf.env.STLIB_CXML = ['cxml']
          conf.env.HAVE_AVFORMAT = 1
          conf.env.STLIB_AVFORMAT = ['avformat']
          conf.env.HAVE_AVFILTER = 1