From 078537def975e7745c385fab7a09d45fe4f4db87 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 4 Dec 2015 23:39:20 +0000 Subject: [PATCH] Don't need to explicitly link to OpenJPEG. --- cscript | 2 +- src/lib/wscript | 2 +- src/tools/wscript | 2 +- test/wscript | 2 +- wscript | 11 ----------- 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/cscript b/cscript index 8c02c5500..9e5cae967 100644 --- a/cscript +++ b/cscript @@ -289,7 +289,7 @@ def configure_options(target): if target.platform == 'windows': opt += ' --target-windows' elif target.platform == 'linux': - opt += ' --static-dcpomatic --static-openjpeg --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml' + opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml' if target.distro == 'centos': opt += ' --static-xmlsec --static-ssh --disable-tests' if target.version == '6.5': diff --git a/src/lib/wscript b/src/lib/wscript index 2e9e641a3..7b272f566 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -149,7 +149,7 @@ def build(bld): obj.uselib = """ AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX - SNDFILE SAMPLERATE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++ + SNDFILE SAMPLERATE POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++ CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU """ diff --git a/src/tools/wscript b/src/tools/wscript index 262f193e4..bdf5cae81 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -27,7 +27,7 @@ def configure(conf): conf.env.append_value('LINKFLAGS', ['-mconsole']) def build(bld): - uselib = 'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC ' + uselib = 'BOOST_THREAD BOOST_DATETIME DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC ' uselib += 'AVUTIL SWSCALE POSTPROC CURL BOOST_FILESYSTEM SSH ZIP CAIROMM FONTCONFIG PANGOMM SUB MAGICK SNDFILE SAMPLERATE BOOST_REGEX ' uselib += 'ICU ' diff --git a/test/wscript b/test/wscript index 5cbc327e1..1a3838fe7 100644 --- a/test/wscript +++ b/test/wscript @@ -30,7 +30,7 @@ def configure(conf): def build(bld): obj = bld(features='cxx cxxprogram') obj.name = 'unit-tests' - obj.uselib = 'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE SAMPLERATE DCP OPENJPEG FONTCONFIG CAIROMM PANGOMM XMLPP ' + obj.uselib = 'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE SAMPLERATE DCP FONTCONFIG CAIROMM PANGOMM XMLPP ' obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML MAGICK SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU ' if bld.env.TARGET_WINDOWS: obj.uselib += 'WINSOCK2' diff --git a/wscript b/wscript index 52965b132..688ebc681 100644 --- a/wscript +++ b/wscript @@ -39,7 +39,6 @@ def options(opt): opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to make a Windows package') opt.add_option('--static-dcpomatic', action='store_true', default=False, help='link to components of DCP-o-matic statically') opt.add_option('--static-boost', action='store_true', default=False, help='link statically to Boost') - opt.add_option('--static-openjpeg', action='store_true', default=False, help='link statically to OpenJPEG') opt.add_option('--static-wxwidgets', action='store_true', default=False, help='link statically to wxWidgets') opt.add_option('--static-ffmpeg', action='store_true', default=False, help='link statically to FFmpeg') opt.add_option('--static-xmlpp', action='store_true', default=False, help='link statically to libxml++') @@ -268,15 +267,6 @@ def configure(conf): else: conf.env.LIB_XMLSEC = ['xmlsec1-openssl', 'xmlsec1'] - # OpenJPEG - if conf.options.static_openjpeg: - 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.2', mandatory=True) - conf.env.STLIB_OPENJPEG = ['openjpeg'] - else: - 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) - # FFmpeg if conf.options.static_ffmpeg: names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc'] @@ -414,7 +404,6 @@ def configure(conf): report('DCP-o-matic libraries', conf.options.static_dcpomatic) report('Boost', conf.options.static_boost) - report('OpenJPEG', conf.options.static_openjpeg) report('wxWidgets', conf.options.static_wxwidgets) report('FFmpeg', conf.options.static_ffmpeg) report('libxml++', conf.options.static_xmlpp) -- 2.30.2