X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=e8c19386109a25a885c8e6a54ac14cfba6a4498a;hb=5575a950f13dbed1e60d733aee71b316c3429ae0;hp=895916f17e125dfb4e45a1a0f606e400327b2916;hpb=da0e455aaa035f5f90c690ffed23049fbf1f18eb;p=dcpomatic.git diff --git a/wscript b/wscript index 895916f17..e8c193861 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.65.2devel' +VERSION = '1.69.2devel' def options(opt): opt.load('compiler_cxx') @@ -33,8 +33,6 @@ def static_ffmpeg(conf): conf.env.STLIB_SWSCALE = ['swscale'] conf.check_cfg(package='libswresample', args='--cflags', uselib_store='SWRESAMPLE', mandatory=True) conf.env.STLIB_SWRESAMPLE = ['swresample'] - conf.check_cfg(package='libpostproc', args='--cflags', uselib_store='POSTPROC', mandatory=True) - conf.env.STLIB_POSTPROC = ['postproc'] def dynamic_ffmpeg(conf): conf.check_cfg(package='libavformat', args='--cflags --libs', uselib_store='AVFORMAT', mandatory=True) @@ -43,16 +41,15 @@ def dynamic_ffmpeg(conf): 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=True) - conf.check_cfg(package='libpostproc', args='--cflags --libs', uselib_store='POSTPROC', mandatory=True) def static_openjpeg(conf): conf.check_cfg(package='libopenjpeg', args='--cflags', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True) - conf.check_cfg(package='libopenjpeg', args='--cflags', max_version='1.5.1', mandatory=True) + conf.check_cfg(package='libopenjpeg', args='--cflags', max_version='1.5.2', mandatory=True) conf.env.STLIB_OPENJPEG = ['openjpeg'] 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.1', mandatory=True) + conf.check_cfg(package='libopenjpeg', args='--cflags --libs', max_version='1.5.2', mandatory=True) def static_dcp(conf, static_boost, static_xmlpp, static_xmlsec, static_ssh): conf.check_cfg(package='libdcp', atleast_version='0.92', args='--cflags', uselib_store='DCP', mandatory=True) @@ -403,3 +400,6 @@ def pot(bld): 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')