X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=4da8c8877d2dc960119ef4a3cad8cf019babc942;hb=96c65ea9eb48dd203054f437cb4edc0e2b4ab1fd;hp=88cb2d53903f44eeb5f9dbaf47b8809e95b96ea5;hpb=5ea0218b0eb8ead10433e3308b12f5e6b4af2102;p=dcpomatic.git diff --git a/wscript b/wscript index 88cb2d539..4da8c8877 100644 --- a/wscript +++ b/wscript @@ -5,7 +5,7 @@ import distutils import distutils.spawn APPNAME = 'dcpomatic' -VERSION = '1.75.2devel' +VERSION = '2.0.41devel' def options(opt): opt.load('compiler_cxx') @@ -60,10 +60,15 @@ def dynamic_openjpeg(conf): 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.2', mandatory=True) +def static_sub(conf): + conf.check_cfg(package='libsub-1.0', atleast_version='1.0.0', args='--cflags', uselib_store='SUB', mandatory=True) + conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB] + conf.env.STLIB_SUB = ['sub-1.0'] + def static_dcp(conf, static_boost, static_xmlpp, static_xmlsec, static_ssh): - conf.check_cfg(package='libdcp', atleast_version='0.98', args='--cflags', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='1.0', args='--cflags', uselib_store='DCP', mandatory=True) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] - conf.env.STLIB_DCP = ['dcp', 'asdcp-libdcp', 'kumu-libdcp'] + conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-libdcp-1.0', 'kumu-libdcp-1.0'] conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt'] if static_boost: @@ -87,9 +92,13 @@ def static_dcp(conf, static_boost, static_xmlpp, static_xmlsec, static_ssh): conf.env.LIB_DCP.append('ssh') def dynamic_dcp(conf): - conf.check_cfg(package='libdcp', atleast_version='0.97.0', args='--cflags --libs', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='0.92', args='--cflags --libs', uselib_store='DCP', mandatory=True) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] +def dynamic_sub(conf): + conf.check_cfg(package='libsub-1.0', atleast_version='1.0.0', args='--cflags --libs', uselib_store='SUB', mandatory=True) + conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB] + def dynamic_ssh(conf): conf.check_cc(fragment=""" #include \n @@ -149,17 +158,6 @@ def static_boost(conf, lib_suffix): conf.env.STLIB_BOOST_DATETIME = ['boost_date_time%s' % lib_suffix, 'boost_system%s' % lib_suffix] conf.env.STLIB_BOOST_SIGNALS2 = ['boost_signals2'] -def dynamic_quickmail(conf): - conf.check_cxx(fragment=""" - #include - int main(void) { quickmail_initialize (); } - """, - mandatory=True, - msg='Checking for libquickmail', - libpath='/usr/local/lib', - lib=['quickmail', 'curl'], - uselib_store='QUICKMAIL') - def configure(conf): conf.load('compiler_cxx') if conf.options.target_windows: @@ -208,6 +206,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DUNICODE') conf.env.append_value('CXXFLAGS', '-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN') conf.env.append_value('CXXFLAGS', '-mfpmath=sse') + conf.env.append_value('CXXFLAGS', '-Wno-deprecated-declarations') wxrc = os.popen('wx-config --rescomp').read().split()[1:] conf.env.append_value('WINRCFLAGS', wxrc) if conf.options.enable_debug: @@ -225,8 +224,6 @@ def configure(conf): # POSIX if conf.env.TARGET_LINUX or conf.env.TARGET_OSX: conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_POSIX') - conf.env.append_value('CXXFLAGS', '-DPOSIX_LOCALE_PREFIX="%s/share/locale"' % conf.env['INSTALL_PREFIX']) - conf.env.append_value('CXXFLAGS', '-DPOSIX_ICON_PREFIX="%s/share/dcpomatic"' % conf.env['INSTALL_PREFIX']) boost_lib_suffix = '' boost_thread = 'boost_thread' conf.env.append_value('LINKFLAGS', '-pthread') @@ -234,11 +231,17 @@ def configure(conf): # Linux if conf.env.TARGET_LINUX: conf.env.append_value('CXXFLAGS', '-mfpmath=sse') + conf.env.append_value('CXXFLAGS', '-DLINUX_LOCALE_PREFIX="%s/share/locale"' % conf.env['INSTALL_PREFIX']) + conf.env.append_value('CXXFLAGS', '-DLINUX_SHARE_PREFIX="%s/share/dcpomatic2"' % conf.env['INSTALL_PREFIX']) conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX') if conf.env.TARGET_DEBIAN: # 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.TARGET_CENTOS_6 or conf.env.TARGET_CENTOS_7: + # libavcodec seems to be linked against this on Centos + conf.check_cfg(package='liblzma', args='--cflags --libs', uselib_store='LZMA', mandatory=True) if not conf.env.DISABLE_GUI and conf.env.TARGET_LINUX: conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True) @@ -258,9 +261,9 @@ def configure(conf): conf.env.STLIB_CXML = ['cxml'] conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XMLPP', mandatory=True) conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True) - conf.env.STLIB_QUICKMAIL = ['quickmail'] static_ffmpeg(conf) static_openjpeg(conf) + static_sub(conf) static_dcp(conf, False, False, False, False) dynamic_boost(conf, boost_lib_suffix, boost_thread) @@ -271,10 +274,9 @@ def configure(conf): conf.check_cfg(package='libcurl', args='--cflags --libs-only-L', uselib_store='CURL', mandatory=True) conf.env.STLIB_CURL = ['curl'] conf.env.LIB_CURL = ['ssh2', 'idn'] - conf.env.STLIB_QUICKMAIL = ['quickmail', 'curl'] - conf.env.LIB_QUICKMAIL = ['ssh2', 'idn'] static_ffmpeg(conf) static_openjpeg(conf) + static_sub(conf) static_dcp(conf, True, True, True, True) static_boost(conf, boost_lib_suffix) @@ -283,12 +285,12 @@ def configure(conf): conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags', uselib_store='CXML', mandatory=True) conf.env.STLIB_CXML = ['cxml'] conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True) - conf.env.STLIB_QUICKMAIL = ['quickmail'] conf.env.LIB_SSH = ['gssapi_krb5'] conf.env.LIB_XMLPP = ['xml2'] conf.env.LIB_XMLSEC = ['ltdl'] static_ffmpeg(conf) static_openjpeg(conf) + static_sub(conf) static_dcp(conf, False, True, True, True) dynamic_boost(conf, boost_lib_suffix, boost_thread) @@ -302,11 +304,11 @@ def configure(conf): libpath='/usr/local/lib', lib=['boost_locale%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix], uselib_store='BOOST_LOCALE') - dynamic_quickmail(conf) dynamic_boost(conf, boost_lib_suffix, boost_thread) dynamic_ffmpeg(conf) dynamic_openjpeg(conf) dynamic_dcp(conf) + dynamic_sub(conf) dynamic_ssh(conf) # Not packaging; just a straight build @@ -314,10 +316,10 @@ def configure(conf): conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags --libs', uselib_store='CXML', mandatory=True) conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XMLPP', mandatory=True) conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True) - dynamic_quickmail(conf) dynamic_boost(conf, boost_lib_suffix, boost_thread) dynamic_ffmpeg(conf) dynamic_dcp(conf) + dynamic_sub(conf) dynamic_openjpeg(conf) dynamic_ssh(conf) @@ -332,6 +334,8 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_GRAPHICS_MAGICK') conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True) + conf.check_cfg(package='pangomm-1.4', args='--cflags --libs', uselib_store='PANGOMM', mandatory=True) + conf.check_cfg(package='cairomm-1.0', args='--cflags --libs', uselib_store='CAIROMM', mandatory=True) conf.check_cc(fragment=""" #include @@ -368,10 +372,11 @@ def build(bld): bld.recurse('platform/osx') for r in ['22x22', '32x32', '48x48', '64x64', '128x128']: - bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dcpomatic.png' % r) + bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dcpomatic2.png' % r) - if not bld.env.TARGET_WINDOWS: - bld.install_files('${PREFIX}/share/dcpomatic', 'icons/taskbar_icon.png') + if bld.env.TARGET_LINUX: + bld.install_files('${PREFIX}/share/dcpomatic2', 'icons/taskbar_icon.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'LiberationSans-Regular.ttf') bld.add_post_fun(post) @@ -437,4 +442,4 @@ def pot_merge(bld): bld.recurse('src') def tags(bld): - os.system('etags src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc src/tools/*.h') + os.system('etags src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc src/tools/*.h test/*.cc')