X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=wscript;h=ed45b278dc34fc297add780a1f745778fa4890be;hb=90550787a8b00329170a6a1d0e9bb58aeb92ac6f;hp=80c5f50b18bca51a2372299a50f8f05b544f04a5;hpb=c09dba22fd923df38a517cf8eb00658af16e1fec;p=dcpomatic.git diff --git a/wscript b/wscript index 80c5f50b1..ed45b278d 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.65' +VERSION = '0.73pre' def options(opt): opt.load('compiler_cxx') @@ -19,12 +19,11 @@ def configure(conf): if conf.options.target_windows: conf.load('winres') - conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes']) + conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes', '-Wextra']) if conf.options.target_windows: - conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H']) + conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE']) wxrc = os.popen('wx-config --rescomp').read().split()[1:] - print wxrc conf.env.append_value('WINRCFLAGS', wxrc) if conf.options.enable_debug: conf.env.append_value('CXXFLAGS', ['-mconsole']) @@ -51,7 +50,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-O2') if not conf.options.static: - conf.check_cfg(package = 'libdcp', atleast_version = '0.34', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) + conf.check_cfg(package = 'libdcp', atleast_version = '0.36', 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) @@ -90,21 +89,34 @@ 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 = 'liblzma', args = '--cflags --libs', uselib_store = 'LZMA', mandatory = True) conf.check_cfg(package = '', path = 'Magick++-config', args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True) - openjpeg_fragment = """ + if conf.options.static: + conf.check_cc(fragment = """ #include \n #include \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 \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 \n @@ -112,12 +124,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 \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') @@ -152,6 +165,36 @@ def configure(conf): define_name = 'HAVE_G_FORMAT_SIZE', mandatory = False) + conf.check_cc(fragment = """ + extern "C" { + #include + } + int main() { AVPixelFormat f; } + """, msg = 'Checking for AVPixelFormat', + uselib = 'AVUTIL', + define_name = 'HAVE_AV_PIXEL_FORMAT', + mandatory = False) + + conf.check_cc(fragment = """ + extern "C" { + #include + } + int main() { AVFrame* f; av_frame_get_best_effort_timestamp(f); } + """, msg = 'Checking for av_frame_get_best_effort_timestamp', + uselib = 'AVCODEC', + define_name = 'HAVE_AV_FRAME_GET_BEST_EFFORT_TIMESTAMP', + mandatory = False) + + conf.check_cc(fragment = """ + extern "C" { + #include + } + int main() { } + """, msg = 'Checking for buffersrc.h', + uselib = 'AVCODEC', + define_name = 'HAVE_BUFFERSRC_H', + mandatory = False) + conf.recurse('src') conf.recurse('test') @@ -177,7 +220,7 @@ def build(bld): bld.add_post_fun(post) def dist(ctx): - ctx.excl = 'TODO core *~ src/wx/*~ src/lib/*~ .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' def create_version_cc(version): if os.path.exists('.git'):