From 26a80aee0e17be8b1cdba995d7c40b66d123d65e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 14 Jun 2013 00:10:29 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 5bf0f1cde..170cb9390 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.100pre' +VERSION = '0.100' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 161ebdefe6a120705c883151600a8e1d395b5012 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 14 Jun 2013 00:10:29 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 170cb9390..2dc95bdff 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.100' +VERSION = '0.101pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 6e732d6360e94f1950eec980e402ae6c601e8ba6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 19 Jun 2013 10:00:20 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 6fe716393..1b8f32326 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-06-19 Carl Hetherington + + * Version 0.101beta1 released. + 2013-06-14 Carl Hetherington * Version 0.100 released. diff --git a/debian/changelog b/debian/changelog index 7e70791c2..5f24da79e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.101beta1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Wed, 19 Jun 2013 10:00:20 +0100 + dvdomatic (0.100-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 2dc95bdff..478ac092c 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.101pre' +VERSION = '0.101beta1' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 0cb46375414f69947d393c8e00cd66a00bd8f5bb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 19 Jun 2013 10:03:24 +0100 Subject: Various build system adjustments. --- cscript | 52 ++++++++++++++++++++++++------------------------ platform/osx/make_dmg.sh | 24 +++++++++++----------- src/tools/wscript | 4 ++-- test/wscript | 2 +- wscript | 5 ++++- 5 files changed, 45 insertions(+), 42 deletions(-) (limited to 'wscript') diff --git a/cscript b/cscript index 47c71a335..f37255116 100644 --- a/cscript +++ b/cscript @@ -6,32 +6,32 @@ def dependencies(target): if target.platform == 'windows': return () else: - return (('openjpeg-cdist', None), - ('ffmpeg-cdist', 'e17deeb6f6c4fe0d56bb151342b2afb82b1fcefb'), - ('libdcp', 'v0.53')) + # XXX: should be some versions in here + return (('ffmpeg-cdist', ''), + ('libdcp', None)) -def build(env, target): - cmd = './waf configure --prefix=%s' % env.work_dir_cscript() +def build(target): + cmd = './waf configure --prefix=%s' % target.work_dir_cscript() if target.platform == 'windows': cmd += ' --target-windows' elif target.platform == 'linux': cmd += ' --static' - env.command(cmd) + target.command(cmd) - env.command('./waf') + target.command('./waf') if target.platform == 'linux' or target.platform == 'osx': - env.command('./waf install') + target.command('./waf install') -def package(env, target, version): +def package(target, version): if target.platform == 'windows': shutil.copyfile('build/platform/windows/installer.%s.nsi' % target.bits, 'build/platform/windows/installer2.%s.nsi' % target.bits) - env.command('sed -i "s~%%resources%%~%s/platform/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) - env.command('sed -i "s~%%deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (env.windows_prefix, target.bits)) - env.command('sed -i "s~%%binaries%%~%s/build~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) - env.command('sed -i "s~%%bits%%~32~g" build/platform/windows/installer2.%s.nsi' % target.bits) - env.command('makensis build/platform/windows/installer2.%s.nsi' % target.bits) + target.command('sed -i "s~%%resources%%~%s/platform/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) + target.command('sed -i "s~%%deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.windows_prefix, target.bits)) + target.command('sed -i "s~%%binaries%%~%s/build~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) + target.command('sed -i "s~%%bits%%~32~g" build/platform/windows/installer2.%s.nsi' % target.bits) + target.command('makensis build/platform/windows/installer2.%s.nsi' % target.bits) return os.path.abspath(glob.glob('build/platform/windows/*%s*.exe' % target.bits)[0]) elif target.platform == 'linux': if target.bits == 32: @@ -40,7 +40,7 @@ def package(env, target, version): cpu = 'amd64' shutil.copyfile('platform/linux/control-%s-%d' % (target.version, target.bits), 'debian/control') - env.command('./waf dist') + target.command('./waf dist') f = open('debian/files', 'w') print >>f,'dvdomatic_%s-1_%s.deb video extra' % (version, cpu) shutil.rmtree('build/deb', ignore_errors=True) @@ -48,13 +48,13 @@ def package(env, target, version): os.makedirs('build/deb') os.chdir('build/deb') shutil.move('../../dvdomatic-%s.tar.bz2' % version, 'dvdomatic_%s.orig.tar.bz2' % version) - env.command('tar xjf dvdomatic_%s.orig.tar.bz2' % version) + target.command('tar xjf dvdomatic_%s.orig.tar.bz2' % version) os.chdir('dvdomatic-%s' % version) - env.command('dch -b -v %s-1 "New upstream release."' % version) - env.set('CDIST_LINKFLAGS', env.get('LINKFLAGS')) - env.set('CDIST_CXXFLAGS', env.get('CXXFLAGS')) - env.set('CDIST_PKG_CONFIG_PATH', env.get('PKG_CONFIG_PATH')) - env.command('dpkg-buildpackage') + target.command('dch -b -v %s-1 "New upstream release."' % version) + target.set('CDIST_LINKFLAGS', target.get('LINKFLAGS')) + target.set('CDIST_CXXFLAGS', target.get('CXXFLAGS')) + target.set('CDIST_PKG_CONFIG_PATH', target.get('PKG_CONFIG_PATH')) + target.command('dpkg-buildpackage') debs = [] for p in glob.glob('../*.deb'): @@ -62,16 +62,16 @@ def package(env, target, version): return debs elif target.platform == 'osx': - env.command('bash platform/osx/make_dmg.sh') + target.command('bash platform/osx/make_dmg.sh') return os.path.abspath(glob.glob('build/platform/osx/DVD-o-matic*.dmg')[0]) -def make_pot(env): - env.command('./waf pot') +def make_pot(target): + target.command('./waf pot') return [os.path.abspath('build/src/lib/libdvdomatic.pot'), os.path.abspath('build/src/wx/libdvdomatic-wx.pot'), os.path.abspath('build/src/tools/dvdomatic.pot')] -def make_manual(env): +def make_manual(target): os.chdir('doc/manual') - env.command('make') + target.command('make') return [os.path.abspath('pdf'), os.path.abspath('html')] diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index f757eda34..fe48222ad 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -6,7 +6,7 @@ version=`cat wscript | egrep ^VERSION | awk '{print $3}' | sed -e "s/'//g"` DMG_SIZE=256 WORK=build/platform/osx ENV=/Users/carl/Environments/osx/10.8 -DEPS=/Users/carl/cdist +ROOT=/Users/carl/cdist appdir="DVD-o-matic.app" approot=$appdir/Contents @@ -22,17 +22,17 @@ mkdir -p $WORK/$resources cp build/src/tools/dvdomatic $WORK/$macos/ cp build/src/lib/libdvdomatic.dylib $WORK/$libs/ cp build/src/wx/libdvdomatic-wx.dylib $WORK/$libs/ -cp $DEPS/lib/libdcp.dylib $WORK/$libs/ -cp $DEPS/lib/libasdcp-libdcp.dylib $WORK/$libs/ -cp $DEPS/lib/libkumu-libdcp.dylib $WORK/$libs/ -cp $DEPS/lib/libopenjpeg*.dylib $WORK/$libs/ -cp $DEPS/lib/libavformat*.dylib $WORK/$libs/ -cp $DEPS/lib/libavfilter*.dylib $WORK/$libs/ -cp $DEPS/lib/libavutil*.dylib $WORK/$libs/ -cp $DEPS/lib/libavcodec*.dylib $WORK/$libs/ -cp $DEPS/lib/libswscale*.dylib $WORK/$libs/ -cp $DEPS/lib/libpostproc*.dylib $WORK/$libs/ -cp $DEPS/lib/libswresample*.dylib $WORK/$libs/ +cp $ROOT/lib/libdcp.dylib $WORK/$libs/ +cp $ROOT/lib/libasdcp-libdcp.dylib $WORK/$libs/ +cp $ROOT/lib/libkumu-libdcp.dylib $WORK/$libs/ +cp $ROOT/lib/libopenjpeg*.dylib $WORK/$libs/ +cp $ROOT/lib/libavformat*.dylib $WORK/$libs/ +cp $ROOT/lib/libavfilter*.dylib $WORK/$libs/ +cp $ROOT/lib/libavutil*.dylib $WORK/$libs/ +cp $ROOT/lib/libavcodec*.dylib $WORK/$libs/ +cp $ROOT/lib/libswscale*.dylib $WORK/$libs/ +cp $ROOT/lib/libpostproc*.dylib $WORK/$libs/ +cp $ROOT/lib/libswresample*.dylib $WORK/$libs/ cp $ENV/lib/libboost_system.dylib $WORK/$libs/ cp $ENV/lib/libboost_filesystem.dylib $WORK/$libs/ cp $ENV/lib/libboost_thread.dylib $WORK/$libs/ diff --git a/src/tools/wscript b/src/tools/wscript index ee4e7edef..13c5d7590 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -6,7 +6,7 @@ import i18n def build(bld): for t in ['makedcp', 'servomatic_cli', 'servomatictest']: obj = bld(features = 'cxx cxxprogram') - obj.uselib = 'BOOST_THREAD OPENJPEG DCP AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC' + obj.uselib = 'BOOST_THREAD OPENJPEG DCP AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML' obj.includes = ['..'] obj.use = ['libdvdomatic'] obj.source = '%s.cc' % t @@ -15,7 +15,7 @@ def build(bld): if not bld.env.DISABLE_GUI: for t in ['dvdomatic', 'dvdomatic_batch', 'servomatic_gui']: obj = bld(features = 'cxx cxxprogram') - obj.uselib = 'DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC' + obj.uselib = 'DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML' obj.includes = ['..'] obj.use = ['libdvdomatic', 'libdvdomatic-wx'] obj.source = '%s.cc' % t diff --git a/test/wscript b/test/wscript index f1a508a53..71636a05d 100644 --- a/test/wscript +++ b/test/wscript @@ -12,7 +12,7 @@ def configure(conf): def build(bld): obj = bld(features = 'cxx cxxprogram') obj.name = 'unit-tests' - obj.uselib = 'BOOST_TEST DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC' + obj.uselib = 'BOOST_TEST DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML' obj.use = 'libdvdomatic' obj.source = 'test.cc' obj.target = 'unit-tests' diff --git a/wscript b/wscript index 478ac092c..c7707d95b 100644 --- a/wscript +++ b/wscript @@ -77,12 +77,15 @@ def configure(conf): else: # This is hackio grotesquio for static builds (ie for .deb packages). We need to link some things # statically and some dynamically, or things get horribly confused and the dynamic linker (I think) - # crashes horribly. These calls do what the check_cfg calls would have done, but specify the + # crashes. These calls do what the check_cfg calls would have done, but specify the # different bits as static or dynamic as required. It'll break if you look at it funny, but # I think anyone else who builds would do so dynamically. + conf.env.HAVE_CXML = 1 + conf.env.STLIB_CXML = ['cxml'] conf.env.HAVE_DCP = 1 conf.env.STLIB_DCP = ['dcp', 'asdcp-libdcp', 'kumu-libdcp'] conf.env.LIB_DCP = ['glibmm-2.4', 'xml++-2.6', 'ssl', 'crypto', 'bz2'] + conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='DCP', mandatory=True) conf.env.HAVE_AVFORMAT = 1 conf.env.STLIB_AVFORMAT = ['avformat'] conf.env.HAVE_AVFILTER = 1 -- cgit v1.2.3 From e8a04348ecff4b7a18a91ea19a300f5ff5348d8a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 19 Jun 2013 10:03:36 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 1b8f32326..8a1dac20c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-06-19 Carl Hetherington + + * Version 0.101beta2 released. + 2013-06-19 Carl Hetherington * Version 0.101beta1 released. diff --git a/debian/changelog b/debian/changelog index 5f24da79e..e31ddafdb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.101beta2-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Wed, 19 Jun 2013 10:03:36 +0100 + dvdomatic (0.101beta1-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 478ac092c..899adf5e3 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.101beta1' +VERSION = '0.101beta2' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From cf0ca253f270f1d184da503ed668bdee4d539273 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 19 Jun 2013 10:11:26 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 8a1dac20c..526b3cade 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-06-19 Carl Hetherington + + * Version 0.101beta3 released. + 2013-06-19 Carl Hetherington * Version 0.101beta2 released. diff --git a/debian/changelog b/debian/changelog index e31ddafdb..2464e88a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.101beta3-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Wed, 19 Jun 2013 10:11:26 +0100 + dvdomatic (0.101beta2-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 899adf5e3..7627410d6 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.101beta2' +VERSION = '0.101beta3' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 887b699eca582d2de201bc0f9cd4a3c115f5b3eb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 19 Jun 2013 10:21:55 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 526b3cade..20d55bd7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-06-19 Carl Hetherington + + * Version 0.101beta4 released. + 2013-06-19 Carl Hetherington * Version 0.101beta3 released. diff --git a/debian/changelog b/debian/changelog index 2464e88a8..c9dd6ef15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.101beta4-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Wed, 19 Jun 2013 10:21:55 +0100 + dvdomatic (0.101beta3-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 925543578..d8fc4a537 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.101beta3' +VERSION = '0.101beta4' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 9086ae6ace727de2aaa6bc01a263544fdd90ca6d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 19 Jun 2013 16:56:16 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 89401ff28..64455b5d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-06-19 Carl Hetherington + + * Version 0.101beta5 released. + 2013-06-19 Carl Hetherington * Fix hang when there are problems decoding diff --git a/debian/changelog b/debian/changelog index c9dd6ef15..bb6398425 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.101beta5-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Wed, 19 Jun 2013 16:56:16 +0100 + dvdomatic (0.101beta4-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index d8fc4a537..088918cac 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.101beta4' +VERSION = '0.101beta5' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From c9067a8a0d92d4ac52ae7ffb7665b1234018551b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 19 Jun 2013 18:55:41 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 64455b5d9..d2f48d0cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-06-19 Carl Hetherington + + * Version 0.101 released. + 2013-06-19 Carl Hetherington * Version 0.101beta5 released. diff --git a/debian/changelog b/debian/changelog index bb6398425..ba2825a7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.101-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Wed, 19 Jun 2013 18:55:41 +0100 + dvdomatic (0.101beta5-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 088918cac..08e1ec3d2 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.101beta5' +VERSION = '0.101' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 6c71e7e25536b7fee526a9c7216dcee9230b7e91 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 19 Jun 2013 18:55:41 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 08e1ec3d2..d99ce876e 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.101' +VERSION = '0.102pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 66b3352b0d286a5df41db596ad65b3946897e0ba Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 20 Jun 2013 19:07:07 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index d2f48d0cc..09852aaec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-06-20 Carl Hetherington + + * Version 0.102 released. + 2013-06-19 Carl Hetherington * Version 0.101 released. diff --git a/debian/changelog b/debian/changelog index ba2825a7f..8e83140f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.102-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Thu, 20 Jun 2013 19:07:07 +0100 + dvdomatic (0.101-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index d99ce876e..05ff04be3 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.102pre' +VERSION = '0.102' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 4b077fe1b895958f33c050b561580ba29a56831a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 20 Jun 2013 19:07:08 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 05ff04be3..bc12a0809 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.102' +VERSION = '0.103pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 782eae5d6c49d176660440b05d30210f21b6a926 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 24 Jun 2013 11:43:31 +0100 Subject: Try to fix ffprobing. --- src/lib/film.cc | 11 +++++++---- src/lib/wscript | 2 +- wscript | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'wscript') diff --git a/src/lib/film.cc b/src/lib/film.cc index 041bbc225..cb66e2783 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -25,6 +25,10 @@ #include #include #include +#ifdef DVDOMATIC_WINDOWS +#undef DATADIR +#include +#endif #include #include #include @@ -1002,10 +1006,9 @@ Film::set_content (string c) #ifdef DVDOMATIC_WINDOWS wchar_t dir[512]; GetModuleFileName (GetModuleHandle (0), dir, sizeof (dir)); - boost::filesystem::path path_dir (dir); - path_dir = path_dir.parent_path (); - path_dir /= "ffprobe.exe"; - string ffprobe = "\"" + path_dir.string () + "\" "; + PathRemoveFileSpec (dir); + SetCurrentDirectory (dir); + string ffprobe = "ffprobe.exe "; #else string ffprobe = "ffprobe "; #endif diff --git a/src/lib/wscript b/src/lib/wscript index 66207b1e4..7c7a64d58 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -69,7 +69,7 @@ def build(bld): obj.source = sources + ' version.cc' if bld.env.TARGET_WINDOWS: - obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY' + obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI' obj.source += ' stack.cpp' obj.target = 'dvdomatic' diff --git a/wscript b/wscript index bc12a0809..8088f4532 100644 --- a/wscript +++ b/wscript @@ -42,6 +42,7 @@ def configure(conf): conf.check(lib = 'bfd', uselib_store = 'BFD', msg = "Checking for library bfd") conf.check(lib = 'dbghelp', uselib_store = 'DBGHELP', msg = "Checking for library dbghelp") conf.check(lib = 'iberty', uselib_store = 'IBERTY', msg = "Checking for library iberty") + conf.check(lib = 'shlwapi', uselib_store = 'SHLWAPI', msg = "Checking for library shlwapi") boost_lib_suffix = '-mt' boost_thread = 'boost_thread_win32-mt' else: -- cgit v1.2.3 From 7df5035e5200769dd49d02f85b0b0e4b7899d3ad Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 24 Jun 2013 23:39:57 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 09852aaec..e0a8f4bbe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-06-24 Carl Hetherington + + * Version 0.103 released. + 2013-06-20 Carl Hetherington * Version 0.102 released. diff --git a/debian/changelog b/debian/changelog index 8e83140f5..16d58a5d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.103-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Mon, 24 Jun 2013 23:39:57 +0100 + dvdomatic (0.102-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 8088f4532..a402625b6 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.103pre' +VERSION = '0.103' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 5c44164020dd7a440d9f9752cf55e2f41ccd72a7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 24 Jun 2013 23:39:57 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index a402625b6..e04cea069 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.103' +VERSION = '0.104pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From c1935537a671dea6b3112dbf8a93757eb3fc9e9f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 27 Jun 2013 00:24:56 +0100 Subject: Hopefully fix problems with end-trim not working. --- ChangeLog | 4 ++++ src/lib/trimmer.cc | 23 ++++++++++++----------- src/lib/trimmer.h | 1 - wscript | 2 +- 4 files changed, 17 insertions(+), 13 deletions(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index e0a8f4bbe..238ad8604 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-06-27 Carl Hetherington + + * Hopefully fix problems with end-trim not working. + 2013-06-24 Carl Hetherington * Version 0.103 released. diff --git a/src/lib/trimmer.cc b/src/lib/trimmer.cc index b7afc9299..1ec9e2a5b 100644 --- a/src/lib/trimmer.cc +++ b/src/lib/trimmer.cc @@ -18,6 +18,7 @@ */ #include +#include #include "trimmer.h" using std::cout; @@ -55,18 +56,22 @@ Trimmer::Trimmer ( _audio_end = video_frames_to_audio_frames (_video_end, audio_sample_rate, frames_per_second); } - /* XXX: this is a hack; this flag means that no trim is happening at the end of the film, and I'm - using that to prevent audio trim being rounded to video trim, which breaks the current set - of regression tests. This could be removed if a) the regression tests are regenerated and b) - I can work out what DCP length should be. + /* XXX: this is a hack; if there is no trim at the end, set + the audio end point to infinity so that + shorter-video-than-audio does not trim audio (which breaks + the current set of regression tests). This could be + removed if a) the regression tests are regenerated and b) I + can work out what DCP length should be. */ - _no_trim = (_video_start == 0) && (_video_end == (video_length - video_trim_end)); + if (video_trim_end == 0) { + _audio_end = INT64_MAX; + } } void Trimmer::process_video (shared_ptr image, bool same, shared_ptr sub) { - if (_no_trim || (_video_in >= _video_start && _video_in <= _video_end)) { + if (_video_in >= _video_start && _video_in < _video_end) { Video (image, same, sub); } @@ -76,13 +81,9 @@ Trimmer::process_video (shared_ptr image, bool same, shared_ptr audio) { - if (_no_trim) { - Audio (audio); - return; - } - int64_t offset = _audio_start - _audio_in; if (offset > audio->frames()) { + /* we haven't reached the start of the untrimmed section yet */ _audio_in += audio->frames (); return; } diff --git a/src/lib/trimmer.h b/src/lib/trimmer.h index 98a118fb2..45b3f149a 100644 --- a/src/lib/trimmer.h +++ b/src/lib/trimmer.h @@ -36,5 +36,4 @@ private: int64_t _audio_start; int64_t _audio_end; int64_t _audio_in; - bool _no_trim; }; diff --git a/wscript b/wscript index e04cea069..a4d08d416 100644 --- a/wscript +++ b/wscript @@ -28,7 +28,7 @@ def configure(conf): conf.env.TARGET_OSX = sys.platform == 'darwin' conf.env.TARGET_LINUX = not conf.env.TARGET_WINDOWS and not conf.env.TARGET_OSX - conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', + conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-D__STDC_LIMIT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes', '-Wextra']) if conf.env.TARGET_WINDOWS: -- cgit v1.2.3 From c01ecbcd0e41c679ebd95b8f3627b8ffff644254 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 27 Jun 2013 01:20:18 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 238ad8604..dd9363aac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-06-27 Carl Hetherington + + * Version 0.104 released. + 2013-06-27 Carl Hetherington * Hopefully fix problems with end-trim not working. diff --git a/debian/changelog b/debian/changelog index 16d58a5d0..d12d73316 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.104-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Thu, 27 Jun 2013 01:20:18 +0100 + dvdomatic (0.103-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index a4d08d416..ac109eff9 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.104pre' +VERSION = '0.104' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 4833c6d5dd49ecd768af5edad81823baa9c094ab Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 27 Jun 2013 01:20:18 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index ac109eff9..cfbaa09dd 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.104' +VERSION = '0.105pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 75305b8c7630c28d520d4c9006a5c4df7216cf82 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 28 Jun 2013 10:40:23 +0100 Subject: Use our own DirPicker on GTK 2.24.17 (which seems to have a bugs in its GtkFileChooserButton). --- src/wx/new_film_dialog.cc | 10 +++++++--- src/wx/new_film_dialog.h | 9 ++++++--- src/wx/wscript | 2 ++ wscript | 2 ++ 4 files changed, 17 insertions(+), 6 deletions(-) (limited to 'wscript') diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc index 191482a7c..91caa4963 100644 --- a/src/wx/new_film_dialog.cc +++ b/src/wx/new_film_dialog.cc @@ -21,7 +21,7 @@ #include #include "lib/config.h" #include "new_film_dialog.h" -#ifdef __WXMSW__ +#if defined(__WXMSW__) || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 24 && GTK_MICRO_VERSION == 17) #include "dir_picker_ctrl.h" #endif #include "wx_util.h" @@ -46,8 +46,12 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent) table->Add (_name, 1, wxEXPAND); add_label_to_sizer (table, this, _("Create in folder")); -#ifdef __WXMSW__ - _folder = new DirPickerCtrl (this); + + /* GTK 2.24.17 has a buggy GtkFileChooserButton and it was put in Ubuntu 13.04. + Use our own dir picker as this is the least bad option I can think of. + */ +#if defined(__WXMSW__) || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 24 && GTK_MICRO_VERSION == 17) + _folder = new DirPickerCtrl (this); #else _folder = new wxDirPickerCtrl (this, wxDD_DIR_MUST_EXIST); #endif diff --git a/src/wx/new_film_dialog.h b/src/wx/new_film_dialog.h index bfcbd423c..70bb7945b 100644 --- a/src/wx/new_film_dialog.h +++ b/src/wx/new_film_dialog.h @@ -19,6 +19,9 @@ #include #include +#ifdef __WXGTK__ +#include +#endif class DirPickerCtrl; @@ -32,10 +35,10 @@ public: private: wxTextCtrl* _name; -#ifdef __WXMSW__ +#if defined(__WXMSW__) || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 24 && GTK_MICRO_VERSION == 17) DirPickerCtrl* _folder; -#else +#else wxDirPickerCtrl* _folder; -#endif +#endif static boost::optional _directory; }; diff --git a/src/wx/wscript b/src/wx/wscript index 9213d7220..4bc79d6bb 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -52,6 +52,8 @@ def build(bld): obj.includes = [ '..' ] obj.export_includes = ['.'] obj.uselib = 'WXWIDGETS' + if bld.env.TARGET_LINUX: + obj.uselib += ' GTK' obj.use = 'libdvdomatic' obj.source = sources obj.target = 'dvdomatic-wx' diff --git a/wscript b/wscript index cfbaa09dd..db4d93e4d 100644 --- a/wscript +++ b/wscript @@ -112,6 +112,8 @@ def configure(conf): if conf.env.TARGET_LINUX: conf.check_cfg(package='liblzma', args='--cflags --libs', uselib_store='LZMA', mandatory=True) + # On Linux we need to be able to include to check GTK's version + conf.check_cfg(package='gtk+-2.0', args='--cflags', uselib_store='GTK', mandatory=True) conf.check_cfg(package = '', path = conf.options.magickpp_config, args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True) -- cgit v1.2.3 From 861465ce07cbb72b0c34f8ee1048ba5ed4685ab8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 28 Jun 2013 22:01:06 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index cd8d05e8b..0a14ccd3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-06-28 Carl Hetherington + + * Version 0.105 released. + 2013-06-28 Carl Hetherington * Work around GTK bugs related to the directory diff --git a/debian/changelog b/debian/changelog index d12d73316..7ccc2bf84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.105-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Fri, 28 Jun 2013 22:01:06 +0100 + dvdomatic (0.104-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index db4d93e4d..958223576 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.105pre' +VERSION = '0.105' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From f8cf5bfe56cc3522f281555c4b04d77b15cf1a2d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 28 Jun 2013 22:01:06 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 958223576..e8f6240d3 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.105' +VERSION = '0.106pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From b544cbb8dc45aa2bb878a99da16132264bebbae7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 1 Jul 2013 13:35:00 +0000 Subject: Explicitly link with GTK when doing Linux static builds. --- src/tools/wscript | 2 ++ wscript | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'wscript') diff --git a/src/tools/wscript b/src/tools/wscript index 386aa452e..20a92cad2 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -16,6 +16,8 @@ def build(bld): for t in ['dvdomatic', 'dvdomatic_batch', 'servomatic_gui']: obj = bld(features = 'cxx cxxprogram') obj.uselib = 'DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML WXWIDGETS' + if bld.env.STATIC: + obj.uselib += ' GTK' obj.includes = ['..'] obj.use = ['libdvdomatic', 'libdvdomatic-wx'] obj.source = '%s.cc' % t diff --git a/wscript b/wscript index e8f6240d3..a98d60894 100644 --- a/wscript +++ b/wscript @@ -112,8 +112,11 @@ def configure(conf): if conf.env.TARGET_LINUX: conf.check_cfg(package='liblzma', args='--cflags --libs', uselib_store='LZMA', mandatory=True) - # On Linux we need to be able to include to check GTK's version - conf.check_cfg(package='gtk+-2.0', args='--cflags', uselib_store='GTK', mandatory=True) + if conf.env.STATIC: + conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True) + else: + # On Linux we need to be able to include to check GTK's version + conf.check_cfg(package='gtk+-2.0', args='--cflags', uselib_store='GTK', mandatory=True) conf.check_cfg(package = '', path = conf.options.magickpp_config, args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True) -- cgit v1.2.3 From 533443c335cbd8c3dc24591976e63003308aaf9a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 1 Jul 2013 16:18:29 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 0a14ccd3d..83bd20986 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-07-01 Carl Hetherington + + * Version 0.106beta1 released. + 2013-06-28 Carl Hetherington * Version 0.105 released. diff --git a/debian/changelog b/debian/changelog index 7ccc2bf84..4ea303219 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.106beta1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Mon, 01 Jul 2013 16:18:29 +0100 + dvdomatic (0.105-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index a98d60894..93db7d3ee 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.106pre' +VERSION = '0.106beta1' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 85ece5c010b59677990a3efdfd295591ae11a358 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 1 Jul 2013 23:42:59 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 83bd20986..733625063 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-07-01 Carl Hetherington + + * Version 0.106 released. + 2013-07-01 Carl Hetherington * Version 0.106beta1 released. diff --git a/debian/changelog b/debian/changelog index 4ea303219..7a88d3de7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.106-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Mon, 01 Jul 2013 23:42:59 +0100 + dvdomatic (0.106beta1-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 93db7d3ee..b03a816e7 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.106beta1' +VERSION = '0.106' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 3e5ad422551b067e9b2002c3088d6cf70d2e026f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 1 Jul 2013 23:42:59 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index b03a816e7..dff00caef 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.106' +VERSION = '0.107pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 5b1a55bc53c162f468843fee1c84880f44f28966 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 3 Jul 2013 13:25:01 +0100 Subject: Pass _FILE_OFFSET_BITS=64 to Linux builds to hopefully fix recovery with large MXF files. --- wscript | 1 + 1 file changed, 1 insertion(+) (limited to 'wscript') diff --git a/wscript b/wscript index dff00caef..76f6deb2b 100644 --- a/wscript +++ b/wscript @@ -49,6 +49,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_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/dvdomatic"' % conf.env['PREFIX']) + conf.env.append_value('CXXFLAGS', '-D_FILE_OFFSET_BITS=64') boost_lib_suffix = '' boost_thread = 'boost_thread' conf.env.append_value('LINKFLAGS', '-pthread') -- cgit v1.2.3 From 6057976df6cce189567012d5b1bc5533a532813b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 3 Jul 2013 13:27:08 +0100 Subject: Try FILE_OFFSET_BITS for all platforms. --- wscript | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 76f6deb2b..b87191f42 100644 --- a/wscript +++ b/wscript @@ -29,7 +29,7 @@ def configure(conf): conf.env.TARGET_LINUX = not conf.env.TARGET_WINDOWS and not conf.env.TARGET_OSX conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-D__STDC_LIMIT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', - '-Wall', '-Wno-attributes', '-Wextra']) + '-Wall', '-Wno-attributes', '-Wextra', '-D_FILE_OFFSET_BITS=64']) if conf.env.TARGET_WINDOWS: conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE']) @@ -49,7 +49,6 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_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/dvdomatic"' % conf.env['PREFIX']) - conf.env.append_value('CXXFLAGS', '-D_FILE_OFFSET_BITS=64') boost_lib_suffix = '' boost_thread = 'boost_thread' conf.env.append_value('LINKFLAGS', '-pthread') -- cgit v1.2.3 From b68591911bd8116df0ad987627244b9bdf87de89 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 3 Jul 2013 16:33:28 +0100 Subject: Make C++ flags available from makedcp. --- src/lib/version.h | 1 + src/tools/makedcp.cc | 9 +++++++-- wscript | 11 +++++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) (limited to 'wscript') diff --git a/src/lib/version.h b/src/lib/version.h index 71639e3bc..e1ec9067c 100644 --- a/src/lib/version.h +++ b/src/lib/version.h @@ -1,3 +1,4 @@ extern char const * dvdomatic_version; extern char const * dvdomatic_git_commit; +extern char const * dvdomatic_cxx_flags; diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc index e73930d3c..1cd5145ed 100644 --- a/src/tools/makedcp.cc +++ b/src/tools/makedcp.cc @@ -48,7 +48,8 @@ help (string n) cerr << "Syntax: " << n << " [OPTION] \n" << " -v, --version show DVD-o-matic version\n" << " -h, --help show this help\n" - << " -d, --deps list DVD-o-matic dependency details and quit\n" + << " -d, --deps list DVD-o-matic dependency details\n" + << " -f, --flags show flags passed to C++ compiler on build\n" << " -n, --no-progress do not print progress to stdout\n" << " -r, --no-remote do not use any remote servers\n" << "\n" @@ -69,13 +70,14 @@ main (int argc, char* argv[]) { "version", no_argument, 0, 'v'}, { "help", no_argument, 0, 'h'}, { "deps", no_argument, 0, 'd'}, + { "flags", no_argument, 0, 'f'}, { "no-progress", no_argument, 0, 'n'}, { "no-remote", no_argument, 0, 'r'}, { "log-level", required_argument, 0, 'l' }, { 0, 0, 0, 0 } }; - int c = getopt_long (argc, argv, "vhdnrl:", long_options, &option_index); + int c = getopt_long (argc, argv, "vhdfnrl:", long_options, &option_index); if (c == -1) { break; @@ -91,6 +93,9 @@ main (int argc, char* argv[]) case 'd': cout << dependency_version_summary () << "\n"; exit (EXIT_SUCCESS); + case 'f': + cout << dvdomatic_cxx_flags << "\n"; + exit (EXIT_SUCCESS); case 'n': progress = false; break; diff --git a/wscript b/wscript index b87191f42..0008d198f 100644 --- a/wscript +++ b/wscript @@ -206,7 +206,7 @@ def configure(conf): conf.recurse('test') def build(bld): - create_version_cc(VERSION) + create_version_cc(VERSION, bld.env.CXXFLAGS) bld.recurse('src') bld.recurse('test') @@ -232,7 +232,7 @@ def dist(ctx): GRSYMS GRTAGS GSYMS GTAGS """ -def create_version_cc(version): +def create_version_cc(version, cxx_flags): if os.path.exists('.git'): cmd = "LANG= git log --abbrev HEAD^..HEAD ." output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() @@ -245,6 +245,13 @@ def create_version_cc(version): text = '#include "version.h"\n' text += 'char const * dvdomatic_git_commit = \"%s\";\n' % commit text += 'char const * dvdomatic_version = \"%s\";\n' % version + + t = '' + for f in cxx_flags: + f = f.replace('"', '\\"') + t += f + ' ' + text += 'char const * dvdomatic_cxx_flags = \"%s\";\n' % t[:-1] + print('Writing version information to src/lib/version.cc') o = open('src/lib/version.cc', 'w') o.write(text) -- cgit v1.2.3 From db7ee6fc9293617d3f08f97b3415bfdaf5705a02 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 4 Jul 2013 00:28:04 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 1d8f3fb42..7bb54b4c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-07-04 Carl Hetherington + + * Version 0.107beta1 released. + 2013-07-04 Carl Hetherington * Try to initialise the number of threads to the number diff --git a/debian/changelog b/debian/changelog index 7a88d3de7..a04d8adf1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.107beta1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Thu, 04 Jul 2013 00:28:04 +0100 + dvdomatic (0.106-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 0008d198f..45e474de1 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.107pre' +VERSION = '0.107beta1' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From e50a9447d765bd31b2891e8f15270e067dd423e0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 8 Jul 2013 23:35:11 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 37605627a..ec7b520b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-07-08 Carl Hetherington + + * Version 0.107 released. + 2013-07-06 Carl Hetherington * Various tweaks to layout, trying to make diff --git a/debian/changelog b/debian/changelog index a04d8adf1..235989444 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.107-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Mon, 08 Jul 2013 23:35:11 +0100 + dvdomatic (0.107beta1-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 45e474de1..b69032e4d 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.107beta1' +VERSION = '0.107' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 94b593bc13271ee955d8811e6b60741369c41c66 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 8 Jul 2013 23:35:11 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index b69032e4d..715ea372e 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.107' +VERSION = '0.108pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 7d2762a08c9abc7cf7e4adcb4891b63f2ce710fa Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 8 Jul 2013 23:53:25 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 77eaa6764..a6dc65858 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-07-08 Carl Hetherington + + * Version 0.108 released. + 2013-07-08 Carl Hetherington * Add option to pad sound so that silent channels diff --git a/debian/changelog b/debian/changelog index 235989444..d07a26ad8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.108-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Mon, 08 Jul 2013 23:53:25 +0100 + dvdomatic (0.107-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 715ea372e..afa3e9bdc 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.108pre' +VERSION = '0.108' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From d2ff6a6b0256e256b6df416f280c846072f7682f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 8 Jul 2013 23:53:25 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index afa3e9bdc..9d3a566fe 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.108' +VERSION = '0.109pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3