From fc790b244c6473539171a10946f5780ae0a43d28 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 10 Jul 2014 15:37:26 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 404782b3c..a35d6658c 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.0devel' +VERSION = '1.72.1' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 768c3c7de082fb2449e57a8fd5c05fc32dad665d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 10 Jul 2014 15:37:26 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index a35d6658c..44340bc46 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.1' +VERSION = '1.72.1devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From f889d9987022d1d00a934b2d684de93606c6c80c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 10 Jul 2014 21:27:55 +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 fee8a50f3..7352d7674 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-07-10 Carl Hetherington + + * Version 1.72.2 released. + 2014-07-10 Carl Hetherington * Try to fix corruption of KDM email setting in diff --git a/debian/changelog b/debian/changelog index 09662e58b..7a82f85e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.72.1-1) UNRELEASED; urgency=low +dcpomatic (1.72.2-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -166,8 +166,9 @@ dcpomatic (1.72.1-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Thu, 10 Jul 2014 15:37:26 +0100 + -- Carl Hetherington Thu, 10 Jul 2014 21:27:55 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 44340bc46..23fd75494 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.1devel' +VERSION = '1.72.2' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 87ca7e6e1f8f4281638d764792c217942d3ea99f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 10 Jul 2014 21:27:55 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 23fd75494..913cb013d 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.2' +VERSION = '1.72.2devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From b43726102d7417b4ada23696c31bf6e2b29b551f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 12 Jul 2014 22:39:43 +0100 Subject: Update libdcp versioning. --- cscript | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'wscript') diff --git a/cscript b/cscript index af3921e2f..9d1605b2f 100644 --- a/cscript +++ b/cscript @@ -157,7 +157,7 @@ def make_control(debian_version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', '67dc770'), - ('libdcp', '7103135')) + ('libdcp', 'v0.96.0')) def build(target, options): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() diff --git a/wscript b/wscript index 913cb013d..a8cb05f7d 100644 --- a/wscript +++ b/wscript @@ -56,7 +56,7 @@ def dynamic_openjpeg(conf): 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.95', args='--cflags', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.96', args='--cflags', uselib_store='DCP', mandatory=True) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.env.STLIB_DCP = ['dcp', 'asdcp-libdcp', 'kumu-libdcp'] conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt'] -- cgit v1.2.3 From 06b5be0722782353ceff6e7fa94f115bd37ed8af Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 13 Jul 2014 22:35:46 +0100 Subject: Centos build fixes. --- cscript | 5 ++++- src/lib/wscript | 6 +++--- src/wx/wscript | 3 +++ wscript | 37 +++++++++++++++++++++++++++---------- 4 files changed, 37 insertions(+), 14 deletions(-) (limited to 'wscript') diff --git a/cscript b/cscript index 9d1605b2f..7a6133645 100644 --- a/cscript +++ b/cscript @@ -169,7 +169,10 @@ def build(target, options): if target.version == 'unstable': cmd += ' --debian-unstable' elif target.distro == 'centos': - cmd += ' --target-centos' + if target.version == '6.5': + cmd += ' --target-centos-6' + elif target.version == '7': + cmd += ' --target-centos-7' target.command(cmd) target.command('./waf') diff --git a/src/lib/wscript b/src/lib/wscript index 933368776..6d563f255 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -83,8 +83,8 @@ def build(bld): obj.uselib = """ AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 - SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++ - CURL ZIP QUICKMAIL + SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XMLPP + CURL ZIP QUICKMAIL XMLSEC """ if bld.env.TARGET_OSX: @@ -96,7 +96,7 @@ def build(bld): obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE' obj.source += ' stack.cpp' if bld.env.BUILD_STATIC: - obj.uselib += ' XML++' + obj.uselib += ' XMLPP' obj.target = 'dcpomatic' diff --git a/src/wx/wscript b/src/wx/wscript index f26a91cbc..8bf2451c2 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -67,6 +67,9 @@ def configure(conf): conf.env.LIB_WXWIDGETS.append('Xxf86vm') conf.env.LIB_WXWIDGETS.append('Xext') conf.env.LIB_WXWIDGETS.append('X11') + + if conf.env.TARGET_CENTOS_7: + conf.env.LIB_WXWIDGETS.append('Xxf86vm') conf.in_msg = 1 wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip() diff --git a/wscript b/wscript index a8cb05f7d..866d977b0 100644 --- a/wscript +++ b/wscript @@ -14,7 +14,8 @@ 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('--target-debian', action='store_true', default=False, help='set up to compile for a Debian/Ubuntu package') opt.add_option('--debian-unstable', action='store_true', default=False, help='add extra libraries to static-build correctly on Debian unstable') - opt.add_option('--target-centos', action='store_true', default=False, help='set up to compile for a Centos package') + opt.add_option('--target-centos-6', action='store_true', default=False, help='set up to compile for a Centos 6.5 package') + opt.add_option('--target-centos-7', action='store_true', default=False, help='set up to compile for a Centos 7 package') opt.add_option('--magickpp-config', action='store', default='Magick++-config', help='path to Magick++-config') opt.add_option('--wx-config', action='store', default='wx-config', help='path to wx-config') opt.add_option('--address-sanitizer', action='store_true', default=False, help='build with address sanitizer') @@ -165,12 +166,13 @@ def configure(conf): conf.env.DISABLE_GUI = conf.options.disable_gui conf.env.TARGET_DEBIAN = conf.options.target_debian conf.env.DEBIAN_UNSTABLE = conf.options.debian_unstable - conf.env.TARGET_CENTOS = conf.options.target_centos + conf.env.TARGET_CENTOS_6 = conf.options.target_centos_6 + conf.env.TARGET_CENTOS_7 = conf.options.target_centos_7 conf.env.VERSION = VERSION conf.env.TARGET_OSX = sys.platform == 'darwin' conf.env.TARGET_LINUX = not conf.env.TARGET_WINDOWS and not conf.env.TARGET_OSX # true if we should build dcpomatic/libdcpomatic/libdcpomatic-wx statically - conf.env.BUILD_STATIC = conf.options.target_debian or conf.options.target_centos + conf.env.BUILD_STATIC = conf.options.target_debian or conf.options.target_centos_6 or conf.options.target_centos_7 if conf.options.install_prefix is None: conf.env.INSTALL_PREFIX = conf.env.PREFIX else: @@ -218,8 +220,8 @@ def configure(conf): # POSIX if conf.env.TARGET_LINUX or conf.env.TARGET_OSX: conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_POSIX') - conf.env.append_value('CXXFLAGS', '-DPOSIX_LOCALE_PREFIX="%s/share/locale"' % conf.env['PREFIX']) - conf.env.append_value('CXXFLAGS', '-DPOSIX_ICON_PREFIX="%s/share/dcpomatic"' % conf.env['PREFIX']) + conf.env.append_value('CXXFLAGS', '-DPOSIX_LOCALE_PREFIX="%s/share/locale"' % conf.env['INSTALL_PREFIX']) + conf.env.append_value('CXXFLAGS', '-DPOSIX_ICON_PREFIX="%s/share/dcpomatic"' % conf.env['INSTALL_PREFIX']) boost_lib_suffix = '' boost_thread = 'boost_thread' conf.env.append_value('LINKFLAGS', '-pthread') @@ -249,7 +251,7 @@ def configure(conf): if conf.env.TARGET_DEBIAN: conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags', uselib_store='CXML', mandatory=True) conf.env.STLIB_CXML = ['cxml'] - conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XML++', mandatory=True) + conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XMLPP', mandatory=True) conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True) conf.env.STLIB_QUICKMAIL = ['quickmail'] static_ffmpeg(conf) @@ -257,7 +259,8 @@ def configure(conf): static_dcp(conf, False, False, False, False) dynamic_boost(conf, boost_lib_suffix, boost_thread) - if conf.env.TARGET_CENTOS: + if conf.env.TARGET_CENTOS_6: + # Centos 6.5's boost is too old, so we build a new version statically in the chroot conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags --libs-only-L', uselib_store='CXML', mandatory=True) conf.env.STLIB_CXML = ['cxml', 'boost_filesystem'] conf.check_cfg(package='libcurl', args='--cflags --libs-only-L', uselib_store='CURL', mandatory=True) @@ -270,8 +273,22 @@ def configure(conf): static_dcp(conf, True, True, True, True) static_boost(conf, boost_lib_suffix) + if conf.env.TARGET_CENTOS_7: + # Centos 7's boost is ok so we link it dynamically + conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags', uselib_store='CXML', mandatory=True) + conf.env.STLIB_CXML = ['cxml'] + conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True) + conf.env.STLIB_QUICKMAIL = ['quickmail'] + conf.env.LIB_SSH = ['gssapi_krb5'] + conf.env.LIB_XMLPP = ['xml2'] + conf.env.LIB_XMLSEC = ['ltdl'] + static_ffmpeg(conf) + static_openjpeg(conf) + static_dcp(conf, False, True, True, True) + dynamic_boost(conf, boost_lib_suffix, boost_thread) + if conf.env.TARGET_WINDOWS: - conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XML++', mandatory=True) + conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XMLPP', mandatory=True) conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True) conf.check_cxx(fragment=""" #include \n @@ -288,9 +305,9 @@ def configure(conf): dynamic_ssh(conf) # Not packaging; just a straight build - if not conf.env.TARGET_WINDOWS and not conf.env.TARGET_DEBIAN and not conf.env.TARGET_CENTOS: + if not conf.env.TARGET_WINDOWS and not conf.env.TARGET_DEBIAN and not conf.env.TARGET_CENTOS_6 and not conf.env.TARGET_CENTOS_7: conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags --libs', uselib_store='CXML', mandatory=True) - conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XML++', mandatory=True) + conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XMLPP', mandatory=True) conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True) dynamic_quickmail(conf) dynamic_boost(conf, boost_lib_suffix, boost_thread) -- cgit v1.2.3 From cd4ad2186dba563db5b803963a86501f0b1e60f9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 14 Jul 2014 11:53:57 +0100 Subject: More centos build fixes. --- cscript | 4 ++-- platform/linux/dcpomatic.spec.in | 12 ++++++------ platform/linux/wscript | 19 ++++++++++++------- wscript | 8 ++++++-- 4 files changed, 26 insertions(+), 17 deletions(-) (limited to 'wscript') diff --git a/cscript b/cscript index 46eaaf929..5ea5a4cfd 100644 --- a/cscript +++ b/cscript @@ -157,7 +157,7 @@ def make_control(debian_version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', '67dc770'), - ('libdcp', '563c7fd')) + ('libdcp', '009e07f')) def build(target, options): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() @@ -170,7 +170,7 @@ def build(target, options): cmd += ' --debian-unstable' elif target.distro == 'centos': if target.version == '6.5': - cmd += ' --target-centos-6' + cmd += ' --target-centos-6 --disable-tests' elif target.version == '7': cmd += ' --target-centos-7' diff --git a/platform/linux/dcpomatic.spec.in b/platform/linux/dcpomatic.spec.in index 46a0d1ce4..f39c2cbd8 100644 --- a/platform/linux/dcpomatic.spec.in +++ b/platform/linux/dcpomatic.spec.in @@ -1,6 +1,6 @@ Summary:A program that generates Digital Cinema Packages (DCPs) from video and audio files Name:dcpomatic -Version:@version@ +Version:@VERSION@ Release:1%{?dist} License:GPL Group:Applications/Multimedia @@ -49,15 +49,15 @@ digital projectors. %{_datadir}/locale/nl_NL/LC_MESSAGES/libdcpomatic.mo %prep -rm -rf $RPM_BUILD_DIR/dcpomatic-@version@ -tar xjf $RPM_SOURCE_DIR/dcpomatic-@version@.tar.bz2 +rm -rf $RPM_BUILD_DIR/dcpomatic-@VERSION@ +tar xjf $RPM_SOURCE_DIR/dcpomatic-@VERSION@.tar.bz2 %build -cd dcpomatic-@version@ +cd dcpomatic-@VERSION@ export PKG_CONFIG_PATH=/home/carl/lib/pkgconfig:/usr/local/lib/pkgconfig -CXXFLAGS="-I/home/carl/include" LDFLAGS="-L/home/carl/lib" ./waf configure --prefix=%{buildroot}/usr --install-prefix=/usr --target-centos +CXXFLAGS="-I/home/carl/include" LDFLAGS="-L/home/carl/lib" ./waf configure --prefix=%{buildroot}/usr --install-prefix=/usr --target-centos-@CENTOS_VERSION@ --disable-tests ./waf %install -cd dcpomatic-@version@ +cd dcpomatic-@VERSION@ ./waf install %post diff --git a/platform/linux/wscript b/platform/linux/wscript index fe6f4e2db..3aab4f7fb 100644 --- a/platform/linux/wscript +++ b/platform/linux/wscript @@ -1,25 +1,30 @@ def build(bld): - d = { 'INSTALL_PREFIX' : bld.env.INSTALL_PREFIX } - d = { 'VERSION' : bld.env.VERSION } - obj = bld(features='subst') obj.source = 'dcpomatic.desktop.in' obj.target = 'dcpomatic.desktop' - obj.dict = d + obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX + obj.VERSION = bld.env.VERSION obj = bld(features='subst') obj.source = 'dcpomatic_batch.desktop.in' obj.target = 'dcpomatic_batch.desktop' - obj.dict = d + obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX + obj.VERSION = bld.env.VERSION obj = bld(features='subst') obj.source = 'dcpomatic_server.desktop.in' obj.target = 'dcpomatic_server.desktop' - obj.dict = d + obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX + obj.VERSION = bld.env.VERSION obj = bld(features='subst') obj.source = 'dcpomatic.spec.in' obj.target = 'dcpomatic.spec' - obj.dict = d + obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX + obj.VERSION = bld.env.VERSION + if bld.env.TARGET_CENTOS_6: + obj.CENTOS_VERSION = '6' + elif bld.env.TARGET_CENTOS_7: + obj.CENTOS_VERSION = '7' bld.install_files('${PREFIX}/share/applications', ['dcpomatic.desktop', 'dcpomatic_batch.desktop', 'dcpomatic_server.desktop']) diff --git a/wscript b/wscript index 866d977b0..ef72a61e5 100644 --- a/wscript +++ b/wscript @@ -11,6 +11,7 @@ def options(opt): opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation') opt.add_option('--disable-gui', action='store_true', default=False, help='disable building of GUI tools') + opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests') 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('--target-debian', action='store_true', default=False, help='set up to compile for a Debian/Ubuntu package') opt.add_option('--debian-unstable', action='store_true', default=False, help='add extra libraries to static-build correctly on Debian unstable') @@ -164,6 +165,7 @@ def configure(conf): # conf.options -> conf.env conf.env.TARGET_WINDOWS = conf.options.target_windows conf.env.DISABLE_GUI = conf.options.disable_gui + conf.env.DISABLE_TESTS = conf.options.disable_tests conf.env.TARGET_DEBIAN = conf.options.target_debian conf.env.DEBIAN_UNSTABLE = conf.options.debian_unstable conf.env.TARGET_CENTOS_6 = conf.options.target_centos_6 @@ -340,13 +342,15 @@ def configure(conf): conf.define('DATADIR', datadir) conf.recurse('src') - conf.recurse('test') + if not conf.env.DISABLE_TESTS: + conf.recurse('test') def build(bld): create_version_cc(VERSION, bld.env.CXXFLAGS) bld.recurse('src') - bld.recurse('test') + if not bld.env.DISABLE_TESTS: + bld.recurse('test') if bld.env.TARGET_WINDOWS: bld.recurse('platform/windows') if bld.env.TARGET_LINUX: -- cgit v1.2.3 From a8c46e9791b6bf2f5aa0fa1a8640bf0991b88cf1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 16 Jul 2014 14:26:32 +0000 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 62777b4d2..40797c7b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-07-16 Carl Hetherington + + * Version 1.72.3 released. + 2014-07-16 Carl Hetherington * Improve approximate time reports a bit. diff --git a/debian/changelog b/debian/changelog index 7a82f85e9..32ab78e75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.72.2-1) UNRELEASED; urgency=low +dcpomatic (1.72.3-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -167,8 +167,9 @@ dcpomatic (1.72.2-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Thu, 10 Jul 2014 21:27:55 +0100 + -- Carl Hetherington Wed, 16 Jul 2014 14:26:32 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index ef72a61e5..09443ecdc 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.2devel' +VERSION = '1.72.3' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 4861afbaab9c3710152d80f15c7a239c26deb74b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 16 Jul 2014 14:26:32 +0000 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 09443ecdc..3e82c62e8 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.3' +VERSION = '1.72.3devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From f2954b2d31e00ff6d92a4fe00488a7d0d9792872 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 16 Jul 2014 16:10:58 +0000 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 e225fb565..bc387ac2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-07-16 Carl Hetherington + + * Version 1.72.4 released. + 2014-07-16 Carl Hetherington * Add default scaling setting to preferences (#384). diff --git a/debian/changelog b/debian/changelog index 32ab78e75..5bc42201a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.72.3-1) UNRELEASED; urgency=low +dcpomatic (1.72.4-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -168,8 +168,9 @@ dcpomatic (1.72.3-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Wed, 16 Jul 2014 14:26:32 +0000 + -- Carl Hetherington Wed, 16 Jul 2014 16:10:58 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 3e82c62e8..02274cd87 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.3devel' +VERSION = '1.72.4' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From b1101aa464f3b7cca89dfb868dd573b6d9bde195 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 16 Jul 2014 16:10:58 +0000 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 02274cd87..5ad4332a4 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.4' +VERSION = '1.72.4devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 005a02da2e4a818f652c23f7c6b4e3d2799e087b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 29 Jul 2014 23:33:50 +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 e550ddf3f..2934ebfb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-07-29 Carl Hetherington + + * Version 1.72.5 released. + 2014-07-17 Carl Hetherington * Fix corrupted text in job descriptions in some cases. diff --git a/debian/changelog b/debian/changelog index 5bc42201a..5527b56e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.72.4-1) UNRELEASED; urgency=low +dcpomatic (1.72.5-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -169,8 +169,9 @@ dcpomatic (1.72.4-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Wed, 16 Jul 2014 16:10:58 +0000 + -- Carl Hetherington Tue, 29 Jul 2014 23:33:50 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 5ad4332a4..4513c893d 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.4devel' +VERSION = '1.72.5' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 7c2eabe8ed9c6945c0104e21b74b1e6383ce61eb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 29 Jul 2014 23:33:50 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 4513c893d..949fe1361 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.5' +VERSION = '1.72.5devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 851373c9996c6f89aa520b9719539dce121ad585 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 8 Aug 2014 10:01:02 +0100 Subject: Mangle version. --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 949fe1361..33e459784 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.5devel' +VERSION = '1.72.6devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From da1fd64a9012e5fd52d09fb55fe9e792ceed1d55 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 8 Aug 2014 10:04:46 +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 884f384bb..6cc3c346e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-08-08 Carl Hetherington + + * Version 1.72.7 released. + 2014-08-04 Carl Hetherington * Add BCC option for KDM emails. diff --git a/debian/changelog b/debian/changelog index 5527b56e7..f6b751080 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.72.5-1) UNRELEASED; urgency=low +dcpomatic (1.72.7-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -170,8 +170,9 @@ dcpomatic (1.72.5-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Tue, 29 Jul 2014 23:33:50 +0100 + -- Carl Hetherington Fri, 08 Aug 2014 10:04:46 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 33e459784..9e610588f 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.6devel' +VERSION = '1.72.7' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 421f986a094bd7c2c555849dd764be72566ade93 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 8 Aug 2014 10:04:46 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 9e610588f..df988a940 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.7' +VERSION = '1.72.7devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From d3180704ab83fb558bf466b9473060483fb31fe0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 9 Aug 2014 12:34:04 +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 6cc3c346e..8ceda0976 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-08-09 Carl Hetherington + + * Version 1.72.8 released. + 2014-08-08 Carl Hetherington * Version 1.72.7 released. diff --git a/debian/changelog b/debian/changelog index f6b751080..0fa705805 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.72.7-1) UNRELEASED; urgency=low +dcpomatic (1.72.8-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -171,8 +171,9 @@ dcpomatic (1.72.7-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Fri, 08 Aug 2014 10:04:46 +0100 + -- Carl Hetherington Sat, 09 Aug 2014 12:34:03 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index df988a940..50a578ef1 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.7devel' +VERSION = '1.72.8' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 1db078beaf869b03ca235e25e13faaadabdb1f3b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 9 Aug 2014 12:34:04 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 50a578ef1..e67896919 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.8' +VERSION = '1.72.8devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 59c0d60b6cb555823e8c7d6634d64ed7049d50e5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 9 Aug 2014 12:38:04 +0100 Subject: Mangle version. --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index e67896919..8f91532dc 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.8devel' +VERSION = '1.72.9devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From dde478c7d3cccf83dd442a9d3771277d5ccfd636 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 9 Aug 2014 12:38:18 +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 7122b8b15..04778b35f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-08-09 Carl Hetherington + + * Version 1.72.10 released. + 2014-08-09 Carl Hetherington * Version 1.72.8 released. diff --git a/debian/changelog b/debian/changelog index 0fa705805..0cf0cc1d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.72.8-1) UNRELEASED; urgency=low +dcpomatic (1.72.10-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -172,8 +172,9 @@ dcpomatic (1.72.8-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sat, 09 Aug 2014 12:34:03 +0100 + -- Carl Hetherington Sat, 09 Aug 2014 12:38:18 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 8f91532dc..83b835567 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.9devel' +VERSION = '1.72.10' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 9a3bb0784f7cd1011e071eeea53b30f15c8dbe3c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 9 Aug 2014 12:38:18 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 83b835567..f346033c0 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.10' +VERSION = '1.72.10devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From e4527d7a3a4bba8147d179f82dcf5004dd89b499 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 18 Aug 2014 19:05:07 +0100 Subject: Bump required libdcp version. --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index f346033c0..58fc90e47 100644 --- a/wscript +++ b/wscript @@ -84,7 +84,7 @@ def static_dcp(conf, static_boost, static_xmlpp, static_xmlsec, static_ssh): conf.env.LIB_DCP.append('ssh') def dynamic_dcp(conf): - conf.check_cfg(package='libdcp', atleast_version='0.95.0', args='--cflags --libs', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.96.0', args='--cflags --libs', uselib_store='DCP', mandatory=True) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] def dynamic_ssh(conf): -- cgit v1.2.3 From 7346a6fb2ffa7f1b6f2b7e4b5e9567dea037e9e8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 20 Aug 2014 12:21:57 +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 1f93e2f98..44e8a2569 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-08-20 Carl Hetherington + + * Version 1.72.11 released. + 2014-08-19 Carl Hetherington * Attempt to fix random crashes on OS X (especially during encodes) diff --git a/debian/changelog b/debian/changelog index 0cf0cc1d8..7427464c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.72.10-1) UNRELEASED; urgency=low +dcpomatic (1.72.11-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -173,8 +173,9 @@ dcpomatic (1.72.10-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sat, 09 Aug 2014 12:38:18 +0100 + -- Carl Hetherington Wed, 20 Aug 2014 12:21:56 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 58fc90e47..867890da0 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.10devel' +VERSION = '1.72.11' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 30fb65ed98aa322d22d370b6e7d66979d6daa6f7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 20 Aug 2014 12:21:57 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 867890da0..f53eed0db 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.11' +VERSION = '1.72.11devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 6f25f88784f368163619d9eb0b27cdc2a7a6525f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 23 Aug 2014 18:47:52 +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 d8efe7141..8b0a5cd3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-08-23 Carl Hetherington + + * Version 1.72.12 released. + 2014-08-23 Carl Hetherington * Revert previous use of AVFormatContext::start_time when diff --git a/debian/changelog b/debian/changelog index 7427464c7..f5d36b9df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.72.11-1) UNRELEASED; urgency=low +dcpomatic (1.72.12-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -174,8 +174,9 @@ dcpomatic (1.72.11-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Wed, 20 Aug 2014 12:21:56 +0100 + -- Carl Hetherington Sat, 23 Aug 2014 18:47:52 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index f53eed0db..e65b6bdca 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.11devel' +VERSION = '1.72.12' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From a6d6a794b28c3b3e6679f01c1890f396453eb5ac Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 23 Aug 2014 18:47:52 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index e65b6bdca..4f476b034 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.12' +VERSION = '1.72.12devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From f9b9d563408b13e3dc5531f1100aacec12f95c2a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 26 Aug 2014 21:47:11 +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 05a7f868c..3eb5b3c93 100644 --- a/cscript +++ b/cscript @@ -157,7 +157,7 @@ def make_control(debian_version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', '7e95caa'), - ('libdcp', '7f029e7')) + ('libdcp', 'v0.97.0')) def build(target, options): cmd = './waf configure --prefix=%s' % target.directory diff --git a/wscript b/wscript index 4f476b034..eaa4260cc 100644 --- a/wscript +++ b/wscript @@ -84,7 +84,7 @@ def static_dcp(conf, static_boost, static_xmlpp, static_xmlsec, static_ssh): conf.env.LIB_DCP.append('ssh') def dynamic_dcp(conf): - conf.check_cfg(package='libdcp', atleast_version='0.96.0', args='--cflags --libs', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.97.0', args='--cflags --libs', uselib_store='DCP', mandatory=True) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] def dynamic_ssh(conf): -- cgit v1.2.3 From 2dcfcdadf31b4fe43cf7a3c9556a2bc002f9fd78 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 26 Aug 2014 21:47:56 +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 c3d8a77c4..bbc8299cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-08-26 Carl Hetherington + + * Version 1.73.0 released. + 2014-08-25 Carl Hetherington * Basic recent files list in the File menu. diff --git a/debian/changelog b/debian/changelog index f5d36b9df..7002c19cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.72.12-1) UNRELEASED; urgency=low +dcpomatic (1.73.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -175,8 +175,9 @@ dcpomatic (1.72.12-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sat, 23 Aug 2014 18:47:52 +0100 + -- Carl Hetherington Tue, 26 Aug 2014 21:47:56 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index eaa4260cc..7fb68292d 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.12devel' +VERSION = '1.73.0' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 06435a3dd129d35a28f9b948ada3153d93c33b07 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 26 Aug 2014 21:47:56 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 7fb68292d..f416450f5 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.0' +VERSION = '1.73.0devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From f066fe5fb8589d931d91e924f7e31f09efb33fd3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 1 Sep 2014 00:35:03 +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 c919f85b5..9314e4066 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-09-01 Carl Hetherington + + * Version 1.73.1 released. + 2014-08-31 Carl Hetherington * Remove configurable CPL and use "DCP-o-matic (version) (git)" diff --git a/debian/changelog b/debian/changelog index 7002c19cf..fe8a3c775 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.73.0-1) UNRELEASED; urgency=low +dcpomatic (1.73.1-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -176,8 +176,9 @@ dcpomatic (1.73.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Tue, 26 Aug 2014 21:47:56 +0100 + -- Carl Hetherington Mon, 01 Sep 2014 00:35:03 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index f416450f5..3636eb633 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.0devel' +VERSION = '1.73.1' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 1226749f32bd48c4aa49548f6dac29b9e02fac55 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 1 Sep 2014 00:35:03 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 3636eb633..a4cc1265b 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.1' +VERSION = '1.73.1devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 9b518f44a72db0883d4e9c008486d014e8f62748 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 3 Sep 2014 23:36:54 +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 d9be8474e..0fcb2da4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-09-03 Carl Hetherington + + * Version 1.73.2 released. + 2014-09-03 Carl Hetherington * Fix server certificate downloads on OS X (#376). diff --git a/debian/changelog b/debian/changelog index fe8a3c775..63e999b72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.73.1-1) UNRELEASED; urgency=low +dcpomatic (1.73.2-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -177,8 +177,9 @@ dcpomatic (1.73.1-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Mon, 01 Sep 2014 00:35:03 +0100 + -- Carl Hetherington Wed, 03 Sep 2014 23:36:54 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index a4cc1265b..8698dddc4 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.1devel' +VERSION = '1.73.2' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 4092121ad052f406e8b5c5a2debbd8256321f182 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 3 Sep 2014 23:36:54 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 8698dddc4..9b86b6e6f 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.2' +VERSION = '1.73.2devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 1ceeaf9dd207ebd47b451db05fdbd96ce35149e1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 7 Sep 2014 23:31:29 +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 99cc20dc1..7cf912205 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-09-07 Carl Hetherington + + * Version 1.73.3 released. + 2014-09-07 Carl Hetherington * Put no stretch / no scale in the set of choices for default diff --git a/debian/changelog b/debian/changelog index 63e999b72..4b22907c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.73.2-1) UNRELEASED; urgency=low +dcpomatic (1.73.3-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -178,8 +178,9 @@ dcpomatic (1.73.2-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Wed, 03 Sep 2014 23:36:54 +0100 + -- Carl Hetherington Sun, 07 Sep 2014 23:31:29 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 9b86b6e6f..57dc3fec8 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.2devel' +VERSION = '1.73.3' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 8b540964a31926f4afc2be3937a01b28f7c91689 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 7 Sep 2014 23:31:29 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 57dc3fec8..332db4c31 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.3' +VERSION = '1.73.3devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From a9fb34ad2f6cfc3be0835ec8a7926b6e6c71d7dc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 8 Sep 2014 23:03:01 +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 284e5b3bd..67f31f66c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-09-08 Carl Hetherington + + * Version 1.73.4 released. + 2014-09-08 Carl Hetherington * Fix failure to load Targa files. diff --git a/debian/changelog b/debian/changelog index 4b22907c3..5462ec7e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.73.3-1) UNRELEASED; urgency=low +dcpomatic (1.73.4-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -179,8 +179,9 @@ dcpomatic (1.73.3-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sun, 07 Sep 2014 23:31:29 +0100 + -- Carl Hetherington Mon, 08 Sep 2014 23:03:01 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 332db4c31..017c9634c 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.3devel' +VERSION = '1.73.4' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 843591bfb79284c8910e3fb0252991ab22696097 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 8 Sep 2014 23:03:01 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 017c9634c..91cb84a9d 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.4' +VERSION = '1.73.4devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 087eb941421d0ced97c8f3bf72072f19562435df Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 9 Sep 2014 19:13:40 +0100 Subject: Bump libcxml version requirement in wscript. --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 91cb84a9d..8db63f625 100644 --- a/wscript +++ b/wscript @@ -251,7 +251,7 @@ def configure(conf): # if conf.env.TARGET_DEBIAN: - conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags', uselib_store='CXML', mandatory=True) + conf.check_cfg(package='libcxml', atleast_version='0.11', args='--cflags', uselib_store='CXML', mandatory=True) conf.env.STLIB_CXML = ['cxml'] conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XMLPP', mandatory=True) conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True) -- cgit v1.2.3 From a0b90c6e9e92fb196703cca015427f0bf1f92ba0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 14 Sep 2014 10:56:13 +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 6e5ee6d83..00b1c0089 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-09-14 Carl Hetherington + + * Version 1.73.5 released. + 2014-09-14 Carl Hetherington * Update to nl_NL translation from Cherif Ben Brahim. diff --git a/debian/changelog b/debian/changelog index 5462ec7e4..0584ec5c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.73.4-1) UNRELEASED; urgency=low +dcpomatic (1.73.5-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -180,8 +180,9 @@ dcpomatic (1.73.4-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Mon, 08 Sep 2014 23:03:01 +0100 + -- Carl Hetherington Sun, 14 Sep 2014 10:56:13 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 8db63f625..543a843a5 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.4devel' +VERSION = '1.73.5' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From ed5fb94d493cc1db7fedbfd17128c5a0c9744f50 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 14 Sep 2014 10:56:13 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 543a843a5..d1ce36e3c 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.5' +VERSION = '1.73.5devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 4fb8e33a71dca80b28d52e5aa7fe4e63eeff816c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 14 Sep 2014 21:50:07 +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 00b1c0089..0f3b2b567 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-09-14 Carl Hetherington + + * Version 1.73.6 released. + 2014-09-14 Carl Hetherington * Version 1.73.5 released. diff --git a/debian/changelog b/debian/changelog index 0584ec5c2..07f0510ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.73.5-1) UNRELEASED; urgency=low +dcpomatic (1.73.6-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -181,8 +181,9 @@ dcpomatic (1.73.5-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sun, 14 Sep 2014 10:56:13 +0100 + -- Carl Hetherington Sun, 14 Sep 2014 21:50:07 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index d1ce36e3c..f7aa97919 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.5devel' +VERSION = '1.73.6' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From c177bbcd0f77aab611064fd8bd706b0df337d881 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 14 Sep 2014 21:50:07 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index f7aa97919..801fe0547 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.6' +VERSION = '1.73.6devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 3615d8eb524ca5178e037ba9eaced19fa4c02fbb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 16 Sep 2014 21:19:54 +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 6f5bbb0ff..f028d76f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-09-16 Carl Hetherington + + * Version 1.73.7 released. + 2014-09-16 Carl Hetherington * Fix non-update of audio gain when changing selected content. diff --git a/debian/changelog b/debian/changelog index 07f0510ee..16e2e433a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.73.6-1) UNRELEASED; urgency=low +dcpomatic (1.73.7-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -182,8 +182,9 @@ dcpomatic (1.73.6-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sun, 14 Sep 2014 21:50:07 +0100 + -- Carl Hetherington Tue, 16 Sep 2014 21:19:53 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 801fe0547..4d4fe9b23 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.6devel' +VERSION = '1.73.7' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 93510d31e7ae2cadf2de076d4bef60ca3f381a35 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 16 Sep 2014 21:19:54 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 4d4fe9b23..3b982c952 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.7' +VERSION = '1.73.7devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 71e36b7c6c5500ac29688a34faf0c70d498a1efc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 28 Sep 2014 23:54:07 +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 4473bf34a..f676d6b99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-09-28 Carl Hetherington + + * Version 1.73.8 released. + 2014-09-28 Carl Hetherington * Add a few key shortcuts. diff --git a/debian/changelog b/debian/changelog index 16e2e433a..fe31a1bf8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.73.7-1) UNRELEASED; urgency=low +dcpomatic (1.73.8-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -183,8 +183,9 @@ dcpomatic (1.73.7-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Tue, 16 Sep 2014 21:19:53 +0100 + -- Carl Hetherington Sun, 28 Sep 2014 23:54:07 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 3b982c952..db0c219ab 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.7devel' +VERSION = '1.73.8' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 34f9f492581323f9adfb1edbf69f11b1a5c55110 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 28 Sep 2014 23:54:07 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index db0c219ab..3da81ce4b 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.8' +VERSION = '1.73.8devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 4e99fbf516b8a5d5c350950aee6d9068a4acf3b7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 6 Oct 2014 15:17:59 +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 f676d6b99..ee41a8697 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-06 Carl Hetherington + + * Version 1.73.9 released. + 2014-09-28 Carl Hetherington * Version 1.73.8 released. diff --git a/debian/changelog b/debian/changelog index fe31a1bf8..30e9a1839 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.73.8-1) UNRELEASED; urgency=low +dcpomatic (1.73.9-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -184,8 +184,9 @@ dcpomatic (1.73.8-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sun, 28 Sep 2014 23:54:07 +0100 + -- Carl Hetherington Mon, 06 Oct 2014 15:17:59 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 3da81ce4b..778c9ffa3 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.8devel' +VERSION = '1.73.9' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 8f2d46dae9bdd96f88163ceeabcd7c64b696a0b4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 6 Oct 2014 15:17:59 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 778c9ffa3..1b8077a00 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.9' +VERSION = '1.73.9devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From c803f81818284dba426cbaf7663fc728f3b36530 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 6 Oct 2014 20:50:41 +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 ee41a8697..da38791d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-06 Carl Hetherington + + * Version 1.74.0 released. + 2014-10-06 Carl Hetherington * Version 1.73.9 released. diff --git a/debian/changelog b/debian/changelog index 30e9a1839..29e5d1a2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.73.9-1) UNRELEASED; urgency=low +dcpomatic (1.74.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -185,8 +185,9 @@ dcpomatic (1.73.9-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Mon, 06 Oct 2014 15:17:59 +0100 + -- Carl Hetherington Mon, 06 Oct 2014 20:50:41 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 1b8077a00..7c31d9d3c 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.73.9devel' +VERSION = '1.74.0' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 91c1b17f34ec27227f948e35b491b87362b70187 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 6 Oct 2014 20:50:41 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 7c31d9d3c..e06cb53f2 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.74.0' +VERSION = '1.74.0devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 92788ff5fe57c4b662101d2c0032449f6840a045 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 8 Oct 2014 09:53:47 +0100 Subject: -Wno-unused-result. --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index e06cb53f2..4ce99ca71 100644 --- a/wscript +++ b/wscript @@ -182,7 +182,7 @@ def configure(conf): # Common CXXFLAGS conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-D__STDC_LIMIT_MACROS', '-msse', '-ffast-math', '-fno-strict-aliasing', - '-Wall', '-Wno-attributes', '-Wextra', '-D_FILE_OFFSET_BITS=64']) + '-Wall', '-Wno-attributes', '-Wextra', '-Wno-unused-result', '-D_FILE_OFFSET_BITS=64']) if conf.options.enable_debug: conf.env.append_value('CXXFLAGS', ['-g', '-DDCPOMATIC_DEBUG']) -- cgit v1.2.3 From 57fd7451d6565ac2b56f9881abd5f425a3a91a5e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 8 Oct 2014 10:06:10 +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 c044e5450..d4e344e81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-08 Carl Hetherington + + * Version 1.74.1 released. + 2014-10-05 Carl Hetherington * Bump ffmpeg version. diff --git a/debian/changelog b/debian/changelog index 29e5d1a2f..b31e37e68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.74.0-1) UNRELEASED; urgency=low +dcpomatic (1.74.1-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -186,8 +186,9 @@ dcpomatic (1.74.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Mon, 06 Oct 2014 20:50:41 +0100 + -- Carl Hetherington Wed, 08 Oct 2014 10:06:10 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 4ce99ca71..688639e37 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.74.0devel' +VERSION = '1.74.1' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From f5cb97426117f4325d8d2f05806e412e7dce75f3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 8 Oct 2014 10:06:11 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 688639e37..ded3409ca 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.74.1' +VERSION = '1.74.1devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 1c7805bddbe58dd829c59c559c6c62fe4c9a9302 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 8 Oct 2014 10:37: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 d4e344e81..6c40e1de2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-08 Carl Hetherington + + * Version 1.74.2 released. + 2014-10-08 Carl Hetherington * Version 1.74.1 released. diff --git a/debian/changelog b/debian/changelog index b31e37e68..e0ce39fd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.74.1-1) UNRELEASED; urgency=low +dcpomatic (1.74.2-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -187,8 +187,9 @@ dcpomatic (1.74.1-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Wed, 08 Oct 2014 10:06:10 +0100 + -- Carl Hetherington Wed, 08 Oct 2014 10:37:21 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index ded3409ca..52d6047b0 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.74.1devel' +VERSION = '1.74.2' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 8b9cc9b5e256128ad21f935d8a0838734f986c09 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 8 Oct 2014 10:37:21 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 52d6047b0..09066583a 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.74.2' +VERSION = '1.74.2devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 5f07f7c408f32bc7eed76eb69e8e4cc537b38116 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 14 Oct 2014 18:38:17 +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 047628602..82ee2675e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-14 Carl Hetherington + + * Version 1.74.3 released. + 2014-10-08 c.hetherington * Make server finding more reliable when diff --git a/debian/changelog b/debian/changelog index e0ce39fd5..efd8fd73d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.74.2-1) UNRELEASED; urgency=low +dcpomatic (1.74.3-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -188,8 +188,9 @@ dcpomatic (1.74.2-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Wed, 08 Oct 2014 10:37:21 +0100 + -- Carl Hetherington Tue, 14 Oct 2014 18:38:17 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 09066583a..cea5071d4 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.74.2devel' +VERSION = '1.74.3' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 60febebc55d25b5f60297d9f8c1b51fbda6bac63 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 14 Oct 2014 18:38:17 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index cea5071d4..404be26d2 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.74.3' +VERSION = '1.74.3devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 30661f2b8c2da1022c2cebbec62c3e15cabde5b1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 10:39:19 +0100 Subject: Attempt to fix schroot build on Centos 7. --- wscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 09066583a..d9d410ae2 100644 --- a/wscript +++ b/wscript @@ -28,7 +28,8 @@ def static_ffmpeg(conf): conf.check_cfg(package='libavfilter', args='--cflags', uselib_store='AVFILTER', mandatory=True) conf.env.STLIB_AVFILTER = ['avfilter', 'swresample'] conf.check_cfg(package='libavcodec', args='--cflags', uselib_store='AVCODEC', mandatory=True) - conf.env.STLIB_AVCODEC = ['avcodec'] + # lzma link is needed by Centos 7, at least + conf.env.STLIB_AVCODEC = ['avcodec', 'lzma'] conf.env.LIB_AVCODEC = ['z'] conf.check_cfg(package='libavutil', args='--cflags', uselib_store='AVUTIL', mandatory=True) conf.env.STLIB_AVUTIL = ['avutil'] -- cgit v1.2.3 From b2da30977904a932fa55f1a69fa1372dad124e37 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 10:54:16 +0100 Subject: Fix previous. --- wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 784cb777e..897517b4f 100644 --- a/wscript +++ b/wscript @@ -29,8 +29,8 @@ def static_ffmpeg(conf): conf.env.STLIB_AVFILTER = ['avfilter', 'swresample'] conf.check_cfg(package='libavcodec', args='--cflags', uselib_store='AVCODEC', mandatory=True) # lzma link is needed by Centos 7, at least - conf.env.STLIB_AVCODEC = ['avcodec', 'lzma'] - conf.env.LIB_AVCODEC = ['z'] + conf.env.STLIB_AVCODEC = ['avcodec'] + conf.env.LIB_AVCODEC = ['z', 'lzma'] conf.check_cfg(package='libavutil', args='--cflags', uselib_store='AVUTIL', mandatory=True) conf.env.STLIB_AVUTIL = ['avutil'] conf.check_cfg(package='libswscale', args='--cflags', uselib_store='SWSCALE', mandatory=True) -- cgit v1.2.3