projects
/
libsub.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e72a1a0
)
Require libdcp 1.8.1.
v1.6.1
author
Carl Hetherington
<cth@carlh.net>
Thu, 7 Oct 2021 20:53:13 +0000
(22:53 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 7 Oct 2021 20:53:13 +0000
(22:53 +0200)
cscript
patch
|
blob
|
history
wscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index ccd7da50ce9cd1a01c35ab7bd668cda1ac330055..53da29f02c72c2e161b0180c34a1f1c79c680dab 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-22,7
+22,7
@@
import os
option_defaults = { 'force-cpp11': False }
def dependencies(target, options):
option_defaults = { 'force-cpp11': False }
def dependencies(target, options):
- return (('asdcplib', 'bb09615'), ('libdcp', 'v1.8.
0
'))
+ return (('asdcplib', 'bb09615'), ('libdcp', 'v1.8.
1
'))
def build(target, options):
cmd = './waf configure --prefix=%s' % target.directory
def build(target, options):
cmd = './waf configure --prefix=%s' % target.directory
diff --git
a/wscript
b/wscript
index eb8476fe36d91c67973bc5c8cc7b2729f646b292..ff5c14910afdcd0aeaf1e1593cefd3b593554460 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-110,12
+110,12
@@
def configure(conf):
conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True)
if conf.options.static:
conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True)
if conf.options.static:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.8.
0
', args='--cflags', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.8.
1
', args='--cflags', uselib_store='DCP', mandatory=True)
conf.env.HAVE_DCP = 1
conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-carl', 'kumu-carl', 'openjp2', 'cxml']
conf.env.LIB_DCP = ['ssl', 'crypto', 'xmlsec1-openssl', 'xmlsec1', 'glibmm-2.4', 'xml++-2.6', 'xml2', 'dl']
else:
conf.env.HAVE_DCP = 1
conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-carl', 'kumu-carl', 'openjp2', 'cxml']
conf.env.LIB_DCP = ['ssl', 'crypto', 'xmlsec1-openssl', 'xmlsec1', 'glibmm-2.4', 'xml++-2.6', 'xml2', 'dl']
else:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.8.
0
', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.8.
1
', args='--cflags --libs', 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]