import sys
APPNAME = 'dvdomatic'
-VERSION = '0.59beta1'
+VERSION = '0.71beta2'
def options(opt):
opt.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'])
- # libxml2 seems to be linked against this on Ubuntu, but it doesn't mention it in its .pc file
- conf.env.append_value('LIB', 'lzma')
+ 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'])
boost_lib_suffix = ''
boost_thread = 'boost_thread'
conf.env.append_value('LINKFLAGS', '-pthread')
+ # libxml2 seems to be linked against this on Ubuntu, but it doesn't mention it in its .pc file
+ conf.env.append_value('LIB', 'lzma')
conf.env.TARGET_WINDOWS = conf.options.target_windows
conf.env.DISABLE_GUI = conf.options.disable_gui
else:
conf.env.append_value('CXXFLAGS', '-O2')
- # Arguments to pkg-config for things that we might want to link statically
- pkgconfig_args = '--cflags --libs'
- if conf.options.static:
- pkgconfig_args += ' --static'
-
- conf.check_cfg(package = 'libavformat', args = pkgconfig_args, uselib_store = 'AVFORMAT', mandatory = True)
- conf.check_cfg(package = 'libavfilter', args = pkgconfig_args, uselib_store = 'AVFILTER', mandatory = True)
- conf.check_cfg(package = 'libavcodec', args = pkgconfig_args, uselib_store = 'AVCODEC', mandatory = True)
- conf.check_cfg(package = 'libavutil', args = pkgconfig_args, uselib_store = 'AVUTIL', mandatory = True)
- conf.check_cfg(package = 'libswscale', args = pkgconfig_args, uselib_store = 'SWSCALE', mandatory = True)
- conf.check_cfg(package = 'libswresample', args = pkgconfig_args, uselib_store = 'SWRESAMPLE', mandatory = False)
- conf.check_cfg(package = 'libpostproc', args = pkgconfig_args, 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 = ['x264', '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)
- conf.check_cfg(package = 'libdcp', atleast_version = '0.33', args = pkgconfig_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)
"""
if conf.options.static:
- conf.check_cc(fragment = openjpeg_fragment, msg = 'Checking for library openjpeg', stlib = 'openjpeg', uselib_store = 'OPENJPEG')
+ conf.check_cc(fragment = openjpeg_fragment, 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')
+ conf.check_cc(fragment = openjpeg_fragment, msg = 'Checking for library openjpeg', lib = 'openjpeg', uselib_store = 'OPENJPEG')
conf.check_cc(fragment = """
#include <libssh/libssh.h>\n
define_name = 'HAVE_G_FORMAT_SIZE',
mandatory = False)
+ conf.check_cc(fragment = """
+ extern "C" {
+ #include <libavutil/avutil.h>
+ }
+ 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 <libavcodec/avcodec.h>
+ }
+ 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 <libavfilter/buffersrc.h>
+ }
+ int main() { }
+ """, msg = 'Checking for buffersrc.h',
+ uselib = 'AVCODEC',
+ define_name = 'HAVE_BUFFERSRC_H',
+ mandatory = False)
+
conf.recurse('src')
conf.recurse('test')
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'):
projects / dcpomatic.git / blobdiff