From dd4b5586c443a8445a9bef7f2a449f4f1f50860e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 1 Oct 2013 16:03:32 +0100 Subject: Adapt for new libdcp API; clarify name of libquickmail in configuration. --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 95b0768e8..1db377f47 100644 --- a/wscript +++ b/wscript @@ -126,7 +126,7 @@ def configure(conf): int main(void) { quickmail_initialize (); } """, mandatory=True, - msg='Checking for quickmail', + msg='Checking for libquickmail', libpath='/usr/local/lib', lib='quickmail', uselib_store='QUICKMAIL') -- cgit v1.2.3 From 055533569bbe84f4adfe19283093189b0a7d9448 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 1 Oct 2013 16:29:14 +0100 Subject: Bump libdcp version. --- cscript | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'wscript') diff --git a/cscript b/cscript index 06b91cba9..644adff07 100644 --- a/cscript +++ b/cscript @@ -4,7 +4,7 @@ import os def dependencies(target): return (('ffmpeg-cdist', 'b1219246a0cce9a4b916669d506bb33c925225c3'), - ('libdcp', '08f4fe13bbff1a674930d55ab95fd181ebd0c265')) + ('libdcp', 'v0.81')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() diff --git a/wscript b/wscript index 1db377f47..1df4d0e27 100644 --- a/wscript +++ b/wscript @@ -86,7 +86,7 @@ def configure(conf): # Dependencies which are dynamically linked everywhere except --static # Get libs only when we are dynamically linking - conf.check_cfg(package='libdcp', atleast_version='0.78', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.81', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) # Remove erroneous escaping of quotes from xmlsec1 defines conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.check_cfg(package='libcxml', atleast_version='0.01', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True) -- cgit v1.2.3 From e2d49381d110a8b75628b28e92f9c2118266c88f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 1 Oct 2013 16:30:21 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index abf94423b..2fb4906a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-10-01 Carl Hetherington + + * Version 1.06 released. + 2013-09-19 Carl Hetherington * Version 1.05 released. diff --git a/debian/changelog b/debian/changelog index a11f8121b..e204ee9b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.05-1) UNRELEASED; urgency=low +dcpomatic (1.06-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -9,8 +9,9 @@ dcpomatic (1.05-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Thu, 19 Sep 2013 15:18:59 +0100 + -- Carl Hetherington Tue, 01 Oct 2013 16:30:21 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 1df4d0e27..6b77d0508 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.06pre' +VERSION = '1.06' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 6276fd3e55f5bd5ab899af85930e794e76bef4c4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 1 Oct 2013 16:30:21 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 6b77d0508..d129e620b 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.06' +VERSION = '1.07pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 2a91e6e1432835b437748baa1c5c92de63156631 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 2 Oct 2013 11:35:59 +0100 Subject: libzip uses pkg-config. --- wscript | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index d129e620b..1e28b209a 100644 --- a/wscript +++ b/wscript @@ -137,15 +137,7 @@ def configure(conf): conf.check_cfg(package= '', path=conf.options.magickpp_config, args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True) conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XML++', mandatory=True) conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True) - - conf.check_cxx(fragment=""" - #include - int main(void) { zip_open ("foo", 0, 0); } - """, - mandatory=True, - msg='Checking for libzip', - lib='zip', - uselib_store='ZIP') + conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True) conf.check_cxx(fragment=""" #include \n -- cgit v1.2.3 From 36a6724d5a4c964792e242a3806f3d18e9018860 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 4 Oct 2013 12:55:04 +0100 Subject: Attempt to fix configuration on Windows. --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 1e28b209a..cd08261f3 100644 --- a/wscript +++ b/wscript @@ -128,7 +128,7 @@ def configure(conf): mandatory=True, msg='Checking for libquickmail', libpath='/usr/local/lib', - lib='quickmail', + lib=['quickmail', 'curl'], uselib_store='QUICKMAIL') # Dependencies which are always dynamically linked -- cgit v1.2.3