X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=ec9eb591433b16d871990c1b3aa10a9002035dcd;hb=797ab6a4e1ac1a5c00f4d7297aaa31dfc8b7c611;hp=982329c64ad8c8d5a5605d3afd6795eb85ed6546;hpb=a0bc166f000684a04d8a23306f266cc7a46089df;p=dcpomatic.git

diff --git a/wscript b/wscript
index 982329c64..ec9eb5914 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.28'
+VERSION = '1.34pre'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -74,11 +74,12 @@ def configure(conf):
         conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX')
         # libxml2 seems to be linked against this on Ubuntu but it doesn't mention it in its .pc file
         conf.check_cfg(package='liblzma', args='--cflags --libs', uselib_store='LZMA', mandatory=True)
-        if conf.env.STATIC:
-            conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
-        else:
-            # On Linux we need to be able to include <gtk/gtk.h> to check GTK's version
-            conf.check_cfg(package='gtk+-2.0', args='--cflags', uselib_store='GTK', mandatory=True)
+        if not conf.env.DISABLE_GUI:
+            if conf.env.STATIC:
+                conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
+            else:
+                # On Linux we need to be able to include <gtk/gtk.h> to check GTK's version
+                conf.check_cfg(package='gtk+-2.0', args='--cflags', uselib_store='GTK', mandatory=True)
 
     # OSX-specific
     if conf.env.TARGET_OSX:
@@ -87,10 +88,10 @@ def configure(conf):
 
     # Dependencies which are dynamically linked everywhere except --static
     # Get libs only when we are dynamically linking
-    conf.check_cfg(package='libdcp',        atleast_version='0.81', args=pkg_config_args(conf), uselib_store='DCP',  mandatory=True)
+    conf.check_cfg(package='libdcp',        atleast_version='0.83', args=pkg_config_args(conf), uselib_store='DCP',  mandatory=True)
     # Remove erroneous escaping of quotes from xmlsec1 defines
     conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
-    conf.check_cfg(package='libcxml',       atleast_version='0.01', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True)
+    conf.check_cfg(package='libcxml',       atleast_version='0.08', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True)
     conf.check_cfg(package='libavformat',   args=pkg_config_args(conf), uselib_store='AVFORMAT',   mandatory=True)
     conf.check_cfg(package='libavfilter',   args=pkg_config_args(conf), uselib_store='AVFILTER',   mandatory=True)
     conf.check_cfg(package='libavcodec',    args=pkg_config_args(conf), uselib_store='AVCODEC',    mandatory=True)