X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=43ac63548e31b936ae98a0e7248dcc351df6816c;hb=7deb94e3cb9048891664f74d9c8a534ca6a24748;hp=646ad98fa160963792907b8fa04d49d955d3e911;hpb=aa6fb9c2cba81842e719df547a8f4ef3d52f61d0;p=dcpomatic.git diff --git a/wscript b/wscript index 646ad98fa..43ac63548 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.59beta1' +VERSION = '0.73pre' def options(opt): opt.load('compiler_cxx') @@ -13,18 +13,19 @@ 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') 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']) @@ -50,28 +51,62 @@ def configure(conf): else: conf.env.append_value('CXXFLAGS', '-O2') - 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) - conf.check_cfg(package = 'libavutil', args = '--cflags --libs', uselib_store = 'AVUTIL', mandatory = True) - conf.check_cfg(package = 'libswscale', args = '--cflags --libs', uselib_store = 'SWSCALE', mandatory = True) - conf.check_cfg(package = 'libswresample', args = '--cflags --libs', uselib_store = 'SWRESAMPLE', mandatory = False) - conf.check_cfg(package = 'libpostproc', args = '--cflags --libs', uselib_store = 'POSTPROC', mandatory = True) + 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 = '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) + conf.check_cfg(package = 'libavutil', args = '--cflags --libs', uselib_store = 'AVUTIL', mandatory = True) + conf.check_cfg(package = 'libswscale', args = '--cflags --libs', uselib_store = 'SWSCALE', mandatory = True) + conf.check_cfg(package = 'libswresample', args = '--cflags --libs', uselib_store = 'SWRESAMPLE', mandatory = False) + conf.check_cfg(package = 'libpostproc', args = '--cflags --libs', uselib_store = 'POSTPROC', mandatory = True) + else: + # This is hackio grotesquio for static builds (ie for .deb packages). We need to link some things + # statically and some dynamically, or things get horribly confused and the dynamic linker (I think) + # crashes horribly. These calls do what the check_cfg calls would have done, but specify the + # different bits as static or dynamic as required. It'll break if you look at it funny, but + # I think anyone else who builds would do so dynamically. + 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_AVFORMAT = 1 + conf.env.STLIB_AVFORMAT = ['avformat'] + conf.env.HAVE_AVFILTER = 1 + conf.env.STLIB_AVFILTER = ['avfilter', 'swresample'] + conf.env.HAVE_AVCODEC = 1 + conf.env.STLIB_AVCODEC = ['avcodec'] + conf.env.LIB_AVCODEC = ['z'] + conf.env.HAVE_AVUTIL = 1 + conf.env.STLIB_AVUTIL = ['avutil'] + conf.env.HAVE_SWSCALE = 1 + conf.env.STLIB_SWSCALE = ['swscale'] + conf.env.HAVE_SWRESAMPLE = 1 + conf.env.STLIB_SWRESAMPLE = ['swresample'] + conf.env.HAVE_POSTPROC = 1 + conf.env.STLIB_POSTPROC = ['postproc'] + + # This doesn't seem to be set up, and we need it otherwise resampling support + # won't be included. Hack upon a hack, obviously + conf.env.append_value('CXXFLAGS', ['-DHAVE_SWRESAMPLE=1']) + conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True) - libdcp_args = '--cflags --libs' - if conf.options.static: - libdcp_args += ' --static' - conf.check_cfg(package = 'libdcp', atleast_version = '0.33', args = libdcp_args, uselib_store = 'DCP', 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) - conf.check_cc(fragment = """ - #include \n - #include \n - int main () {\n - void* p = (void *) opj_image_create;\n - return 0;\n - } - """, msg = 'Checking for library openjpeg', lib = 'openjpeg', uselib_store = 'OPENJPEG') + 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) + + 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 + } + """, msg = 'Checking for library openjpeg', stlib = 'openjpeg', uselib_store = 'OPENJPEG') + else: + # 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_cc(fragment = """ #include \n @@ -79,7 +114,7 @@ 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 @@ -119,6 +154,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') @@ -144,7 +209,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'):