projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump libdcp/libsub to release versions.
[dcpomatic.git]
/
wscript
diff --git
a/wscript
b/wscript
index e6ab6b667af89204244f46538277fe8ddb3130cc..58aac8a1b59f9aeeac08c0903c08e57a36c0b71e 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-1,5
+1,5
@@
#
#
-# Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
+# Copyright (C) 2012-201
6
Carl Hetherington <cth@carlh.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-26,7
+26,7
@@
import distutils.spawn
from waflib import Logs, Context
APPNAME = 'dcpomatic'
from waflib import Logs, Context
APPNAME = 'dcpomatic'
-VERSION = '2.
6.18
devel'
+VERSION = '2.
7.14
devel'
def options(opt):
opt.load('compiler_cxx')
def options(opt):
opt.load('compiler_cxx')
@@
-111,7
+111,7
@@
def configure(conf):
conf.check(lib='shlwapi', uselib_store='SHLWAPI', msg="Checking for library shlwapi")
conf.check(lib='mswsock', uselib_store='MSWSOCK', msg="Checking for library mswsock")
boost_lib_suffix = '-mt'
conf.check(lib='shlwapi', uselib_store='SHLWAPI', msg="Checking for library shlwapi")
conf.check(lib='mswsock', uselib_store='MSWSOCK', msg="Checking for library mswsock")
boost_lib_suffix = '-mt'
- boost_thread = 'boost_thread
_win32
-mt'
+ boost_thread = 'boost_thread-mt'
conf.check_cxx(fragment="""
#include <boost/locale.hpp>\n
int main() { std::locale::global (boost::locale::generator().generate ("")); }\n
conf.check_cxx(fragment="""
#include <boost/locale.hpp>\n
int main() { std::locale::global (boost::locale::generator().generate ("")); }\n
@@
-212,10
+212,10
@@
def configure(conf):
# libcxml
if conf.options.static_cxml:
# libcxml
if conf.options.static_cxml:
- conf.check_cfg(package='libcxml', atleast_version='0.1
2.0
', args='--cflags', uselib_store='CXML', mandatory=True)
+ conf.check_cfg(package='libcxml', atleast_version='0.1
5.1
', args='--cflags', uselib_store='CXML', mandatory=True)
conf.env.STLIB_CXML = ['cxml']
else:
conf.env.STLIB_CXML = ['cxml']
else:
- conf.check_cfg(package='libcxml', atleast_version='0.1
2.0
', args='--cflags --libs', uselib_store='CXML', mandatory=True)
+ conf.check_cfg(package='libcxml', atleast_version='0.1
5.1
', args='--cflags --libs', uselib_store='CXML', mandatory=True)
# libssh
if conf.options.static_ssh:
# libssh
if conf.options.static_ssh:
@@
-237,21
+237,21
@@
def configure(conf):
# libdcp
if conf.options.static_dcp:
# libdcp
if conf.options.static_dcp:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.
2.8
', args='--cflags', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.
3.3
', args='--cflags', uselib_store='DCP', mandatory=True)
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
- conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-
libdcp-1.0', 'kumu-libdcp-1.0
', 'openjp2']
+ conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-
cth', 'kumu-cth
', 'openjp2']
conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
else:
conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
else:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.
2.8
', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.
3.3
', args='--cflags --libs', uselib_store='DCP', mandatory=True)
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
# libsub
if conf.options.static_sub:
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
# libsub
if conf.options.static_sub:
- conf.check_cfg(package='libsub-1.0', atleast_version='1.1.
8
', args='--cflags', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.1.
12
', 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']
else:
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
conf.env.STLIB_SUB = ['sub-1.0']
else:
- conf.check_cfg(package='libsub-1.0', atleast_version='1.1.
8
', args='--cflags --libs', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.1.
12
', args='--cflags --libs', uselib_store='SUB', mandatory=True)
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
# libxml++
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
# libxml++
@@
-271,7
+271,7
@@
def configure(conf):
if conf.options.static_ffmpeg:
names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc']
for name in names:
if conf.options.static_ffmpeg:
names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc']
for name in names:
- static = subprocess.Popen(shlex.split('pkg-config --static --libs lib%s' % name), stdout=subprocess.PIPE).communicate()[0]
+ static = subprocess.Popen(shlex.split('pkg-config --static --libs lib%s' % name), stdout=subprocess.PIPE).communicate()[0]
.decode('utf-8')
libs = []
stlibs = []
include = []
libs = []
stlibs = []
include = []
@@
-307,10
+307,11
@@
def configure(conf):
int main () { av_ebur128_get_true_peaks (0); }\n
""",
msg='Checking for patched FFmpeg',
int main () { av_ebur128_get_true_peaks (0); }\n
""",
msg='Checking for patched FFmpeg',
- libpath='/usr/local/lib',
- lib=['avfilter'],
+ libpath=conf.env['LIBPATH_AVFORMAT'],
+ lib=['avfilter', 'avutil', 'swresample'],
+ includes=conf.env['INCLUDES_AVFORMAT'],
uselib_store='PATCHED_FFMPEG',
uselib_store='PATCHED_FFMPEG',
- define
s
_name='DCPOMATIC_HAVE_PATCHED_FFMPEG',
+ define_name='DCPOMATIC_HAVE_PATCHED_FFMPEG',
mandatory=False)
# Boost
mandatory=False)
# Boost