X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=1a8238d1c53078e18ba7a7a06f56e23838188289;hb=fa6c885de512cdde0590c2bbe9ea424030a12c6b;hp=3fbd3e4e8d27c4ece075775dd3b2e688b3e14b6f;hpb=edbf0a24cfda59e5358a1070a40673c28d82d8ae;p=dcpomatic.git

diff --git a/wscript b/wscript
index 3fbd3e4e8..1a8238d1c 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.71beta1'
+VERSION = '0.73pre'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -13,6 +13,8 @@ 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 Windows')
     opt.add_option('--static', action='store_true', default = False, help = 'build statically, and link statically to libdcp and FFmpeg')
+    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')
 
 def configure(conf):
     conf.load('compiler_cxx')
@@ -50,7 +52,7 @@ def configure(conf):
         conf.env.append_value('CXXFLAGS', '-O2')
 
     if not conf.options.static:
-        conf.check_cfg(package = 'libdcp', atleast_version = '0.36', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True)
+        conf.check_cfg(package = 'libdcp', atleast_version = '0.40', args = '--cflags --libs', uselib_store = 'DCP', 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)
@@ -73,7 +75,7 @@ def configure(conf):
         conf.env.STLIB_AVFILTER = ['avfilter', 'swresample']
         conf.env.HAVE_AVCODEC = 1
         conf.env.STLIB_AVCODEC = ['avcodec']
-        conf.env.LIB_AVCODEC = ['x264', 'z']
+        conf.env.LIB_AVCODEC = ['z']
         conf.env.HAVE_AVUTIL = 1
         conf.env.STLIB_AVUTIL = ['avutil']
         conf.env.HAVE_SWSCALE = 1
@@ -89,21 +91,35 @@ def configure(conf):
 
     conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True)
     conf.check_cfg(package = 'glib-2.0', args = '--cflags --libs', uselib_store = 'GLIB', mandatory = True)
-    conf.check_cfg(package = '', path = 'Magick++-config', args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True)
+    if conf.options.target_windows is False:
+        conf.check_cfg(package = 'liblzma', args = '--cflags --libs', uselib_store = 'LZMA', mandatory = True)
+    conf.check_cfg(package = '', path = conf.options.magickpp_config, args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True)
 
-    openjpeg_fragment = """
+    if conf.options.static:
+        conf.check_cc(fragment = """
     			#include <stdio.h>\n
 			#include <openjpeg.h>\n
 			int main () {\n
 			void* p = (void *) opj_image_create;\n
 			return 0;\n
 			}
-			"""
-
-    if conf.options.static:
-        conf.check_cc(fragment = openjpeg_fragment, msg = 'Checking for library openjpeg', stlib = 'openjpeg', uselib_store = 'OPENJPEG')
+			""", msg = 'Checking for library openjpeg', stlib = 'openjpeg', uselib_store = 'OPENJPEG')
     else:
-        conf.check_cc(fragment = openjpeg_fragment, msg = 'Checking for library openjpeg', lib = 'openjpeg', uselib_store = 'OPENJPEG')
+        # Only 1.5.0 and 1.5.1 have been tested.
+        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_cxx(fragment = """
+                              #include <boost/version.hpp>\n
+                              #if BOOST_VERSION < 104500\n
+                              #error boost too old\n
+                              #endif\n
+                              int main(void) { return 0; }\n
+                              """,
+                   mandatory = True,
+                   msg = 'Checking for boost library >= 1.45',
+                   okmsg = 'yes',
+                   errmsg = 'too old\nPlease install boost version 1.45 or higher.')
 
     conf.check_cc(fragment  = """
                               #include <libssh/libssh.h>\n
@@ -111,12 +127,13 @@ def configure(conf):
                               ssh_session s = ssh_new ();\n
                               return 0;\n
                               }
-                              """, msg = 'Checking for library libssh', mandatory = False, lib = 'ssh', uselib_store = 'SSH')
+                              """, msg = 'Checking for library libssh', mandatory = True, lib = 'ssh', uselib_store = 'SSH')
 
     conf.check_cxx(fragment = """
     			      #include <boost/thread.hpp>\n
     			      int main() { boost::thread t (); }\n
 			      """, msg = 'Checking for boost threading library',
+			      libpath = '/usr/local/lib',
                               lib = [boost_thread, 'boost_system%s' % boost_lib_suffix],
                               uselib_store = 'BOOST_THREAD')
 
@@ -206,7 +223,11 @@ def build(bld):
     bld.add_post_fun(post)
 
 def dist(ctx):
-    ctx.excl = 'TODO core *~ src/wx/*~ src/lib/*~ builds/*~ doc/manual/*~ src/tools/*~ *.pyc .waf* build .git deps alignment hacks sync *.tar.bz2 *.exe .lock* *build-windows doc/manual/pdf doc/manual/html'
+    ctx.excl = """
+               TODO core *~ src/wx/*~ src/lib/*~ builds/*~ doc/manual/*~ src/tools/*~ *.pyc .waf* build .git
+               deps alignment hacks sync *.tar.bz2 *.exe .lock* *build-windows doc/manual/pdf doc/manual/html
+               GRSYMS GRTAGS GSYMS GTAGS
+               """
 
 def create_version_cc(version):
     if os.path.exists('.git'):
@@ -232,3 +253,6 @@ def create_version_cc(version):
 def post(ctx):
     if ctx.cmd == 'install':
         ctx.exec_command('/sbin/ldconfig')
+
+def pot(bld):
+    bld.recurse('src')