From 78cbe4ec1980eef7043fe8ea815d0ff5a4395295 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 9 Apr 2013 15:35:22 +0100 Subject: Add cscript. --- cscript | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 cscript (limited to 'cscript') diff --git a/cscript b/cscript new file mode 100644 index 000000000..4873df654 --- /dev/null +++ b/cscript @@ -0,0 +1,49 @@ +import glob + +builds = ['ubuntu-12.04-32', 'ubuntu-12.10-32', 'ubuntu-12.04-64', 'ubuntu-12.10-64', 'source', 'windows-32', 'windows-64'] + +def build(environment, variant, version): + if environment == 'windows': + command('./waf configure --target-windows') + command('./waf clean') + command('./waf') + shutil.copyfile('build/windows/installer.%s.nsi' % variant, 'build/windows/installer2.%s.nsi' % variant) + command('sed -i "s~%%resources%%~%s/windows~g" build/windows/installer2.%s.nsi' % (os.getcwd(), variant)) + command('sed -i "s~%%deps%%~$WINDOWS_PREFIX~g" build/windows/installer2.%s.nsi' % variant) + command('sed -i "s~%%binaries%%~%s/build~g" build/windows/installer2.%s.nsi' % (os.getcwd(), variant)) + command('sed -i "s~%%bits%%~32~g" build/windows/installer2.%s.nsi' % variant) + command('makensis build/windows/installer2.%s.nsi' % variant) + return glob.glob('build/windows/*%s*.exe' % variant)[0] + elif environment == 'ubuntu': + v = variant.split('-') + bits = v[1] + if bits == '32': + cpu = 'i386' + else: + cpu = 'amd64' + + shutil.copyfile(os.path.join('builds', 'control-%s' % variant), os.path.join('debian', 'control')) + command('./waf dist') + f = open(os.path.join('debian', 'files'), 'w') + print >>f,'dvdomatic_%s-1_%s.deb video extra' % (version, cpu) + shutil.rmtree('build/deb', ignore_errors=True) + os.makedirs('build/deb') + os.chdir('build/deb') + shutil.move('../../dvdomatic-%s.tar.bz2' % version, 'dvdomatic_%s.orig.tar.bz2' % version) + command('tar xjf dvdomatic_%s.orig.tar.bz2' % version) + os.chdir('dvdomatic-%s' % version) + command('dch -b -v %s-1 "New upstream release."' % version) + command('dpkg-source -b .') + command('dpkg-buildpackage') + return os.path.abspath(glob.glob('../*.deb')[0]) + +def make_pot(): + 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(): + os.chdir('doc/manual') + command('make') + return [os.path.abspath('pdf'), os.path.abspath('html')] -- cgit v1.2.3 From 8c1a2972ac7e18758759515c3c1889c5b6fd86b5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Apr 2013 10:37:04 +0100 Subject: cscript; rename build -> release. --- cscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 4873df654..eac0fb089 100644 --- a/cscript +++ b/cscript @@ -1,8 +1,8 @@ import glob -builds = ['ubuntu-12.04-32', 'ubuntu-12.10-32', 'ubuntu-12.04-64', 'ubuntu-12.10-64', 'source', 'windows-32', 'windows-64'] +releases = ['ubuntu-12.04-32', 'ubuntu-12.10-32', 'ubuntu-12.04-64', 'ubuntu-12.10-64', 'source', 'windows-32', 'windows-64'] -def build(environment, variant, version): +def release(environment, variant, version): if environment == 'windows': command('./waf configure --target-windows') command('./waf clean') -- cgit v1.2.3 From 8d0cf4537624066e9ff2bc7152d792b2bf5e8038 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Apr 2013 10:41:50 +0100 Subject: More cscript tweaks. --- cscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index eac0fb089..2e09d2bcd 100644 --- a/cscript +++ b/cscript @@ -1,8 +1,8 @@ import glob -releases = ['ubuntu-12.04-32', 'ubuntu-12.10-32', 'ubuntu-12.04-64', 'ubuntu-12.10-64', 'source', 'windows-32', 'windows-64'] +release_targets = ['ubuntu-12.04-32', 'ubuntu-12.10-32', 'ubuntu-12.04-64', 'ubuntu-12.10-64', 'source', 'windows-32', 'windows-64'] -def release(environment, variant, version): +def build_release(environment, variant, version): if environment == 'windows': command('./waf configure --target-windows') command('./waf clean') -- cgit v1.2.3 From eb4a3a05f684923481a87db276db0c291a1d1e89 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Apr 2013 11:08:17 +0100 Subject: Add dependencies() and build() to script. --- cscript | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'cscript') diff --git a/cscript b/cscript index 2e09d2bcd..f2b898d52 100644 --- a/cscript +++ b/cscript @@ -47,3 +47,13 @@ def make_manual(): os.chdir('doc/manual') command('make') return [os.path.abspath('pdf'), os.path.abspath('html')] + +def dependencies(): + return (('libdcp', 'v0.43', + ('ffmpeg', '8d0757e1079f588ed69f629e2d1a4d5f232dc298') + ('openjpeg', '')) + +def build(prefix): + depends('libdcp', 'v0.43') + depends('ffmpeg', ' + depends('openjpeg') -- cgit v1.2.3 From b0d9a84bd0debd332c23fa7ae6684956d0ca470d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Apr 2013 11:08:43 +0100 Subject: Fix typo. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index f2b898d52..f0a86266f 100644 --- a/cscript +++ b/cscript @@ -49,7 +49,7 @@ def make_manual(): return [os.path.abspath('pdf'), os.path.abspath('html')] def dependencies(): - return (('libdcp', 'v0.43', + return (('libdcp', 'v0.43'), ('ffmpeg', '8d0757e1079f588ed69f629e2d1a4d5f232dc298') ('openjpeg', '')) -- cgit v1.2.3 From 861ca2da59c20b86add17ed5540042e983e04461 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Apr 2013 11:09:20 +0100 Subject: Typo. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index f0a86266f..8f3fc6cee 100644 --- a/cscript +++ b/cscript @@ -50,7 +50,7 @@ def make_manual(): def dependencies(): return (('libdcp', 'v0.43'), - ('ffmpeg', '8d0757e1079f588ed69f629e2d1a4d5f232dc298') + ('ffmpeg', '8d0757e1079f588ed69f629e2d1a4d5f232dc298'), ('openjpeg', '')) def build(prefix): -- cgit v1.2.3 From 7294863357668e59e059e78c1323722975226458 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Apr 2013 11:09:54 +0100 Subject: Another typo. --- cscript | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 8f3fc6cee..015c2761a 100644 --- a/cscript +++ b/cscript @@ -54,6 +54,4 @@ def dependencies(): ('openjpeg', '')) def build(prefix): - depends('libdcp', 'v0.43') - depends('ffmpeg', ' - depends('openjpeg') + pass -- cgit v1.2.3 From ec91dfb170165129c32842ba6581d5effc682bcf Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 18 Apr 2013 23:17:10 +0100 Subject: Various cdist fixes. --- cscript | 84 ++++++++++++++++++++++++++++++++++-------------------------- debian/rules | 3 ++- 2 files changed, 49 insertions(+), 38 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 015c2761a..8280ae526 100644 --- a/cscript +++ b/cscript @@ -1,57 +1,67 @@ import glob +import shutil +import os -release_targets = ['ubuntu-12.04-32', 'ubuntu-12.10-32', 'ubuntu-12.04-64', 'ubuntu-12.10-64', 'source', 'windows-32', 'windows-64'] - -def build_release(environment, variant, version): - if environment == 'windows': - command('./waf configure --target-windows') - command('./waf clean') - command('./waf') - shutil.copyfile('build/windows/installer.%s.nsi' % variant, 'build/windows/installer2.%s.nsi' % variant) - command('sed -i "s~%%resources%%~%s/windows~g" build/windows/installer2.%s.nsi' % (os.getcwd(), variant)) - command('sed -i "s~%%deps%%~$WINDOWS_PREFIX~g" build/windows/installer2.%s.nsi' % variant) - command('sed -i "s~%%binaries%%~%s/build~g" build/windows/installer2.%s.nsi' % (os.getcwd(), variant)) - command('sed -i "s~%%bits%%~32~g" build/windows/installer2.%s.nsi' % variant) - command('makensis build/windows/installer2.%s.nsi' % variant) - return glob.glob('build/windows/*%s*.exe' % variant)[0] - elif environment == 'ubuntu': - v = variant.split('-') - bits = v[1] - if bits == '32': +def dependencies(target): + if target.platform == 'windows': + return () + else: + return ('openjpeg-cdist', 'ffmpeg-cdist', 'libdcp') + +def build(env, target): + cmd = './waf configure --prefix=%s' % env.work_dir_cscript() + if target.platform == 'windows': + cmd += ' --target-windows' + else: + cmd += ' --static' + env.command(cmd) + + env.command('./waf') + + if target.platform == 'linux': + env.command('./waf install') + + +def package(env, target, version): + if target.platform == 'windows': + shutil.copyfile('build/windows/installer.%s.nsi' % target.bits, 'build/windows/installer2.%s.nsi' % target.bits) + env.command('sed -i "s~%%resources%%~%s/windows~g" build/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) + env.command('sed -i "s~%%deps%%~%s~g" build/windows/installer2.%s.nsi' % (env.windows_prefix(), target.bits)) + env.command('sed -i "s~%%binaries%%~%s/build~g" build/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) + env.command('sed -i "s~%%bits%%~32~g" build/windows/installer2.%s.nsi' % target.bits) + env.command('makensis build/windows/installer2.%s.nsi' % target.bits) + return os.path.abspath(glob.glob('build/windows/*%s*.exe' % target.bits)[0]) + elif target.platform == 'linux': + if target.bits == 32: cpu = 'i386' else: cpu = 'amd64' - shutil.copyfile(os.path.join('builds', 'control-%s' % variant), os.path.join('debian', 'control')) - command('./waf dist') - f = open(os.path.join('debian', 'files'), 'w') + shutil.copyfile('builds/control-%s-%d' % (target.version, target.bits), 'debian/control') + env.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) + os.makedirs('build/deb') os.chdir('build/deb') shutil.move('../../dvdomatic-%s.tar.bz2' % version, 'dvdomatic_%s.orig.tar.bz2' % version) - command('tar xjf dvdomatic_%s.orig.tar.bz2' % version) + env.command('tar xjf dvdomatic_%s.orig.tar.bz2' % version) os.chdir('dvdomatic-%s' % version) - command('dch -b -v %s-1 "New upstream release."' % version) - command('dpkg-source -b .') - command('dpkg-buildpackage') + 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') return os.path.abspath(glob.glob('../*.deb')[0]) -def make_pot(): - command('./waf pot') +def make_pot(env): + env.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(): +def make_manual(env): os.chdir('doc/manual') - command('make') + env.command('make') return [os.path.abspath('pdf'), os.path.abspath('html')] - -def dependencies(): - return (('libdcp', 'v0.43'), - ('ffmpeg', '8d0757e1079f588ed69f629e2d1a4d5f232dc298'), - ('openjpeg', '')) - -def build(prefix): - pass diff --git a/debian/rules b/debian/rules index 3320087a5..a2bf70bd8 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,8 @@ dh $@ override_dh_auto_configure: - ./waf --nocache configure --prefix=/usr --static + LINKFLAGS=$(CDIST_LINKFLAGS) CXXFLAGS="$(CXXFLAGS) $(CDIST_CXXFLAGS)" PKG_CONFIG_PATH=$(CDIST_PKG_CONFIG_PATH) \ + ./waf --nocache configure --prefix=/usr --static override_dh_auto_build: ./waf --nocache build -- cgit v1.2.3 From 15722eca8bd1caabc3b7275ff063b518dcb14ea2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 18 Apr 2013 23:26:10 +0100 Subject: Specify dep versions. --- cscript | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 8280ae526..c7794a7bd 100644 --- a/cscript +++ b/cscript @@ -6,7 +6,9 @@ def dependencies(target): if target.platform == 'windows': return () else: - return ('openjpeg-cdist', 'ffmpeg-cdist', 'libdcp') + return (('openjpeg-cdist', None) + ('ffmpeg-cdist', 'bf3361f28066820e3d74de8f52bac784663813fa' + ('libdcp', 'v0.45')) def build(env, target): cmd = './waf configure --prefix=%s' % env.work_dir_cscript() -- cgit v1.2.3 From 254a596bfa5fe29f354f95ef6a051d8015b38a07 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 18 Apr 2013 23:27:51 +0100 Subject: Typo. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index c7794a7bd..b34eb064c 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('openjpeg-cdist', None) - ('ffmpeg-cdist', 'bf3361f28066820e3d74de8f52bac784663813fa' + ('ffmpeg-cdist', 'bf3361f28066820e3d74de8f52bac784663813fa') ('libdcp', 'v0.45')) def build(env, target): -- cgit v1.2.3 From f98bd3e7601df2f52a7f4b622757472f41b004e7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 18 Apr 2013 23:28:47 +0100 Subject: Typo. --- cscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index b34eb064c..417e4221c 100644 --- a/cscript +++ b/cscript @@ -6,8 +6,8 @@ def dependencies(target): if target.platform == 'windows': return () else: - return (('openjpeg-cdist', None) - ('ffmpeg-cdist', 'bf3361f28066820e3d74de8f52bac784663813fa') + return (('openjpeg-cdist', None), + ('ffmpeg-cdist', 'bf3361f28066820e3d74de8f52bac784663813fa'), ('libdcp', 'v0.45')) def build(env, target): -- cgit v1.2.3 From 2669eabbf18a37e79f745865878aeb87bef369ee Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 19 Apr 2013 11:11:11 +0100 Subject: Fix ffmpeg revision. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 417e4221c..fa4586cde 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('openjpeg-cdist', None), - ('ffmpeg-cdist', 'bf3361f28066820e3d74de8f52bac784663813fa'), + ('ffmpeg-cdist', '35a110e4270b070146a84a827b10f75c5916e08a'), ('libdcp', 'v0.45')) def build(env, target): -- cgit v1.2.3 From f870b63dbca8c00fb9103faeef1093aca8cc4d2f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 20 Apr 2013 01:23:58 +0100 Subject: Go back to last long-running FFmpeg version. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index fa4586cde..d985838fc 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('openjpeg-cdist', None), - ('ffmpeg-cdist', '35a110e4270b070146a84a827b10f75c5916e08a'), + ('ffmpeg-cdist', '488d5d4496af5e3a3b9d31d6b221e8eeada6b77e'), ('libdcp', 'v0.45')) def build(env, target): -- cgit v1.2.3 From f8689d3ebcfeac346a374dd6e6ce15bfa593aadc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 22 Apr 2013 12:49:37 +0100 Subject: Try again to fix cscript for multiple debs. --- cscript | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index d985838fc..0111e9638 100644 --- a/cscript +++ b/cscript @@ -55,7 +55,12 @@ def package(env, target, version): env.set('CDIST_CXXFLAGS', env.get('CXXFLAGS')) env.set('CDIST_PKG_CONFIG_PATH', env.get('PKG_CONFIG_PATH')) env.command('dpkg-buildpackage') - return os.path.abspath(glob.glob('../*.deb')[0]) + + debs = [] + for p in glob.glob('../*.deb'): + debs.append(os.path.abspath(p)) + + return debs def make_pot(env): env.command('./waf pot') -- cgit v1.2.3 From 49651967e5fe9d948d82269bc71a922f244e602d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 25 Apr 2013 00:04:03 +0100 Subject: Add libcxml dep. --- cscript | 1 + 1 file changed, 1 insertion(+) (limited to 'cscript') diff --git a/cscript b/cscript index d985838fc..f232c013d 100644 --- a/cscript +++ b/cscript @@ -7,6 +7,7 @@ def dependencies(target): return () else: return (('openjpeg-cdist', None), + ('libcxml', None), ('ffmpeg-cdist', '488d5d4496af5e3a3b9d31d6b221e8eeada6b77e'), ('libdcp', 'v0.45')) -- cgit v1.2.3 From 85a0f18db9430dd670c65725a91f2c742294c30d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 26 Apr 2013 18:59:09 +0100 Subject: DVD->DCP in cscript. --- cscript | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index f232c013d..cd60162d9 100644 --- a/cscript +++ b/cscript @@ -43,14 +43,14 @@ def package(env, target, version): shutil.copyfile('builds/control-%s-%d' % (target.version, target.bits), 'debian/control') env.command('./waf dist') f = open('debian/files', 'w') - print >>f,'dvdomatic_%s-1_%s.deb video extra' % (version, cpu) + print >>f,'dcpomatic_%s-1_%s.deb video extra' % (version, cpu) shutil.rmtree('build/deb', ignore_errors=True) 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) - os.chdir('dvdomatic-%s' % version) + shutil.move('../../dcpomatic-%s.tar.bz2' % version, 'dcpomatic_%s.orig.tar.bz2' % version) + env.command('tar xjf dcpomatic_%s.orig.tar.bz2' % version) + os.chdir('dcpomatic-%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')) @@ -60,9 +60,9 @@ def package(env, target, version): def make_pot(env): env.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')] + return [os.path.abspath('build/src/lib/libdcpomatic.pot'), + os.path.abspath('build/src/wx/libdcpomatic-wx.pot'), + os.path.abspath('build/src/tools/dcpomatic.pot')] def make_manual(env): os.chdir('doc/manual') -- cgit v1.2.3 From aaf05a3b1e011a627593152eee427fcb72f12ff3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 30 Apr 2013 16:05:29 +0100 Subject: Bump dep. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 0111e9638..e8154e9f3 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('openjpeg-cdist', None), - ('ffmpeg-cdist', '488d5d4496af5e3a3b9d31d6b221e8eeada6b77e'), + ('ffmpeg-cdist', '7a23ec9c771184ab563cfe24ad9b427f38368961'), ('libdcp', 'v0.45')) def build(env, target): -- cgit v1.2.3 From 88a93f56ff05772f380eae5f8912801d535fe797 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 4 May 2013 18:48:30 +0100 Subject: Build with libdcp head for now. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 92157a581..b54b7da31 100644 --- a/cscript +++ b/cscript @@ -9,7 +9,7 @@ def dependencies(target): return (('openjpeg-cdist', None), ('libcxml', None), ('ffmpeg-cdist', '488d5d4496af5e3a3b9d31d6b221e8eeada6b77e'), - ('libdcp', 'v0.45')) + ('libdcp', None)) def build(env, target): cmd = './waf configure --prefix=%s' % env.work_dir_cscript() -- cgit v1.2.3 From 3e0ede02878b417b3714c95cdaca9c25344920b2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 4 May 2013 21:24:36 +0100 Subject: Bump libdcp version. --- cscript | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 0111e9638..04161eef3 100644 --- a/cscript +++ b/cscript @@ -8,7 +8,7 @@ def dependencies(target): else: return (('openjpeg-cdist', None), ('ffmpeg-cdist', '488d5d4496af5e3a3b9d31d6b221e8eeada6b77e'), - ('libdcp', 'v0.45')) + ('libdcp', 'v0.49')) def build(env, target): cmd = './waf configure --prefix=%s' % env.work_dir_cscript() diff --git a/wscript b/wscript index 9e143074c..aa27fe344 100644 --- a/wscript +++ b/wscript @@ -55,7 +55,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-O2') if not conf.options.static: - conf.check_cfg(package = 'libdcp', atleast_version = '0.45', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) + conf.check_cfg(package = 'libdcp', atleast_version = '0.49', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True) conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True) conf.check_cfg(package = 'libavcodec', args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = True) -- cgit v1.2.3 From ca50121f514c1a7302a583628789337c6868c290 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 19 May 2013 00:00:14 +0100 Subject: Fix for change upstream. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 04161eef3..4c54b0377 100644 --- a/cscript +++ b/cscript @@ -28,7 +28,7 @@ def package(env, target, version): if target.platform == 'windows': shutil.copyfile('build/windows/installer.%s.nsi' % target.bits, 'build/windows/installer2.%s.nsi' % target.bits) env.command('sed -i "s~%%resources%%~%s/windows~g" build/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) - env.command('sed -i "s~%%deps%%~%s~g" build/windows/installer2.%s.nsi' % (env.windows_prefix(), target.bits)) + env.command('sed -i "s~%%deps%%~%s~g" build/windows/installer2.%s.nsi' % (env.windows_prefix, target.bits)) env.command('sed -i "s~%%binaries%%~%s/build~g" build/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) env.command('sed -i "s~%%bits%%~32~g" build/windows/installer2.%s.nsi' % target.bits) env.command('makensis build/windows/installer2.%s.nsi' % target.bits) -- cgit v1.2.3 From d3e2e0dfd6f840f01a86590cca3ba3315c146710 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 29 May 2013 19:58:06 +0100 Subject: Bump libdcp version. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 521bc54f9..d0cf0c029 100644 --- a/cscript +++ b/cscript @@ -8,7 +8,7 @@ def dependencies(target): else: return (('openjpeg-cdist', None), ('ffmpeg-cdist', '7a23ec9c771184ab563cfe24ad9b427f38368961'), - ('libdcp', 'v0.49')) + ('libdcp', 'v0.51')) def build(env, target): cmd = './waf configure --prefix=%s' % env.work_dir_cscript() -- cgit v1.2.3 From f1633689739cc77f81e14365c862b5832d19da76 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 29 May 2013 21:50:24 +0100 Subject: Bump libdcp version. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index d0cf0c029..427cd8e56 100644 --- a/cscript +++ b/cscript @@ -8,7 +8,7 @@ def dependencies(target): else: return (('openjpeg-cdist', None), ('ffmpeg-cdist', '7a23ec9c771184ab563cfe24ad9b427f38368961'), - ('libdcp', 'v0.51')) + ('libdcp', 'v0.52')) def build(env, target): cmd = './waf configure --prefix=%s' % env.work_dir_cscript() -- cgit v1.2.3 From b2334715cf9ddc754add796eb3342334660af1af Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 29 May 2013 22:05:17 +0100 Subject: Try to put all platform stuff in platform/ --- builds/control-12.04-32 | 24 ----- builds/control-12.04-64 | 24 ----- builds/control-12.10-32 | 23 ----- builds/control-12.10-64 | 24 ----- cscript | 16 ++-- platform/linux/control-12.04-32 | 24 +++++ platform/linux/control-12.04-64 | 24 +++++ platform/linux/control-12.10-32 | 23 +++++ platform/linux/control-12.10-64 | 24 +++++ platform/windows/.gtkrc-2.0 | 6 ++ platform/windows/dvdomatic.bmp | Bin 0 -> 343254 bytes platform/windows/dvdomatic.ico | Bin 0 -> 9662 bytes platform/windows/dvdomatic.rc | 3 + platform/windows/dvdomatic_taskbar.ico | Bin 0 -> 1150 bytes platform/windows/installer.nsi.32.in | 144 ++++++++++++++++++++++++++++++ platform/windows/installer.nsi.64.in | 154 +++++++++++++++++++++++++++++++++ platform/windows/wscript | 4 + windows/.gtkrc-2.0 | 6 -- windows/dvdomatic.bmp | Bin 343254 -> 0 bytes windows/dvdomatic.ico | Bin 9662 -> 0 bytes windows/dvdomatic.rc | 3 - windows/dvdomatic_taskbar.ico | Bin 1150 -> 0 bytes windows/installer.nsi.32.in | 144 ------------------------------ windows/installer.nsi.64.in | 154 --------------------------------- windows/wscript | 4 - wscript | 2 +- 26 files changed, 415 insertions(+), 415 deletions(-) delete mode 100644 builds/control-12.04-32 delete mode 100644 builds/control-12.04-64 delete mode 100644 builds/control-12.10-32 delete mode 100644 builds/control-12.10-64 create mode 100644 platform/linux/control-12.04-32 create mode 100644 platform/linux/control-12.04-64 create mode 100644 platform/linux/control-12.10-32 create mode 100644 platform/linux/control-12.10-64 create mode 100755 platform/windows/.gtkrc-2.0 create mode 100644 platform/windows/dvdomatic.bmp create mode 100644 platform/windows/dvdomatic.ico create mode 100644 platform/windows/dvdomatic.rc create mode 100644 platform/windows/dvdomatic_taskbar.ico create mode 100644 platform/windows/installer.nsi.32.in create mode 100644 platform/windows/installer.nsi.64.in create mode 100644 platform/windows/wscript delete mode 100755 windows/.gtkrc-2.0 delete mode 100644 windows/dvdomatic.bmp delete mode 100644 windows/dvdomatic.ico delete mode 100644 windows/dvdomatic.rc delete mode 100644 windows/dvdomatic_taskbar.ico delete mode 100644 windows/installer.nsi.32.in delete mode 100644 windows/installer.nsi.64.in delete mode 100644 windows/wscript (limited to 'cscript') diff --git a/builds/control-12.04-32 b/builds/control-12.04-32 deleted file mode 100644 index 0f52d03ae..000000000 --- a/builds/control-12.04-32 +++ /dev/null @@ -1,24 +0,0 @@ -Source: dvdomatic -Section: video -Priority: extra -Maintainer: Carl Hetherington -Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) -Standards-Version: 3.9.3 -Homepage: http://carlh.net/software/dvdomatic - -Package: dvdomatic -Architecture: i386 -Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libsndfile1 (>= 1.0.25), libmagick++4 (>= 8:6.6.9.7), libxml++2.6-2 (>= 2.34.1) -Description: Generator of Digital Cinema Packages (DCPs) - DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio - files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant - digital projectors. - -Package: dvdomatic-dbg -Architecture: i386 -Section: debug -Priority: extra -Depends: ${dvdomatic:Depends}, ${misc:Depends} -Description: debugging symbols for dvdomatic - This package contains the debugging symbols for dvdomatic. - diff --git a/builds/control-12.04-64 b/builds/control-12.04-64 deleted file mode 100644 index fa4b4476e..000000000 --- a/builds/control-12.04-64 +++ /dev/null @@ -1,24 +0,0 @@ -Source: dvdomatic -Section: video -Priority: extra -Maintainer: Carl Hetherington -Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) -Standards-Version: 3.9.3 -Homepage: http://carlh.net/software/dvdomatic - -Package: dvdomatic -Architecture: amd64 -Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libsndfile1 (>= 1.0.25), libmagick++4 (>= 8:6.6.9.7), libxml++2.6-2 (>= 2.34.1) -Description: Generator of Digital Cinema Packages (DCPs) - DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio - files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant - digital projectors. - -Package: dvdomatic-dbg -Architecture: amd64 -Section: debug -Priority: extra -Depends: ${dvdomatic:Depends}, ${misc:Depends} -Description: debugging symbols for dvdomatic - This package contains the debugging symbols for dvdomatic. - diff --git a/builds/control-12.10-32 b/builds/control-12.10-32 deleted file mode 100644 index 0e5fc1f46..000000000 --- a/builds/control-12.10-32 +++ /dev/null @@ -1,23 +0,0 @@ -Source: dvdomatic -Section: video -Priority: extra -Maintainer: Carl Hetherington -Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) -Standards-Version: 3.9.3 -Homepage: http://carlh.net/software/dvdomatic - -Package: dvdomatic -Architecture: i386 -Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2) -Description: Generator of Digital Cinema Packages (DCPs) - DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio - files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant - digital projectors. - -Package: dvdomatic-dbg -Architecture: i386 -Section: debug -Priority: extra -Depends: ${dvdomatic:Depends}, ${misc:Depends} -Description: debugging symbols for dvdomatic - This package contains the debugging symbols for dvdomatic. diff --git a/builds/control-12.10-64 b/builds/control-12.10-64 deleted file mode 100644 index 24e16b4b5..000000000 --- a/builds/control-12.10-64 +++ /dev/null @@ -1,24 +0,0 @@ -Source: dvdomatic -Section: video -Priority: extra -Maintainer: Carl Hetherington -Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) -Standards-Version: 3.9.3 -Homepage: http://carlh.net/software/dvdomatic - -Package: dvdomatic -Architecture: amd64 -Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2) -Description: Generator of Digital Cinema Packages (DCPs) - DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio - files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant - digital projectors. - -Package: dvdomatic-dbg -Architecture: amd64 -Section: debug -Priority: extra -Depends: ${dvdomatic:Depends}, ${misc:Depends} -Description: debugging symbols for dvdomatic - This package contains the debugging symbols for dvdomatic. - diff --git a/cscript b/cscript index 521bc54f9..d004edac0 100644 --- a/cscript +++ b/cscript @@ -26,20 +26,20 @@ def build(env, target): def package(env, target, version): if target.platform == 'windows': - shutil.copyfile('build/windows/installer.%s.nsi' % target.bits, 'build/windows/installer2.%s.nsi' % target.bits) - env.command('sed -i "s~%%resources%%~%s/windows~g" build/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) - env.command('sed -i "s~%%deps%%~%s~g" build/windows/installer2.%s.nsi' % (env.windows_prefix, target.bits)) - env.command('sed -i "s~%%binaries%%~%s/build~g" build/windows/installer2.%s.nsi' % (os.getcwd(), target.bits)) - env.command('sed -i "s~%%bits%%~32~g" build/windows/installer2.%s.nsi' % target.bits) - env.command('makensis build/windows/installer2.%s.nsi' % target.bits) - return os.path.abspath(glob.glob('build/windows/*%s*.exe' % target.bits)[0]) + 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/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) + return os.path.abspath(glob.glob('build/platform/windows/*%s*.exe' % target.bits)[0]) elif target.platform == 'linux': if target.bits == 32: cpu = 'i386' else: cpu = 'amd64' - shutil.copyfile('builds/control-%s-%d' % (target.version, target.bits), 'debian/control') + shutil.copyfile('platform/linux/control-%s-%d' % (target.version, target.bits), 'debian/control') env.command('./waf dist') f = open('debian/files', 'w') print >>f,'dvdomatic_%s-1_%s.deb video extra' % (version, cpu) diff --git a/platform/linux/control-12.04-32 b/platform/linux/control-12.04-32 new file mode 100644 index 000000000..0f52d03ae --- /dev/null +++ b/platform/linux/control-12.04-32 @@ -0,0 +1,24 @@ +Source: dvdomatic +Section: video +Priority: extra +Maintainer: Carl Hetherington +Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) +Standards-Version: 3.9.3 +Homepage: http://carlh.net/software/dvdomatic + +Package: dvdomatic +Architecture: i386 +Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libsndfile1 (>= 1.0.25), libmagick++4 (>= 8:6.6.9.7), libxml++2.6-2 (>= 2.34.1) +Description: Generator of Digital Cinema Packages (DCPs) + DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio + files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant + digital projectors. + +Package: dvdomatic-dbg +Architecture: i386 +Section: debug +Priority: extra +Depends: ${dvdomatic:Depends}, ${misc:Depends} +Description: debugging symbols for dvdomatic + This package contains the debugging symbols for dvdomatic. + diff --git a/platform/linux/control-12.04-64 b/platform/linux/control-12.04-64 new file mode 100644 index 000000000..fa4b4476e --- /dev/null +++ b/platform/linux/control-12.04-64 @@ -0,0 +1,24 @@ +Source: dvdomatic +Section: video +Priority: extra +Maintainer: Carl Hetherington +Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) +Standards-Version: 3.9.3 +Homepage: http://carlh.net/software/dvdomatic + +Package: dvdomatic +Architecture: amd64 +Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libsndfile1 (>= 1.0.25), libmagick++4 (>= 8:6.6.9.7), libxml++2.6-2 (>= 2.34.1) +Description: Generator of Digital Cinema Packages (DCPs) + DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio + files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant + digital projectors. + +Package: dvdomatic-dbg +Architecture: amd64 +Section: debug +Priority: extra +Depends: ${dvdomatic:Depends}, ${misc:Depends} +Description: debugging symbols for dvdomatic + This package contains the debugging symbols for dvdomatic. + diff --git a/platform/linux/control-12.10-32 b/platform/linux/control-12.10-32 new file mode 100644 index 000000000..0e5fc1f46 --- /dev/null +++ b/platform/linux/control-12.10-32 @@ -0,0 +1,23 @@ +Source: dvdomatic +Section: video +Priority: extra +Maintainer: Carl Hetherington +Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) +Standards-Version: 3.9.3 +Homepage: http://carlh.net/software/dvdomatic + +Package: dvdomatic +Architecture: i386 +Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2) +Description: Generator of Digital Cinema Packages (DCPs) + DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio + files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant + digital projectors. + +Package: dvdomatic-dbg +Architecture: i386 +Section: debug +Priority: extra +Depends: ${dvdomatic:Depends}, ${misc:Depends} +Description: debugging symbols for dvdomatic + This package contains the debugging symbols for dvdomatic. diff --git a/platform/linux/control-12.10-64 b/platform/linux/control-12.10-64 new file mode 100644 index 000000000..24e16b4b5 --- /dev/null +++ b/platform/linux/control-12.10-64 @@ -0,0 +1,24 @@ +Source: dvdomatic +Section: video +Priority: extra +Maintainer: Carl Hetherington +Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) +Standards-Version: 3.9.3 +Homepage: http://carlh.net/software/dvdomatic + +Package: dvdomatic +Architecture: amd64 +Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2) +Description: Generator of Digital Cinema Packages (DCPs) + DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio + files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant + digital projectors. + +Package: dvdomatic-dbg +Architecture: amd64 +Section: debug +Priority: extra +Depends: ${dvdomatic:Depends}, ${misc:Depends} +Description: debugging symbols for dvdomatic + This package contains the debugging symbols for dvdomatic. + diff --git a/platform/windows/.gtkrc-2.0 b/platform/windows/.gtkrc-2.0 new file mode 100755 index 000000000..0ea1d69c9 --- /dev/null +++ b/platform/windows/.gtkrc-2.0 @@ -0,0 +1,6 @@ +gtk-theme-name = "MS-Windows" +style "user-font" +{ + font_name="Tahoma 8" +} +widget_class "*" style "user-font" diff --git a/platform/windows/dvdomatic.bmp b/platform/windows/dvdomatic.bmp new file mode 100644 index 000000000..0a196f7a0 Binary files /dev/null and b/platform/windows/dvdomatic.bmp differ diff --git a/platform/windows/dvdomatic.ico b/platform/windows/dvdomatic.ico new file mode 100644 index 000000000..225008cfe Binary files /dev/null and b/platform/windows/dvdomatic.ico differ diff --git a/platform/windows/dvdomatic.rc b/platform/windows/dvdomatic.rc new file mode 100644 index 000000000..17790cf0d --- /dev/null +++ b/platform/windows/dvdomatic.rc @@ -0,0 +1,3 @@ +id ICON "dvdomatic.ico" +taskbar_icon ICON "dvdomatic_taskbar.ico" +#include "wx-2.9/wx/msw/wx.rc" diff --git a/platform/windows/dvdomatic_taskbar.ico b/platform/windows/dvdomatic_taskbar.ico new file mode 100644 index 000000000..f4489fa14 Binary files /dev/null and b/platform/windows/dvdomatic_taskbar.ico differ diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in new file mode 100644 index 000000000..b73e4f345 --- /dev/null +++ b/platform/windows/installer.nsi.32.in @@ -0,0 +1,144 @@ +!include "MUI2.nsh" +Name "DVD-o-matic" + +RequestExecutionLevel admin + +outFile "DVD-o-matic @version@ 32-bit Installer.exe" +!define MUI_ICON "%resources%/dvdomatic.ico" +!define MUI_UNICON "%resources%/dvdomatic.ico" +!define MUI_SPECIALBITMAP "%resources%/dvdomatic.bmp" + +InstallDir "$PROGRAMFILES\DVD-o-matic" + +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE "../../COPYING" +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + +!insertmacro MUI_UNPAGE_WELCOME +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES +!insertmacro MUI_UNPAGE_FINISH + +!insertmacro MUI_LANGUAGE "English" + +Section "install" "Installation info" + +SetOutPath "$INSTDIR\bin" + +File "%deps%/bin/asdcp-libdcp.dll" +File "%deps%/bin/avcodec-54.dll" +File "%deps%/bin/avfilter-3.dll" +File "%deps%/bin/avformat-54.dll" +File "%deps%/bin/avutil-52.dll" +File "%deps%/bin/dcp.dll" +File "%deps%/bin/libintl-8.dll" +File "%deps%/bin/kumu-libdcp.dll" +File "%deps%/bin/libboost_chrono-mt.dll" +File "%deps%/bin/libboost_filesystem-mt.dll" +File "%deps%/bin/libboost_system-mt.dll" +File "%deps%/bin/libboost_thread_win32-mt.dll" +File "%deps%/bin/libboost_date_time-mt.dll" +File "%deps%/bin/libeay32.dll" +File "%deps%/bin/libgcc_s_sjlj-1.dll" +File "%deps%/bin/libgio-2.0-0.dll" +File "%deps%/bin/libglib-2.0-0.dll" +File "%deps%/bin/libgobject-2.0-0.dll" +File "%deps%/bin/libiconv-2.dll" +File "%deps%/bin/libjpeg-8.dll" +File "%deps%/bin/libMagick++-5.dll" +File "%deps%/bin/libMagickCore-5.dll" +File "%deps%/bin/libMagickWand-5.dll" +File "%deps%/bin/libopenjpeg-1.dll" +File "%deps%/bin/libpng15-15.dll" +File "%deps%/bin/libsigc-2.0-0.dll" +File "%deps%/bin/libsndfile-1.dll" +File "%deps%/bin/libssh.dll" +File "%deps%/bin/libstdc++-6.dll" +File "%deps%/bin/postproc-52.dll" +File "%deps%/bin/swresample-0.dll" +File "%deps%/bin/swscale-2.dll" +File "%deps%/bin/zlib1.dll" +File "%deps%/bin/libjpeg-8.dll" +File "%deps%/bin/wxbase294u_gcc_custom.dll" +File "%deps%/bin/wxmsw294u_core_gcc_custom.dll" +File "%deps%/bin/wxmsw294u_adv_gcc_custom.dll" +File "%deps%/bin/libcairo-2.dll" +File "%deps%/bin/libfreetype-6.dll" +File "%deps%/bin/libgthread-2.0-0.dll" +File "%deps%/bin/libpango-1.0-0.dll" +File "%deps%/bin/libgmodule-2.0-0.dll" +File "%deps%/bin/libpangocairo-1.0-0.dll" +File "%deps%/bin/libpangowin32-1.0-0.dll" +File "%deps%/bin/libtiff-5.dll" +File "%deps%/bin/libglibmm-2.4-1.dll" +File "%deps%/bin/libxml++-2.6-2.dll" +File "%deps%/bin/libxml2-2.dll" +File "%deps%/bin/libpixman-1-0.dll" +File "%deps%/bin/libfontconfig-1.dll" +File "%deps%/bin/libexpat-1.dll" +File "%deps%/bin/libbz2.dll" + +File "%binaries%/src/wx/dvdomatic-wx.dll" +File "%binaries%/src/lib/dvdomatic.dll" +File "%binaries%/src/tools/dvdomatic.exe" +File "%binaries%/src/tools/dvdomatic_batch.exe" +File "%binaries%/src/tools/servomatic_cli.exe" +File "%binaries%/src/tools/servomatic_gui.exe" + +# I don't know why, but sometimes it seems that +# delegates.xml must be in with the binaries, and +# sometimes in the $PROFILE. Meh. +File "%deps%/etc/ImageMagick/delegates.xml" +SetOutPath "$PROFILE\.magick" +File "%deps%/etc/ImageMagick/delegates.xml" + +SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES" +File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo" +File "%binaries%/src/wx/mo/fr_FR/libdvdomatic-wx.mo" +File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo" +SetOutPath "$INSTDIR\locale\it\LC_MESSAGES" +File "%binaries%/src/lib/mo/it_IT/libdvdomatic.mo" +File "%binaries%/src/wx/mo/it_IT/libdvdomatic-wx.mo" +File "%binaries%/src/tools/mo/it_IT/dvdomatic.mo" +SetOutPath "$INSTDIR\locale\es\LC_MESSAGES" +File "%binaries%/src/lib/mo/es_ES/libdvdomatic.mo" +File "%binaries%/src/wx/mo/es_ES/libdvdomatic-wx.mo" +File "%binaries%/src/tools/mo/es_ES/dvdomatic.mo" +SetOutPath "$INSTDIR\locale\sv\LC_MESSAGES" +File "%binaries%/src/lib/mo/sv_SE/libdvdomatic.mo" +File "%binaries%/src/wx/mo/sv_SE/libdvdomatic-wx.mo" +File "%binaries%/src/tools/mo/sv_SE/dvdomatic.mo" + +CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" +CreateShortCut "$DESKTOP\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic_batch.exe" "" +CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" + +CreateDirectory "$SMPROGRAMS\DVD-o-matic" +CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall DVD-o-matic.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 +CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic.exe" 0 +CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic_batch.exe" "" "$INSTDIR\bin\dvdomatic_batch.exe" 0 +CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0 + +WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "DisplayName" "DVD-o-matic (remove only)" +WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "UninstallString" "$INSTDIR\Uninstall.exe" + +WriteUninstaller "$INSTDIR\Uninstall.exe" + +SectionEnd + + +Section "Uninstall" + +RMDir /r "$INSTDIR\*.*" +RMDir "$INSTDIR" +Delete "$DESKTOP\DVD-o-matic.lnk" +Delete "$DESKTOP\DVD-o-matic bach converter.lnk" +Delete "$DESKTOP\DVD-o-matic encode server.lnk" +Delete "$SMPROGRAMS\DVD-o-matic\*.*" +RmDir "$SMPROGRAMS\DVD-o-matic" +DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DVD-o-matic" +DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" + +SectionEnd diff --git a/platform/windows/installer.nsi.64.in b/platform/windows/installer.nsi.64.in new file mode 100644 index 000000000..f499c46c2 --- /dev/null +++ b/platform/windows/installer.nsi.64.in @@ -0,0 +1,154 @@ +!include "MUI2.nsh" +!include "x64.nsh" + +Name "DVD-o-matic" + +RequestExecutionLevel admin + +outFile "DVD-o-matic @version@ 64-bit Installer.exe" +!define MUI_ICON "%resources%/dvdomatic.ico" +!define MUI_UNICON "%resources%/dvdomatic.ico" +!define MUI_SPECIALBITMAP "%resources%/dvdomatic.bmp" + +InstallDir "$PROGRAMFILES\DVD-o-matic" + +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE "../../COPYING" +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + +!insertmacro MUI_UNPAGE_WELCOME +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES +!insertmacro MUI_UNPAGE_FINISH + +!insertmacro MUI_LANGUAGE "English" + +Section "install" "Installation info" + +${If} ${RunningX64} + DetailPrint "Installer running on 64-bit host" + ; disable registry redirection (enable access to 64-bit portion of registry) + SetRegView 64 + ; change install dir + StrCpy $INSTDIR "$PROGRAMFILES64\DVD-o-matic" +${EndIf} + +SetOutPath "$INSTDIR\bin" + +File "%deps%/bin/asdcp-libdcp.dll" +File "%deps%/bin/avcodec-54.dll" +File "%deps%/bin/avfilter-3.dll" +File "%deps%/bin/avformat-54.dll" +File "%deps%/bin/avutil-52.dll" +File "%deps%/bin/dcp.dll" +File "%deps%/bin/libintl-8.dll" +File "%deps%/bin/kumu-libdcp.dll" +File "%deps%/bin/libboost_chrono-mt.dll" +File "%deps%/bin/libboost_filesystem-mt.dll" +File "%deps%/bin/libboost_system-mt.dll" +File "%deps%/bin/libboost_thread_win32-mt.dll" +File "%deps%/bin/libboost_date_time-mt.dll" +File "%deps%/bin/libeay32.dll" +File "%deps%/bin/libgcc_s_sjlj-1.dll" +File "%deps%/bin/libgio-2.0-0.dll" +File "%deps%/bin/libglib-2.0-0.dll" +File "%deps%/bin/libgobject-2.0-0.dll" +File "%deps%/bin/libiconv-2.dll" +File "%deps%/bin/libjpeg-8.dll" +File "%deps%/bin/libMagick++-5.dll" +File "%deps%/bin/libMagickCore-5.dll" +File "%deps%/bin/libMagickWand-5.dll" +File "%deps%/bin/libopenjpeg-1.dll" +File "%deps%/bin/libpng15-15.dll" +File "%deps%/bin/libsigc-2.0-0.dll" +File "%deps%/bin/libsndfile-1.dll" +File "%deps%/bin/libssh.dll" +File "%deps%/bin/libstdc++-6.dll" +File "%deps%/bin/postproc-52.dll" +File "%deps%/bin/swresample-0.dll" +File "%deps%/bin/swscale-2.dll" +File "%deps%/bin/zlib1.dll" +File "%deps%/bin/libjpeg-8.dll" +File "%deps%/bin/wxbase294u_gcc_custom.dll" +File "%deps%/bin/wxmsw294u_core_gcc_custom.dll" +File "%deps%/bin/wxmsw294u_adv_gcc_custom.dll" +File "%deps%/bin/libcairo-2.dll" +File "%deps%/bin/libfreetype-6.dll" +File "%deps%/bin/libgthread-2.0-0.dll" +File "%deps%/bin/libpango-1.0-0.dll" +File "%deps%/bin/libgmodule-2.0-0.dll" +File "%deps%/bin/libpangocairo-1.0-0.dll" +File "%deps%/bin/libpangowin32-1.0-0.dll" +File "%deps%/bin/libtiff-5.dll" +File "%deps%/bin/libglibmm-2.4-1.dll" +File "%deps%/bin/libxml++-2.6-2.dll" +File "%deps%/bin/libxml2-2.dll" +File "%deps%/bin/libpixman-1-0.dll" +File "%deps%/bin/libfontconfig-1.dll" +File "%deps%/bin/libexpat-1.dll" +File "%deps%/bin/libbz2.dll" + +File "%binaries%/src/wx/dvdomatic-wx.dll" +File "%binaries%/src/lib/dvdomatic.dll" +File "%binaries%/src/tools/dvdomatic.exe" +File "%binaries%/src/tools/dvdomatic_batch.exe" +File "%binaries%/src/tools/servomatic_cli.exe" +File "%binaries%/src/tools/servomatic_gui.exe" + +# I don't know why, but sometimes it seems that +# delegates.xml must be in with the binaries, and +# sometimes in the $PROFILE. Meh. +File "%deps%/etc/ImageMagick/delegates.xml" +SetOutPath "$PROFILE\.magick" +File "%deps%/etc/ImageMagick/delegates.xml" + +SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES" +File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo" +File "%binaries%/src/wx/mo/fr_FR/libdvdomatic-wx.mo" +File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo" +SetOutPath "$INSTDIR\locale\it\LC_MESSAGES" +File "%binaries%/src/lib/mo/it_IT/libdvdomatic.mo" +File "%binaries%/src/wx/mo/it_IT/libdvdomatic-wx.mo" +File "%binaries%/src/tools/mo/it_IT/dvdomatic.mo" +SetOutPath "$INSTDIR\locale\es\LC_MESSAGES" +File "%binaries%/src/lib/mo/es_ES/libdvdomatic.mo" +File "%binaries%/src/wx/mo/es_ES/libdvdomatic-wx.mo" +File "%binaries%/src/tools/mo/es_ES/dvdomatic.mo" +SetOutPath "$INSTDIR\locale\sv\LC_MESSAGES" +File "%binaries%/src/lib/mo/sv_SE/libdvdomatic.mo" +File "%binaries%/src/wx/mo/sv_SE/libdvdomatic-wx.mo" +File "%binaries%/src/tools/mo/sv_SE/dvdomatic.mo" + +CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" +CreateShortCut "$DESKTOP\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic_batch.exe" "" +CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" + +CreateDirectory "$SMPROGRAMS\DVD-o-matic" +CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall DVD-o-matic.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 +CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic.exe" 0 +CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic_batch.exe" 0 +CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0 + +WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "DisplayName" "DVD-o-matic (remove only)" +WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "UninstallString" "$INSTDIR\Uninstall.exe" + +WriteUninstaller "$INSTDIR\Uninstall.exe" + +SectionEnd + + +Section "Uninstall" + +RMDir /r "$INSTDIR\*.*" +RMDir "$INSTDIR" +Delete "$DESKTOP\DVD-o-matic.lnk" +Delete "$DESKTOP\DVD-o-matic batch converter.lnk" +Delete "$DESKTOP\DVD-o-matic encode server.lnk" +Delete "$SMPROGRAMS\DVD-o-matic\*.*" +RmDir "$SMPROGRAMS\DVD-o-matic" +DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DVD-o-matic" +DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" + +SectionEnd diff --git a/platform/windows/wscript b/platform/windows/wscript new file mode 100644 index 000000000..585cebef1 --- /dev/null +++ b/platform/windows/wscript @@ -0,0 +1,4 @@ +def build(bld): + bld.new_task_gen(features = 'subst', source = 'installer.nsi.32.in', target = 'installer.32.nsi', version = bld.env.VERSION) + bld.new_task_gen(features = 'subst', source = 'installer.nsi.64.in', target = 'installer.64.nsi', version = bld.env.VERSION) + diff --git a/windows/.gtkrc-2.0 b/windows/.gtkrc-2.0 deleted file mode 100755 index 0ea1d69c9..000000000 --- a/windows/.gtkrc-2.0 +++ /dev/null @@ -1,6 +0,0 @@ -gtk-theme-name = "MS-Windows" -style "user-font" -{ - font_name="Tahoma 8" -} -widget_class "*" style "user-font" diff --git a/windows/dvdomatic.bmp b/windows/dvdomatic.bmp deleted file mode 100644 index 0a196f7a0..000000000 Binary files a/windows/dvdomatic.bmp and /dev/null differ diff --git a/windows/dvdomatic.ico b/windows/dvdomatic.ico deleted file mode 100644 index 225008cfe..000000000 Binary files a/windows/dvdomatic.ico and /dev/null differ diff --git a/windows/dvdomatic.rc b/windows/dvdomatic.rc deleted file mode 100644 index 17790cf0d..000000000 --- a/windows/dvdomatic.rc +++ /dev/null @@ -1,3 +0,0 @@ -id ICON "dvdomatic.ico" -taskbar_icon ICON "dvdomatic_taskbar.ico" -#include "wx-2.9/wx/msw/wx.rc" diff --git a/windows/dvdomatic_taskbar.ico b/windows/dvdomatic_taskbar.ico deleted file mode 100644 index f4489fa14..000000000 Binary files a/windows/dvdomatic_taskbar.ico and /dev/null differ diff --git a/windows/installer.nsi.32.in b/windows/installer.nsi.32.in deleted file mode 100644 index b73e4f345..000000000 --- a/windows/installer.nsi.32.in +++ /dev/null @@ -1,144 +0,0 @@ -!include "MUI2.nsh" -Name "DVD-o-matic" - -RequestExecutionLevel admin - -outFile "DVD-o-matic @version@ 32-bit Installer.exe" -!define MUI_ICON "%resources%/dvdomatic.ico" -!define MUI_UNICON "%resources%/dvdomatic.ico" -!define MUI_SPECIALBITMAP "%resources%/dvdomatic.bmp" - -InstallDir "$PROGRAMFILES\DVD-o-matic" - -!insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "../../COPYING" -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES -!insertmacro MUI_PAGE_FINISH - -!insertmacro MUI_UNPAGE_WELCOME -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES -!insertmacro MUI_UNPAGE_FINISH - -!insertmacro MUI_LANGUAGE "English" - -Section "install" "Installation info" - -SetOutPath "$INSTDIR\bin" - -File "%deps%/bin/asdcp-libdcp.dll" -File "%deps%/bin/avcodec-54.dll" -File "%deps%/bin/avfilter-3.dll" -File "%deps%/bin/avformat-54.dll" -File "%deps%/bin/avutil-52.dll" -File "%deps%/bin/dcp.dll" -File "%deps%/bin/libintl-8.dll" -File "%deps%/bin/kumu-libdcp.dll" -File "%deps%/bin/libboost_chrono-mt.dll" -File "%deps%/bin/libboost_filesystem-mt.dll" -File "%deps%/bin/libboost_system-mt.dll" -File "%deps%/bin/libboost_thread_win32-mt.dll" -File "%deps%/bin/libboost_date_time-mt.dll" -File "%deps%/bin/libeay32.dll" -File "%deps%/bin/libgcc_s_sjlj-1.dll" -File "%deps%/bin/libgio-2.0-0.dll" -File "%deps%/bin/libglib-2.0-0.dll" -File "%deps%/bin/libgobject-2.0-0.dll" -File "%deps%/bin/libiconv-2.dll" -File "%deps%/bin/libjpeg-8.dll" -File "%deps%/bin/libMagick++-5.dll" -File "%deps%/bin/libMagickCore-5.dll" -File "%deps%/bin/libMagickWand-5.dll" -File "%deps%/bin/libopenjpeg-1.dll" -File "%deps%/bin/libpng15-15.dll" -File "%deps%/bin/libsigc-2.0-0.dll" -File "%deps%/bin/libsndfile-1.dll" -File "%deps%/bin/libssh.dll" -File "%deps%/bin/libstdc++-6.dll" -File "%deps%/bin/postproc-52.dll" -File "%deps%/bin/swresample-0.dll" -File "%deps%/bin/swscale-2.dll" -File "%deps%/bin/zlib1.dll" -File "%deps%/bin/libjpeg-8.dll" -File "%deps%/bin/wxbase294u_gcc_custom.dll" -File "%deps%/bin/wxmsw294u_core_gcc_custom.dll" -File "%deps%/bin/wxmsw294u_adv_gcc_custom.dll" -File "%deps%/bin/libcairo-2.dll" -File "%deps%/bin/libfreetype-6.dll" -File "%deps%/bin/libgthread-2.0-0.dll" -File "%deps%/bin/libpango-1.0-0.dll" -File "%deps%/bin/libgmodule-2.0-0.dll" -File "%deps%/bin/libpangocairo-1.0-0.dll" -File "%deps%/bin/libpangowin32-1.0-0.dll" -File "%deps%/bin/libtiff-5.dll" -File "%deps%/bin/libglibmm-2.4-1.dll" -File "%deps%/bin/libxml++-2.6-2.dll" -File "%deps%/bin/libxml2-2.dll" -File "%deps%/bin/libpixman-1-0.dll" -File "%deps%/bin/libfontconfig-1.dll" -File "%deps%/bin/libexpat-1.dll" -File "%deps%/bin/libbz2.dll" - -File "%binaries%/src/wx/dvdomatic-wx.dll" -File "%binaries%/src/lib/dvdomatic.dll" -File "%binaries%/src/tools/dvdomatic.exe" -File "%binaries%/src/tools/dvdomatic_batch.exe" -File "%binaries%/src/tools/servomatic_cli.exe" -File "%binaries%/src/tools/servomatic_gui.exe" - -# I don't know why, but sometimes it seems that -# delegates.xml must be in with the binaries, and -# sometimes in the $PROFILE. Meh. -File "%deps%/etc/ImageMagick/delegates.xml" -SetOutPath "$PROFILE\.magick" -File "%deps%/etc/ImageMagick/delegates.xml" - -SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES" -File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo" -File "%binaries%/src/wx/mo/fr_FR/libdvdomatic-wx.mo" -File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo" -SetOutPath "$INSTDIR\locale\it\LC_MESSAGES" -File "%binaries%/src/lib/mo/it_IT/libdvdomatic.mo" -File "%binaries%/src/wx/mo/it_IT/libdvdomatic-wx.mo" -File "%binaries%/src/tools/mo/it_IT/dvdomatic.mo" -SetOutPath "$INSTDIR\locale\es\LC_MESSAGES" -File "%binaries%/src/lib/mo/es_ES/libdvdomatic.mo" -File "%binaries%/src/wx/mo/es_ES/libdvdomatic-wx.mo" -File "%binaries%/src/tools/mo/es_ES/dvdomatic.mo" -SetOutPath "$INSTDIR\locale\sv\LC_MESSAGES" -File "%binaries%/src/lib/mo/sv_SE/libdvdomatic.mo" -File "%binaries%/src/wx/mo/sv_SE/libdvdomatic-wx.mo" -File "%binaries%/src/tools/mo/sv_SE/dvdomatic.mo" - -CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" -CreateShortCut "$DESKTOP\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic_batch.exe" "" -CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" - -CreateDirectory "$SMPROGRAMS\DVD-o-matic" -CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall DVD-o-matic.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 -CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic.exe" 0 -CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic_batch.exe" "" "$INSTDIR\bin\dvdomatic_batch.exe" 0 -CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0 - -WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "DisplayName" "DVD-o-matic (remove only)" -WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "UninstallString" "$INSTDIR\Uninstall.exe" - -WriteUninstaller "$INSTDIR\Uninstall.exe" - -SectionEnd - - -Section "Uninstall" - -RMDir /r "$INSTDIR\*.*" -RMDir "$INSTDIR" -Delete "$DESKTOP\DVD-o-matic.lnk" -Delete "$DESKTOP\DVD-o-matic bach converter.lnk" -Delete "$DESKTOP\DVD-o-matic encode server.lnk" -Delete "$SMPROGRAMS\DVD-o-matic\*.*" -RmDir "$SMPROGRAMS\DVD-o-matic" -DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DVD-o-matic" -DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" - -SectionEnd diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in deleted file mode 100644 index f499c46c2..000000000 --- a/windows/installer.nsi.64.in +++ /dev/null @@ -1,154 +0,0 @@ -!include "MUI2.nsh" -!include "x64.nsh" - -Name "DVD-o-matic" - -RequestExecutionLevel admin - -outFile "DVD-o-matic @version@ 64-bit Installer.exe" -!define MUI_ICON "%resources%/dvdomatic.ico" -!define MUI_UNICON "%resources%/dvdomatic.ico" -!define MUI_SPECIALBITMAP "%resources%/dvdomatic.bmp" - -InstallDir "$PROGRAMFILES\DVD-o-matic" - -!insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "../../COPYING" -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES -!insertmacro MUI_PAGE_FINISH - -!insertmacro MUI_UNPAGE_WELCOME -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES -!insertmacro MUI_UNPAGE_FINISH - -!insertmacro MUI_LANGUAGE "English" - -Section "install" "Installation info" - -${If} ${RunningX64} - DetailPrint "Installer running on 64-bit host" - ; disable registry redirection (enable access to 64-bit portion of registry) - SetRegView 64 - ; change install dir - StrCpy $INSTDIR "$PROGRAMFILES64\DVD-o-matic" -${EndIf} - -SetOutPath "$INSTDIR\bin" - -File "%deps%/bin/asdcp-libdcp.dll" -File "%deps%/bin/avcodec-54.dll" -File "%deps%/bin/avfilter-3.dll" -File "%deps%/bin/avformat-54.dll" -File "%deps%/bin/avutil-52.dll" -File "%deps%/bin/dcp.dll" -File "%deps%/bin/libintl-8.dll" -File "%deps%/bin/kumu-libdcp.dll" -File "%deps%/bin/libboost_chrono-mt.dll" -File "%deps%/bin/libboost_filesystem-mt.dll" -File "%deps%/bin/libboost_system-mt.dll" -File "%deps%/bin/libboost_thread_win32-mt.dll" -File "%deps%/bin/libboost_date_time-mt.dll" -File "%deps%/bin/libeay32.dll" -File "%deps%/bin/libgcc_s_sjlj-1.dll" -File "%deps%/bin/libgio-2.0-0.dll" -File "%deps%/bin/libglib-2.0-0.dll" -File "%deps%/bin/libgobject-2.0-0.dll" -File "%deps%/bin/libiconv-2.dll" -File "%deps%/bin/libjpeg-8.dll" -File "%deps%/bin/libMagick++-5.dll" -File "%deps%/bin/libMagickCore-5.dll" -File "%deps%/bin/libMagickWand-5.dll" -File "%deps%/bin/libopenjpeg-1.dll" -File "%deps%/bin/libpng15-15.dll" -File "%deps%/bin/libsigc-2.0-0.dll" -File "%deps%/bin/libsndfile-1.dll" -File "%deps%/bin/libssh.dll" -File "%deps%/bin/libstdc++-6.dll" -File "%deps%/bin/postproc-52.dll" -File "%deps%/bin/swresample-0.dll" -File "%deps%/bin/swscale-2.dll" -File "%deps%/bin/zlib1.dll" -File "%deps%/bin/libjpeg-8.dll" -File "%deps%/bin/wxbase294u_gcc_custom.dll" -File "%deps%/bin/wxmsw294u_core_gcc_custom.dll" -File "%deps%/bin/wxmsw294u_adv_gcc_custom.dll" -File "%deps%/bin/libcairo-2.dll" -File "%deps%/bin/libfreetype-6.dll" -File "%deps%/bin/libgthread-2.0-0.dll" -File "%deps%/bin/libpango-1.0-0.dll" -File "%deps%/bin/libgmodule-2.0-0.dll" -File "%deps%/bin/libpangocairo-1.0-0.dll" -File "%deps%/bin/libpangowin32-1.0-0.dll" -File "%deps%/bin/libtiff-5.dll" -File "%deps%/bin/libglibmm-2.4-1.dll" -File "%deps%/bin/libxml++-2.6-2.dll" -File "%deps%/bin/libxml2-2.dll" -File "%deps%/bin/libpixman-1-0.dll" -File "%deps%/bin/libfontconfig-1.dll" -File "%deps%/bin/libexpat-1.dll" -File "%deps%/bin/libbz2.dll" - -File "%binaries%/src/wx/dvdomatic-wx.dll" -File "%binaries%/src/lib/dvdomatic.dll" -File "%binaries%/src/tools/dvdomatic.exe" -File "%binaries%/src/tools/dvdomatic_batch.exe" -File "%binaries%/src/tools/servomatic_cli.exe" -File "%binaries%/src/tools/servomatic_gui.exe" - -# I don't know why, but sometimes it seems that -# delegates.xml must be in with the binaries, and -# sometimes in the $PROFILE. Meh. -File "%deps%/etc/ImageMagick/delegates.xml" -SetOutPath "$PROFILE\.magick" -File "%deps%/etc/ImageMagick/delegates.xml" - -SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES" -File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo" -File "%binaries%/src/wx/mo/fr_FR/libdvdomatic-wx.mo" -File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo" -SetOutPath "$INSTDIR\locale\it\LC_MESSAGES" -File "%binaries%/src/lib/mo/it_IT/libdvdomatic.mo" -File "%binaries%/src/wx/mo/it_IT/libdvdomatic-wx.mo" -File "%binaries%/src/tools/mo/it_IT/dvdomatic.mo" -SetOutPath "$INSTDIR\locale\es\LC_MESSAGES" -File "%binaries%/src/lib/mo/es_ES/libdvdomatic.mo" -File "%binaries%/src/wx/mo/es_ES/libdvdomatic-wx.mo" -File "%binaries%/src/tools/mo/es_ES/dvdomatic.mo" -SetOutPath "$INSTDIR\locale\sv\LC_MESSAGES" -File "%binaries%/src/lib/mo/sv_SE/libdvdomatic.mo" -File "%binaries%/src/wx/mo/sv_SE/libdvdomatic-wx.mo" -File "%binaries%/src/tools/mo/sv_SE/dvdomatic.mo" - -CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" -CreateShortCut "$DESKTOP\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic_batch.exe" "" -CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" - -CreateDirectory "$SMPROGRAMS\DVD-o-matic" -CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall DVD-o-matic.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 -CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic.exe" 0 -CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic batch converter.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic_batch.exe" 0 -CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0 - -WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "DisplayName" "DVD-o-matic (remove only)" -WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "UninstallString" "$INSTDIR\Uninstall.exe" - -WriteUninstaller "$INSTDIR\Uninstall.exe" - -SectionEnd - - -Section "Uninstall" - -RMDir /r "$INSTDIR\*.*" -RMDir "$INSTDIR" -Delete "$DESKTOP\DVD-o-matic.lnk" -Delete "$DESKTOP\DVD-o-matic batch converter.lnk" -Delete "$DESKTOP\DVD-o-matic encode server.lnk" -Delete "$SMPROGRAMS\DVD-o-matic\*.*" -RmDir "$SMPROGRAMS\DVD-o-matic" -DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DVD-o-matic" -DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" - -SectionEnd diff --git a/windows/wscript b/windows/wscript deleted file mode 100644 index 585cebef1..000000000 --- a/windows/wscript +++ /dev/null @@ -1,4 +0,0 @@ -def build(bld): - bld.new_task_gen(features = 'subst', source = 'installer.nsi.32.in', target = 'installer.32.nsi', version = bld.env.VERSION) - bld.new_task_gen(features = 'subst', source = 'installer.nsi.64.in', target = 'installer.64.nsi', version = bld.env.VERSION) - diff --git a/wscript b/wscript index b5676ba5b..86ed07b1b 100644 --- a/wscript +++ b/wscript @@ -192,7 +192,7 @@ def build(bld): bld.recurse('src') bld.recurse('test') if bld.env.TARGET_WINDOWS: - bld.recurse('windows') + bld.recurse('platform/windows') d = { 'PREFIX' : '${PREFIX' } -- cgit v1.2.3 From 2adf3ce04f5bff645e40f7e8aca1c7e3c014375a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 31 May 2013 11:34:44 +0100 Subject: Install on OS X too. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index a3898aa6e..8a229cc73 100644 --- a/cscript +++ b/cscript @@ -20,7 +20,7 @@ def build(env, target): env.command('./waf') - if target.platform == 'linux': + if target.platform == 'linux' or target.platform == 'osx': env.command('./waf install') -- cgit v1.2.3 From 21b263d8619a20394b994339a8d2987dc30c3bf2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 31 May 2013 13:01:05 +0100 Subject: Fix location of windows bits. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 8a229cc73..8775cb387 100644 --- a/cscript +++ b/cscript @@ -27,7 +27,7 @@ def build(env, target): def package(env, 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/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), 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) -- cgit v1.2.3 From d85df1ad15c05665eb1891096c4bf585362a35e3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 31 May 2013 23:39:12 +0100 Subject: Try to add OS X package target to cscript. --- cscript | 3 +++ 1 file changed, 3 insertions(+) (limited to 'cscript') diff --git a/cscript b/cscript index 8775cb387..1d75bb8e8 100644 --- a/cscript +++ b/cscript @@ -61,6 +61,9 @@ def package(env, target, version): debs.append(os.path.abspath(p)) return debs + elif target.platform == 'osx': + env.command('build/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') -- cgit v1.2.3 From 40e285b0c53a35adb92da972105229ceffdd5980 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 31 May 2013 23:53:12 +0100 Subject: cscript typo. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 1d75bb8e8..d6f9b6f94 100644 --- a/cscript +++ b/cscript @@ -62,7 +62,7 @@ def package(env, target, version): return debs elif target.platform == 'osx': - env.command('build/platform/osx/make_dmg.sh') + env.command('platform/osx/make_dmg.sh') return os.path.abspath(glob.glob('build/platform/osx/DVD-o-matic*.dmg')[0]) def make_pot(env): -- cgit v1.2.3 From 42866530db49e0faf367ad28a55c658be60951bf Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 1 Jun 2013 00:17:32 +0100 Subject: More OS X packaging tweaks. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index d6f9b6f94..dd39befda 100644 --- a/cscript +++ b/cscript @@ -62,7 +62,7 @@ def package(env, target, version): return debs elif target.platform == 'osx': - env.command('platform/osx/make_dmg.sh') + env.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): -- cgit v1.2.3 From 7aedfdbd982168b9c2f233621580abb6c1e5d2dd Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 4 Jun 2013 22:57:05 +0100 Subject: Bump libdcp version. --- cscript | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index dd39befda..f3d532d57 100644 --- a/cscript +++ b/cscript @@ -8,7 +8,7 @@ def dependencies(target): else: return (('openjpeg-cdist', None), ('ffmpeg-cdist', '7a23ec9c771184ab563cfe24ad9b427f38368961'), - ('libdcp', 'v0.52')) + ('libdcp', 'v0.53')) def build(env, target): cmd = './waf configure --prefix=%s' % env.work_dir_cscript() diff --git a/wscript b/wscript index 1d471f043..d4bde1226 100644 --- a/wscript +++ b/wscript @@ -61,7 +61,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-O2') if not conf.options.static: - conf.check_cfg(package = 'libdcp', atleast_version = '0.49', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) + conf.check_cfg(package = 'libdcp', atleast_version = '0.52', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True) conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True) conf.check_cfg(package = 'libavcodec', args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = True) -- cgit v1.2.3 From d28dd401ad47186e939e96068b7ece4f2b4418d9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 6 Jun 2013 23:15:22 +0100 Subject: Don't build statically on OS X --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index f3d532d57..9aea4e877 100644 --- a/cscript +++ b/cscript @@ -14,7 +14,7 @@ def build(env, target): cmd = './waf configure --prefix=%s' % env.work_dir_cscript() if target.platform == 'windows': cmd += ' --target-windows' - else: + else if target.platform == 'linux': cmd += ' --static' env.command(cmd) -- cgit v1.2.3 From 9b6e98e7dcefe301c4583391fbfa9ae8e9b3f47f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 6 Jun 2013 23:24:43 +0100 Subject: Typo. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 9aea4e877..4ba4eadb9 100644 --- a/cscript +++ b/cscript @@ -14,7 +14,7 @@ def build(env, target): cmd = './waf configure --prefix=%s' % env.work_dir_cscript() if target.platform == 'windows': cmd += ' --target-windows' - else if target.platform == 'linux': + elif target.platform == 'linux': cmd += ' --static' env.command(cmd) -- cgit v1.2.3 From c7488f10cbde39bffb8ece2601005c515acbf3a3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 7 Jun 2013 10:01:55 +0100 Subject: Fix configure on OS X --- cscript | 2 ++ 1 file changed, 2 insertions(+) (limited to 'cscript') diff --git a/cscript b/cscript index 9aea4e877..87e7551e4 100644 --- a/cscript +++ b/cscript @@ -14,6 +14,8 @@ def build(env, target): cmd = './waf configure --prefix=%s' % env.work_dir_cscript() if target.platform == 'windows': cmd += ' --target-windows' + else if target.platform == 'osx': + cmd += ' --osx' else if target.platform == 'linux': cmd += ' --static' env.command(cmd) -- cgit v1.2.3 From 5200435ea61574df5f23cbb53cbefa2dd09742b7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 9 Jun 2013 20:23:54 +0100 Subject: Auto-detect OS X during configure. Try again to fix lzma dep. --- cscript | 2 -- wscript | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 1f43f8936..4ba4eadb9 100644 --- a/cscript +++ b/cscript @@ -14,8 +14,6 @@ def build(env, target): cmd = './waf configure --prefix=%s' % env.work_dir_cscript() if target.platform == 'windows': cmd += ' --target-windows' - elif target.platform == 'osx': - cmd += ' --osx' elif target.platform == 'linux': cmd += ' --static' env.command(cmd) diff --git a/wscript b/wscript index a2183f3b6..149ac109c 100644 --- a/wscript +++ b/wscript @@ -15,7 +15,6 @@ def options(opt): opt.add_option('--static', action='store_true', default=False, help='build statically, and link statically to libdcp and FFmpeg') 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('--osx', action='store_true', default=False, help='build on OS X') def configure(conf): conf.load('compiler_cxx') @@ -26,13 +25,13 @@ def configure(conf): conf.env.DISABLE_GUI = conf.options.disable_gui conf.env.STATIC = conf.options.static conf.env.VERSION = VERSION - conf.env.TARGET_OSX = conf.options.osx - conf.env.TARGET_LINUX = not conf.options.target_windows and not conf.options.osx + 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', '-Wall', '-Wno-attributes', '-Wextra']) - if conf.options.target_windows: + if conf.env.TARGET_WINDOWS: conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE']) wxrc = os.popen('wx-config --rescomp').read().split()[1:] conf.env.append_value('WINRCFLAGS', wxrc) @@ -53,8 +52,9 @@ def configure(conf): boost_thread = 'boost_thread' conf.env.append_value('LINKFLAGS', '-pthread') - if conf.env.TARGET_LINUX: - # libxml2 seems to be linked against this on Ubuntu, but it doesn't mention it in its .pc file + if conf.env.TARGET_LINUX or conf.env.TARGET_OSX: + # libxml2 seems to be linked against this on Ubuntu and with my build of libxml2 on + # OS X, but it doesn't mention it in its .pc file conf.env.append_value('LIB', 'lzma') if conf.options.enable_debug: @@ -102,8 +102,10 @@ def configure(conf): conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True) conf.check_cfg(package = 'glib-2.0', args = '--cflags --libs', uselib_store = 'GLIB', mandatory = True) - if conf.options.target_windows is False: - conf.check_cfg(package = 'liblzma', args = '--cflags --libs', uselib_store = 'LZMA', mandatory = True) + + if conf.env.TARGET_LINUX or conf.env.TARGET_OSX: + conf.check_cfg(package='liblzma', args='--cflags --libs', uselib_store='LZMA', mandatory=True) + conf.check_cfg(package = '', path = conf.options.magickpp_config, args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True) if conf.options.static: -- cgit v1.2.3 From 07f3bf84aad2d2dc6e8047a0c46c2a9bc37ec1c5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 16 Jun 2013 22:09:07 +0100 Subject: Update ffmpeg to version with a required OS X build flag. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 4ba4eadb9..47c71a335 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('openjpeg-cdist', None), - ('ffmpeg-cdist', '7a23ec9c771184ab563cfe24ad9b427f38368961'), + ('ffmpeg-cdist', 'e17deeb6f6c4fe0d56bb151342b2afb82b1fcefb'), ('libdcp', 'v0.53')) def build(env, target): -- 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 'cscript') 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 ccaebd9fdcf308f03e0286a6042630fcb0bcc68f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 19 Jun 2013 10:11:02 +0100 Subject: Version tweak. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index f37255116..c3f111f8e 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: # XXX: should be some versions in here - return (('ffmpeg-cdist', ''), + return (('ffmpeg-cdist', None), ('libdcp', None)) def build(target): -- cgit v1.2.3 From 54544a4c297bd90af11e234f3cfa5ee7e1ec4e5e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 19 Jun 2013 16:55:04 +0100 Subject: Add some versions into the cscript. --- cscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index c3f111f8e..cdb391b5c 100644 --- a/cscript +++ b/cscript @@ -7,8 +7,8 @@ def dependencies(target): return () else: # XXX: should be some versions in here - return (('ffmpeg-cdist', None), - ('libdcp', None)) + return (('ffmpeg-cdist', 'e797834288eaf05a2f406524ae04aaa0f114cb08'), + ('libdcp', '0.54')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From c46b1fd840c3c0c6ac8ca52b35f9787daf097d3b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 19 Jun 2013 18:42:40 +0100 Subject: Fix version specifier. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index cdb391b5c..6a9b48a89 100644 --- a/cscript +++ b/cscript @@ -8,7 +8,7 @@ def dependencies(target): else: # XXX: should be some versions in here return (('ffmpeg-cdist', 'e797834288eaf05a2f406524ae04aaa0f114cb08'), - ('libdcp', '0.54')) + ('libdcp', 'v0.54')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From b5e701a80256d67156d43c9794de38ac01eed449 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 10 Jul 2013 11:30:29 +0100 Subject: Fix dmg name. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index e7ef219d4..a65a92702 100644 --- a/cscript +++ b/cscript @@ -63,7 +63,7 @@ def package(target, version): return debs elif target.platform == 'osx': target.command('bash platform/osx/make_dmg.sh') - return os.path.abspath(glob.glob('build/platform/osx/DVD-o-matic*.dmg')[0]) + return os.path.abspath(glob.glob('build/platform/osx/DCP-o-matic*.dmg')[0]) def make_pot(target): target.command('./waf pot') -- cgit v1.2.3 From ade36b7e120838840d0f645763b8e0814eaf9ee4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 10 Jul 2013 14:55:46 +0100 Subject: Bump libdcp version. --- cscript | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index a65a92702..7b6882202 100644 --- a/cscript +++ b/cscript @@ -6,9 +6,8 @@ def dependencies(target): if target.platform == 'windows': return () else: - # XXX: should be some versions in here return (('ffmpeg-cdist', 'e797834288eaf05a2f406524ae04aaa0f114cb08'), - ('libdcp', 'v0.54')) + ('libdcp', 'v0.59')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From 071eecf2b3de2949ee8f157de6dc7e47bcc29fea Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 11 Jul 2013 23:14:10 +0100 Subject: Bump libdcp. --- cscript | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 7b6882202..ee1684ef2 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('ffmpeg-cdist', 'e797834288eaf05a2f406524ae04aaa0f114cb08'), - ('libdcp', 'v0.59')) + ('libdcp', 'v0.65')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() diff --git a/wscript b/wscript index e89fa9a53..dfea2abdf 100644 --- a/wscript +++ b/wscript @@ -68,7 +68,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-O2') if not conf.options.static: - conf.check_cfg(package = 'libdcp', atleast_version = '0.52', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) + conf.check_cfg(package = 'libdcp', atleast_version = '0.65', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) conf.check_cfg(package = 'libcxml', atleast_version = '0.01', args = '--cflags --libs', uselib_store = 'CXML', mandatory = True) conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True) conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True) -- cgit v1.2.3 From 33dd911e6c2cc3c42425d4260bd22dbe462d01be Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 12 Jul 2013 23:13:35 +0100 Subject: Bump libdcp version. --- cscript | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index ee1684ef2..dc33abb42 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('ffmpeg-cdist', 'e797834288eaf05a2f406524ae04aaa0f114cb08'), - ('libdcp', 'v0.65')) + ('libdcp', 'v0.66')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() diff --git a/wscript b/wscript index 515d4973e..ddf0a240c 100644 --- a/wscript +++ b/wscript @@ -86,7 +86,7 @@ def configure(conf): # Dependencies which are dynamically linked everywhere except --static # Get libs only when we are dynamically linking - conf.check_cfg(package='libdcp', atleast_version='0.65', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.66', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) # Remove erroneous escaping of quotes from xmlsec1 defines conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.check_cfg(package='libcxml', atleast_version='0.01', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True) -- cgit v1.2.3 From 30df94bc9c692b62ad640e250a1bd7d2e48e6f5d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 13 Jul 2013 00:48:57 +0100 Subject: Bump libdcp version. --- cscript | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index dc33abb42..0dc5255bb 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('ffmpeg-cdist', 'e797834288eaf05a2f406524ae04aaa0f114cb08'), - ('libdcp', 'v0.66')) + ('libdcp', 'v0.67')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() diff --git a/wscript b/wscript index ddf0a240c..9be9d1426 100644 --- a/wscript +++ b/wscript @@ -86,7 +86,7 @@ def configure(conf): # Dependencies which are dynamically linked everywhere except --static # Get libs only when we are dynamically linking - conf.check_cfg(package='libdcp', atleast_version='0.66', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.67', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) # Remove erroneous escaping of quotes from xmlsec1 defines conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.check_cfg(package='libcxml', atleast_version='0.01', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True) -- cgit v1.2.3 From 4981bba0d5103dc92dba5d5f79d5296dd2078402 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 13 Jul 2013 09:30:34 +0100 Subject: Remove definite libdcp version for a bit. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 0dc5255bb..f3966330b 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('ffmpeg-cdist', 'e797834288eaf05a2f406524ae04aaa0f114cb08'), - ('libdcp', 'v0.67')) + ('libdcp', None)) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From 57d14b1fd18cd89a2f095187ef0f1a9d2aa45397 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 23 Jul 2013 19:23:14 +0100 Subject: Bump libdcp version. --- cscript | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index f3966330b..c41b595d2 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('ffmpeg-cdist', 'e797834288eaf05a2f406524ae04aaa0f114cb08'), - ('libdcp', None)) + ('libdcp', 'v0.68')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() diff --git a/wscript b/wscript index c34f3919f..05ad44043 100644 --- a/wscript +++ b/wscript @@ -87,7 +87,7 @@ def configure(conf): # Dependencies which are dynamically linked everywhere except --static # Get libs only when we are dynamically linking - conf.check_cfg(package='libdcp', atleast_version='0.67', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.68', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) # Remove erroneous escaping of quotes from xmlsec1 defines conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.check_cfg(package='libcxml', atleast_version='0.01', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True) -- cgit v1.2.3 From 084d5155d410eef68f87635876e136b224db91dc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 23 Jul 2013 19:57:14 +0100 Subject: Bump libdcp version. --- cscript | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index c41b595d2..002b3011c 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('ffmpeg-cdist', 'e797834288eaf05a2f406524ae04aaa0f114cb08'), - ('libdcp', 'v0.68')) + ('libdcp', 'v0.69')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() diff --git a/wscript b/wscript index 05ad44043..09e70454e 100644 --- a/wscript +++ b/wscript @@ -87,7 +87,7 @@ def configure(conf): # Dependencies which are dynamically linked everywhere except --static # Get libs only when we are dynamically linking - conf.check_cfg(package='libdcp', atleast_version='0.68', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.69', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) # Remove erroneous escaping of quotes from xmlsec1 defines conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.check_cfg(package='libcxml', atleast_version='0.01', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True) -- cgit v1.2.3 From 04cd0a32435fd4a5f136b45cae1007c7eeafd0f3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 25 Jul 2013 16:21:44 +0100 Subject: Bump libdcp version. --- cscript | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 002b3011c..196579bca 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('ffmpeg-cdist', 'e797834288eaf05a2f406524ae04aaa0f114cb08'), - ('libdcp', 'v0.69')) + ('libdcp', 'v0.70')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() diff --git a/wscript b/wscript index 2c1dbaae7..edbc00b6a 100644 --- a/wscript +++ b/wscript @@ -86,7 +86,7 @@ def configure(conf): # Dependencies which are dynamically linked everywhere except --static # Get libs only when we are dynamically linking - conf.check_cfg(package='libdcp', atleast_version='0.69', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.70', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) # Remove erroneous escaping of quotes from xmlsec1 defines conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.check_cfg(package='libcxml', atleast_version='0.01', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True) -- cgit v1.2.3 From 84f96ae1f50c27823eae73cebc1992cf5590ee7d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 27 Jul 2013 18:31:26 +0100 Subject: New ffmpeg version. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 196579bca..6d7484ce4 100644 --- a/cscript +++ b/cscript @@ -6,7 +6,7 @@ def dependencies(target): if target.platform == 'windows': return () else: - return (('ffmpeg-cdist', 'e797834288eaf05a2f406524ae04aaa0f114cb08'), + return (('ffmpeg-cdist', '8f60a48995ae837c6e2f0f207b378e52f394e34a'), ('libdcp', 'v0.70')) def build(target): -- cgit v1.2.3 From 2289285f637c471d07923d7436ea55f3c9ee2a07 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 5 Aug 2013 16:02:17 +0100 Subject: Updated ffmpeg-cdist revision with submodule address fix. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 6d7484ce4..65531f0f1 100644 --- a/cscript +++ b/cscript @@ -6,7 +6,7 @@ def dependencies(target): if target.platform == 'windows': return () else: - return (('ffmpeg-cdist', '8f60a48995ae837c6e2f0f207b378e52f394e34a'), + return (('ffmpeg-cdist', '0d76267f36cbf01acd6a2a96ad2f7497a1843862'), ('libdcp', 'v0.70')) def build(target): -- cgit v1.2.3 From 567f3b7fc7f42fb81355994745b4ba5d1f7d59bc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 6 Aug 2013 00:21:26 +0100 Subject: libdcp version bump. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 6d7484ce4..d5fe846e7 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('ffmpeg-cdist', '8f60a48995ae837c6e2f0f207b378e52f394e34a'), - ('libdcp', 'v0.70')) + ('libdcp', '6b3a021409b55e0b5988a0bb993020f6c0e66276')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From e12d8d46c11cdec8e7d7f9d2a0a31a32a3606473 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 6 Aug 2013 11:44:49 +0100 Subject: Bump libdcp version. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 4d5b4bf1a..4004cbdc3 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('ffmpeg-cdist', '0d76267f36cbf01acd6a2a96ad2f7497a1843862'), - ('libdcp', '6b3a021409b55e0b5988a0bb993020f6c0e66276')) + ('libdcp', 'ee5e932cf0afa1ce24ea5eb0f298be8009cd9689')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From 5f64a83b76dd015cc03d106061bf890d3d80d788 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 17 Aug 2013 22:21:15 +0100 Subject: Try to actually use colour conversion; bump libdcp in cscript. --- cscript | 2 +- src/lib/dcp_video_frame.cc | 27 +++++++++++++++++++++++---- src/lib/dcp_video_frame.h | 3 ++- src/lib/encoder.cc | 4 ++-- src/lib/encoder.h | 2 +- src/lib/player.cc | 6 +++--- src/lib/player.h | 7 ++++--- src/lib/server.cc | 4 +++- src/lib/transcoder.cc | 6 +++--- src/wx/content_colour_conversion_dialog.cc | 2 +- src/wx/preset_colour_conversion_dialog.cc | 2 +- test/client_server_test.cc | 1 + 12 files changed, 45 insertions(+), 21 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 4004cbdc3..1f14f2f77 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('ffmpeg-cdist', '0d76267f36cbf01acd6a2a96ad2f7497a1843862'), - ('libdcp', 'ee5e932cf0afa1ce24ea5eb0f298be8009cd9689')) + ('libdcp', '7b8313c73082cc08b4dc42dc86d0c90a578993b1')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc index 1cb20b611..cde9f8a32 100644 --- a/src/lib/dcp_video_frame.cc +++ b/src/lib/dcp_video_frame.cc @@ -77,11 +77,12 @@ using libdcp::Size; * @param l Log to write to. */ DCPVideoFrame::DCPVideoFrame ( - shared_ptr image, int f, Eyes eyes, int dcp_fps, int bw, shared_ptr l + shared_ptr image, int f, Eyes eyes, ColourConversion c, int dcp_fps, int bw, shared_ptr l ) : _image (image) , _frame (f) , _eyes (eyes) + , _conversion (c) , _frames_per_second (dcp_fps) , _j2k_bandwidth (bw) , _log (l) @@ -95,11 +96,27 @@ DCPVideoFrame::DCPVideoFrame ( shared_ptr DCPVideoFrame::encode_locally () { + shared_ptr in_lut; + if (_conversion.input_gamma_linearised) { + in_lut = libdcp::SRGBLinearisedGammaLUT::cache.get (12, _conversion.input_gamma); + } else { + in_lut = libdcp::GammaLUT::cache.get (12, _conversion.input_gamma); + } + + /* XXX: libdcp should probably use boost */ + + double matrix[3][3]; + for (int i = 0; i < 3; ++i) { + for (int j = 0; j < 3; ++j) { + matrix[i][j] = _conversion.matrix (i, j); + } + } + shared_ptr xyz = libdcp::rgb_to_xyz ( _image, - libdcp::SRGBLinearisedGammaLUT::cache.get (12, 2.4), - libdcp::GammaLUT::cache.get (16, 1 / 2.6), - libdcp::colour_matrix::srgb_to_xyz + in_lut, + libdcp::GammaLUT::cache.get (16, 1 / _conversion.output_gamma), + matrix ); /* Set the max image and component sizes based on frame_rate */ @@ -224,6 +241,8 @@ DCPVideoFrame::encode_remotely (ServerDescription serv) socket->connect (*endpoint_iterator); + /* XXX: colour conversion! */ + stringstream s; s << "encode please\n" << "width " << _image->size().width << "\n" diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h index ce6444293..9e58b5879 100644 --- a/src/lib/dcp_video_frame.h +++ b/src/lib/dcp_video_frame.h @@ -102,7 +102,7 @@ public: class DCPVideoFrame : public boost::noncopyable { public: - DCPVideoFrame (boost::shared_ptr, int, Eyes, int, int, boost::shared_ptr); + DCPVideoFrame (boost::shared_ptr, int, Eyes, ColourConversion, int, int, boost::shared_ptr); boost::shared_ptr encode_locally (); boost::shared_ptr encode_remotely (ServerDescription); @@ -119,6 +119,7 @@ private: boost::shared_ptr _image; int _frame; ///< frame index within the DCP's intrinsic duration Eyes _eyes; + ColourConversion _conversion; int _frames_per_second; ///< Frames per second that we will use for the DCP int _j2k_bandwidth; ///< J2K bandwidth to use diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 29fe64e26..ea175f1f4 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -171,7 +171,7 @@ Encoder::frame_done () } void -Encoder::process_video (shared_ptr image, Eyes eyes, bool same) +Encoder::process_video (shared_ptr image, Eyes eyes, ColourConversion conversion, bool same) { boost::mutex::scoped_lock lock (_mutex); @@ -205,7 +205,7 @@ Encoder::process_video (shared_ptr image, Eyes eyes, bool same) TIMING ("adding to queue of %1", _queue.size ()); _queue.push_back (shared_ptr ( new DCPVideoFrame ( - image, _video_frames_out, eyes, _film->video_frame_rate(), + image, _video_frames_out, eyes, conversion, _film->video_frame_rate(), _film->j2k_bandwidth(), _film->log() ) )); diff --git a/src/lib/encoder.h b/src/lib/encoder.h index c0ea30fcb..44134e568 100644 --- a/src/lib/encoder.h +++ b/src/lib/encoder.h @@ -66,7 +66,7 @@ public: * @param i Video frame image. * @param same true if i is the same as the last time we were called. */ - void process_video (boost::shared_ptr i, Eyes eyes, bool same); + void process_video (boost::shared_ptr i, Eyes eyes, ColourConversion, bool same); /** Call with some audio data */ void process_audio (boost::shared_ptr); diff --git a/src/lib/player.cc b/src/lib/player.cc index af2e6216a..f8ccb0142 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -276,11 +276,11 @@ Player::process_video (weak_ptr weak_piece, shared_ptr image _last_video = piece->content; #endif - Video (work_image, eyes, same, time); + Video (work_image, eyes, content->colour_conversion(), same, time); time += TIME_HZ / _film->video_frame_rate(); if (frc.repeat) { - Video (work_image, eyes, true, time); + Video (work_image, eyes, content->colour_conversion(), true, time); time += TIME_HZ / _film->video_frame_rate(); } @@ -549,7 +549,7 @@ Player::emit_black () _last_video.reset (); #endif - Video (_black_frame, EYES_BOTH, _last_emit_was_black, _video_position); + Video (_black_frame, EYES_BOTH, ColourConversion(), _last_emit_was_black, _video_position); _video_position += _film->video_frames_to_time (1); _last_emit_was_black = true; } diff --git a/src/lib/player.h b/src/lib/player.h index 85d750f6f..2261f66ea 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -62,10 +62,11 @@ public: /** Emitted when a video frame is ready. * First parameter is the video image. * Second parameter is the eye(s) that should see this image. - * Third parameter is true if the image is the same as the last one that was emitted. - * Fourth parameter is the time. + * Third parameter is the colour conversion that should be used for this image. + * Fourth parameter is true if the image is the same as the last one that was emitted. + * Fifth parameter is the time. */ - boost::signals2::signal, Eyes, bool, Time)> Video; + boost::signals2::signal, Eyes, ColourConversion, bool, Time)> Video; /** Emitted when some audio data is ready */ boost::signals2::signal, Time)> Audio; diff --git a/src/lib/server.cc b/src/lib/server.cc index de265dca4..e4c281172 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -112,8 +112,10 @@ Server::process (shared_ptr socket) image->read_from_socket (socket); + /* XXX: colour conversion... */ + DCPVideoFrame dcp_video_frame ( - image, frame, eyes, frames_per_second, j2k_bandwidth, _log + image, frame, eyes, ColourConversion(), frames_per_second, j2k_bandwidth, _log ); shared_ptr encoded = dcp_video_frame.encode_locally (); diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc index 3002ef61c..715a158db 100644 --- a/src/lib/transcoder.cc +++ b/src/lib/transcoder.cc @@ -40,11 +40,11 @@ using boost::weak_ptr; using boost::dynamic_pointer_cast; static void -video_proxy (weak_ptr encoder, shared_ptr image, Eyes eyes, bool same) +video_proxy (weak_ptr encoder, shared_ptr image, Eyes eyes, ColourConversion conversion, bool same) { shared_ptr e = encoder.lock (); if (e) { - e->process_video (image, eyes, same); + e->process_video (image, eyes, conversion, same); } } @@ -67,7 +67,7 @@ Transcoder::Transcoder (shared_ptr f, shared_ptr j) , _player (f->make_player ()) , _encoder (new Encoder (f, j)) { - _player->Video.connect (bind (video_proxy, _encoder, _1, _2, _3)); + _player->Video.connect (bind (video_proxy, _encoder, _1, _2, _3, _4)); _player->Audio.connect (bind (audio_proxy, _encoder, _1)); } diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc index 8fca090ad..d8e768bcd 100644 --- a/src/wx/content_colour_conversion_dialog.cc +++ b/src/wx/content_colour_conversion_dialog.cc @@ -44,7 +44,7 @@ ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent) table->Add (_preset_choice); overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER); - overall_sizer->Add (new wxStaticLine (this, wxID_ANY)); + overall_sizer->Add (new wxStaticLine (this, wxID_ANY), 0, wxEXPAND); overall_sizer->Add (_editor); wxSizer* buttons = CreateSeparatedButtonSizer (wxOK); diff --git a/src/wx/preset_colour_conversion_dialog.cc b/src/wx/preset_colour_conversion_dialog.cc index 8c4a6dbcf..e7f8cf049 100644 --- a/src/wx/preset_colour_conversion_dialog.cc +++ b/src/wx/preset_colour_conversion_dialog.cc @@ -39,7 +39,7 @@ PresetColourConversionDialog::PresetColourConversionDialog (wxWindow* parent) table->Add (_name); overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER); - overall_sizer->Add (new wxStaticLine (this, wxID_ANY)); + overall_sizer->Add (new wxStaticLine (this, wxID_ANY), 0, wxEXPAND); overall_sizer->Add (_editor); wxSizer* buttons = CreateSeparatedButtonSizer (wxOK); diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 7faf47c41..8662f54e8 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -76,6 +76,7 @@ BOOST_AUTO_TEST_CASE (client_server_test) image, 0, EYES_BOTH, + ColourConversion (), 24, 200000000, log -- cgit v1.2.3 From b5c373aeeafc5b0f095847e044fe066afb149e21 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 17 Aug 2013 23:35:08 +0100 Subject: Bump ffmpeg. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 1f14f2f77..19b3ba658 100644 --- a/cscript +++ b/cscript @@ -6,7 +6,7 @@ def dependencies(target): if target.platform == 'windows': return () else: - return (('ffmpeg-cdist', '0d76267f36cbf01acd6a2a96ad2f7497a1843862'), + return (('ffmpeg-cdist', '61d7015f7c79f97e9af00bacedc856e195538a44'), ('libdcp', '7b8313c73082cc08b4dc42dc86d0c90a578993b1')) def build(target): -- cgit v1.2.3 From 5e57f97cd5dd5f6448963e4ed26bf6fe572b664d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 25 Aug 2013 17:51:21 +0100 Subject: Remove libdcp version spec for a while. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 19b3ba658..b10f3494a 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('ffmpeg-cdist', '61d7015f7c79f97e9af00bacedc856e195538a44'), - ('libdcp', '7b8313c73082cc08b4dc42dc86d0c90a578993b1')) + ('libdcp', None)) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From 3db0e8957f2ec96b85637e93a35b891b2e116a96 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 27 Aug 2013 15:50:35 +0100 Subject: Bump libdcp version. --- cscript | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index b10f3494a..da540aeb7 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('ffmpeg-cdist', '61d7015f7c79f97e9af00bacedc856e195538a44'), - ('libdcp', None)) + ('libdcp', 'v0.75')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() diff --git a/wscript b/wscript index edbc00b6a..76c8b62a4 100644 --- a/wscript +++ b/wscript @@ -86,7 +86,7 @@ def configure(conf): # Dependencies which are dynamically linked everywhere except --static # Get libs only when we are dynamically linking - conf.check_cfg(package='libdcp', atleast_version='0.70', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.75', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) # Remove erroneous escaping of quotes from xmlsec1 defines conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.check_cfg(package='libcxml', atleast_version='0.01', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True) -- cgit v1.2.3 From afee1b6e8a7fcc3b6ae1e176cc5751156d8ebb34 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 29 Aug 2013 23:05:16 +0100 Subject: Bump libdcp version. --- cscript | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index da540aeb7..1e42377bb 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('ffmpeg-cdist', '61d7015f7c79f97e9af00bacedc856e195538a44'), - ('libdcp', 'v0.75')) + ('libdcp', 'v0.78')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() diff --git a/wscript b/wscript index 915b41d24..b2aa634b9 100644 --- a/wscript +++ b/wscript @@ -86,7 +86,7 @@ def configure(conf): # Dependencies which are dynamically linked everywhere except --static # Get libs only when we are dynamically linking - conf.check_cfg(package='libdcp', atleast_version='0.75', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.78', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) # Remove erroneous escaping of quotes from xmlsec1 defines conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.check_cfg(package='libcxml', atleast_version='0.01', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True) -- cgit v1.2.3 From c1cde19b2388c23123c1be17fe54bad9ae3ff1cc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 4 Sep 2013 13:08:55 +0100 Subject: Bump libdcp version. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 1e42377bb..69ed4bbbb 100644 --- a/cscript +++ b/cscript @@ -7,7 +7,7 @@ def dependencies(target): return () else: return (('ffmpeg-cdist', '61d7015f7c79f97e9af00bacedc856e195538a44'), - ('libdcp', 'v0.78')) + ('libdcp', '08f4fe13bbff1a674930d55ab95fd181ebd0c265')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From f277984e5e452c20a14e2fed8cec3812a28b88af Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 4 Sep 2013 13:09:40 +0100 Subject: Build deps on Windows too. --- cscript | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 69ed4bbbb..405d0af0d 100644 --- a/cscript +++ b/cscript @@ -3,11 +3,8 @@ import shutil import os def dependencies(target): - if target.platform == 'windows': - return () - else: - return (('ffmpeg-cdist', '61d7015f7c79f97e9af00bacedc856e195538a44'), - ('libdcp', '08f4fe13bbff1a674930d55ab95fd181ebd0c265')) + return (('ffmpeg-cdist', '61d7015f7c79f97e9af00bacedc856e195538a44'), + ('libdcp', '08f4fe13bbff1a674930d55ab95fd181ebd0c265')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From e7a7599ba72ef7bcba7d383221d3b04cdc1572d8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 7 Sep 2013 20:36:12 +0100 Subject: Bump ffmpeg. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 405d0af0d..0150826b4 100644 --- a/cscript +++ b/cscript @@ -3,7 +3,7 @@ import shutil import os def dependencies(target): - return (('ffmpeg-cdist', '61d7015f7c79f97e9af00bacedc856e195538a44'), + return (('ffmpeg-cdist', '77e9115b172ec6e4f0da0a5525f32fb28bae5f09'), ('libdcp', '08f4fe13bbff1a674930d55ab95fd181ebd0c265')) def build(target): -- cgit v1.2.3 From fd2c34b91ede95fc0da2291cbd9664eca96e6a1b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 8 Sep 2013 22:35:23 +0100 Subject: Try to fix windows installers for updated cdist dependency building. --- cscript | 3 +- platform/windows/installer.nsi.32.in | 125 ++++++++++++++++++----------------- platform/windows/installer.nsi.64.in | 125 ++++++++++++++++++----------------- 3 files changed, 128 insertions(+), 125 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 0150826b4..50a9c39fc 100644 --- a/cscript +++ b/cscript @@ -24,7 +24,8 @@ 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) 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~%%static_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.windows_prefix, target.bits)) + target.command('sed -i "s~%%cdist_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.work_dir_cscript(), 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) diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in index f1fce61e1..e615f176d 100644 --- a/platform/windows/installer.nsi.32.in +++ b/platform/windows/installer.nsi.32.in @@ -27,66 +27,67 @@ Section "install" "Installation info" SetOutPath "$INSTDIR\bin" -File "%deps%/bin/asdcp-libdcp.dll" -File "%deps%/bin/avcodec-55.dll" -File "%deps%/bin/avfilter-3.dll" -File "%deps%/bin/avformat-55.dll" -File "%deps%/bin/avutil-52.dll" -File "%deps%/bin/avdevice-55.dll" -File "%deps%/bin/dcp.dll" -File "%deps%/bin/libintl-8.dll" -File "%deps%/bin/kumu-libdcp.dll" -File "%deps%/bin/libboost_chrono-mt.dll" -File "%deps%/bin/libboost_filesystem-mt.dll" -File "%deps%/bin/libboost_system-mt.dll" -File "%deps%/bin/libboost_thread_win32-mt.dll" -File "%deps%/bin/libboost_date_time-mt.dll" -File "%deps%/bin/libeay32.dll" -File "%deps%/bin/libgcc_s_sjlj-1.dll" -File "%deps%/bin/libgio-2.0-0.dll" -File "%deps%/bin/libglib-2.0-0.dll" -File "%deps%/bin/libgobject-2.0-0.dll" -File "%deps%/bin/libiconv-2.dll" -File "%deps%/bin/libjpeg-8.dll" -File "%deps%/bin/libMagick++-6.Q16-2.dll" -File "%deps%/bin/libMagickCore-6.Q16-1.dll" -File "%deps%/bin/libMagickWand-6.Q16-1.dll" -File "%deps%/bin/libopenjpeg-1.dll" -File "%deps%/bin/libpng15-15.dll" -File "%deps%/bin/libsigc-2.0-0.dll" -File "%deps%/bin/libsndfile-1.dll" -File "%deps%/bin/libssh.dll" -File "%deps%/bin/libstdc++-6.dll" -File "%deps%/bin/postproc-52.dll" -File "%deps%/bin/swresample-0.dll" -File "%deps%/bin/swscale-2.dll" -File "%deps%/bin/zlib1.dll" -File "%deps%/bin/libjpeg-8.dll" -File "%deps%/bin/wxbase294u_gcc_custom.dll" -File "%deps%/bin/wxmsw294u_core_gcc_custom.dll" -File "%deps%/bin/wxmsw294u_adv_gcc_custom.dll" -File "%deps%/bin/libcairo-2.dll" -File "%deps%/bin/libfreetype-6.dll" -File "%deps%/bin/libgthread-2.0-0.dll" -File "%deps%/bin/libpango-1.0-0.dll" -File "%deps%/bin/libgmodule-2.0-0.dll" -File "%deps%/bin/libpangocairo-1.0-0.dll" -File "%deps%/bin/libpangowin32-1.0-0.dll" -File "%deps%/bin/libtiff-5.dll" -File "%deps%/bin/libglibmm-2.4-1.dll" -File "%deps%/bin/libxml++-2.6-2.dll" -File "%deps%/bin/libxml2-2.dll" -File "%deps%/bin/libpixman-1-0.dll" -File "%deps%/bin/libfontconfig-1.dll" -File "%deps%/bin/libexpat-1.dll" -File "%deps%/bin/libbz2.dll" -File "%deps%/bin/cxml.dll" -File "%deps%/bin/libxmlsec1.dll" -File "%deps%/bin/libxmlsec1-openssl.dll" -File "%deps%/bin/libexslt-0.dll" -File "%deps%/bin/libxslt-1.dll" -File "%deps%/bin/libffi-6.dll" -File "%deps%/bin/ffprobe.exe" +File "%static_deps%/bin/libintl-8.dll" +File "%static_deps%/bin/kumu-libdcp.dll" +File "%static_deps%/bin/libboost_chrono-mt.dll" +File "%static_deps%/bin/libboost_filesystem-mt.dll" +File "%static_deps%/bin/libboost_system-mt.dll" +File "%static_deps%/bin/libboost_thread_win32-mt.dll" +File "%static_deps%/bin/libboost_date_time-mt.dll" +File "%static_deps%/bin/libeay32.dll" +File "%static_deps%/bin/libgcc_s_sjlj-1.dll" +File "%static_deps%/bin/libgio-2.0-0.dll" +File "%static_deps%/bin/libglib-2.0-0.dll" +File "%static_deps%/bin/libgobject-2.0-0.dll" +File "%static_deps%/bin/libiconv-2.dll" +File "%static_deps%/bin/libjpeg-8.dll" +File "%static_deps%/bin/libMagick++-6.Q16-2.dll" +File "%static_deps%/bin/libMagickCore-6.Q16-1.dll" +File "%static_deps%/bin/libMagickWand-6.Q16-1.dll" +File "%static_deps%/bin/libpng15-15.dll" +File "%static_deps%/bin/libsigc-2.0-0.dll" +File "%static_deps%/bin/libsndfile-1.dll" +File "%static_deps%/bin/libssh.dll" +File "%static_deps%/bin/libstdc++-6.dll" +File "%static_deps%/bin/zlib1.dll" +File "%static_deps%/bin/libjpeg-8.dll" +File "%static_deps%/bin/wxbase294u_gcc_custom.dll" +File "%static_deps%/bin/wxmsw294u_core_gcc_custom.dll" +File "%static_deps%/bin/wxmsw294u_adv_gcc_custom.dll" +File "%static_deps%/bin/libcairo-2.dll" +File "%static_deps%/bin/libfreetype-6.dll" +File "%static_deps%/bin/libgthread-2.0-0.dll" +File "%static_deps%/bin/libpango-1.0-0.dll" +File "%static_deps%/bin/libgmodule-2.0-0.dll" +File "%static_deps%/bin/libpangocairo-1.0-0.dll" +File "%static_deps%/bin/libpangowin32-1.0-0.dll" +File "%static_deps%/bin/libtiff-5.dll" +File "%static_deps%/bin/libglibmm-2.4-1.dll" +File "%static_deps%/bin/libxml++-2.6-2.dll" +File "%static_deps%/bin/libxml2-2.dll" +File "%static_deps%/bin/libpixman-1-0.dll" +File "%static_deps%/bin/libfontconfig-1.dll" +File "%static_deps%/bin/libexpat-1.dll" +File "%static_deps%/bin/libbz2.dll" +File "%static_deps%/bin/libxmlsec1.dll" +File "%static_deps%/bin/libxmlsec1-openssl.dll" +File "%static_deps%/bin/libexslt-0.dll" +File "%static_deps%/bin/libxslt-1.dll" +File "%static_deps%/bin/libffi-6.dll" + +File "%cdist_deps%/bin/asdcp-libdcp.dll" +File "%cdist_deps%/bin/avcodec-55.dll" +File "%cdist_deps%/bin/avfilter-3.dll" +File "%cdist_deps%/bin/avformat-55.dll" +File "%cdist_deps%/bin/avutil-52.dll" +File "%cdist_deps%/bin/avdevice-55.dll" +File "%cdist_deps%/bin/dcp.dll" +File "%cdist_deps%/bin/libopenjpeg-1.dll" +File "%cdist_deps%/bin/postproc-52.dll" +File "%cdist_deps%/bin/swresample-0.dll" +File "%cdist_deps%/bin/swscale-2.dll" +File "%cdist_deps%/bin/cxml.dll" +File "%cdist_deps%/bin/ffprobe.exe" File "%binaries%/src/wx/dcpomatic-wx.dll" File "%binaries%/src/lib/dcpomatic.dll" @@ -99,9 +100,9 @@ File "%binaries%/src/tools/dcpomatic_server.exe" # I don't know why, but sometimes it seems that # delegates.xml must be in with the binaries, and # sometimes in the $PROFILE. Meh. -File "%deps%/etc/ImageMagick-6/delegates.xml" +File "%static_deps%/etc/ImageMagick-6/delegates.xml" SetOutPath "$PROFILE\.magick" -File "%deps%/etc/ImageMagick-6/delegates.xml" +File "%static_deps%/etc/ImageMagick-6/delegates.xml" SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES" File "%binaries%/src/lib/mo/fr_FR/libdcpomatic.mo" diff --git a/platform/windows/installer.nsi.64.in b/platform/windows/installer.nsi.64.in index 43230d68d..f86c296f3 100644 --- a/platform/windows/installer.nsi.64.in +++ b/platform/windows/installer.nsi.64.in @@ -37,66 +37,67 @@ ${EndIf} SetOutPath "$INSTDIR\bin" -File "%deps%/bin/asdcp-libdcp.dll" -File "%deps%/bin/avcodec-55.dll" -File "%deps%/bin/avfilter-3.dll" -File "%deps%/bin/avformat-55.dll" -File "%deps%/bin/avutil-52.dll" -File "%deps%/bin/avdevice-55.dll" -File "%deps%/bin/dcp.dll" -File "%deps%/bin/libintl-8.dll" -File "%deps%/bin/kumu-libdcp.dll" -File "%deps%/bin/libboost_chrono-mt.dll" -File "%deps%/bin/libboost_filesystem-mt.dll" -File "%deps%/bin/libboost_system-mt.dll" -File "%deps%/bin/libboost_thread_win32-mt.dll" -File "%deps%/bin/libboost_date_time-mt.dll" -File "%deps%/bin/libeay32.dll" -File "%deps%/bin/libgcc_s_sjlj-1.dll" -File "%deps%/bin/libgio-2.0-0.dll" -File "%deps%/bin/libglib-2.0-0.dll" -File "%deps%/bin/libgobject-2.0-0.dll" -File "%deps%/bin/libiconv-2.dll" -File "%deps%/bin/libjpeg-8.dll" -File "%deps%/bin/libMagick++-6.Q16-2.dll" -File "%deps%/bin/libMagickCore-6.Q16-1.dll" -File "%deps%/bin/libMagickWand-6.Q16-1.dll" -File "%deps%/bin/libopenjpeg-1.dll" -File "%deps%/bin/libpng15-15.dll" -File "%deps%/bin/libsigc-2.0-0.dll" -File "%deps%/bin/libsndfile-1.dll" -File "%deps%/bin/libssh.dll" -File "%deps%/bin/libstdc++-6.dll" -File "%deps%/bin/postproc-52.dll" -File "%deps%/bin/swresample-0.dll" -File "%deps%/bin/swscale-2.dll" -File "%deps%/bin/zlib1.dll" -File "%deps%/bin/libjpeg-8.dll" -File "%deps%/bin/wxbase294u_gcc_custom.dll" -File "%deps%/bin/wxmsw294u_core_gcc_custom.dll" -File "%deps%/bin/wxmsw294u_adv_gcc_custom.dll" -File "%deps%/bin/libcairo-2.dll" -File "%deps%/bin/libfreetype-6.dll" -File "%deps%/bin/libgthread-2.0-0.dll" -File "%deps%/bin/libpango-1.0-0.dll" -File "%deps%/bin/libgmodule-2.0-0.dll" -File "%deps%/bin/libpangocairo-1.0-0.dll" -File "%deps%/bin/libpangowin32-1.0-0.dll" -File "%deps%/bin/libtiff-5.dll" -File "%deps%/bin/libglibmm-2.4-1.dll" -File "%deps%/bin/libxml++-2.6-2.dll" -File "%deps%/bin/libxml2-2.dll" -File "%deps%/bin/libpixman-1-0.dll" -File "%deps%/bin/libfontconfig-1.dll" -File "%deps%/bin/libexpat-1.dll" -File "%deps%/bin/libbz2.dll" -File "%deps%/bin/cxml.dll" -File "%deps%/bin/libxmlsec1.dll" -File "%deps%/bin/libxmlsec1-openssl.dll" -File "%deps%/bin/libexslt-0.dll" -File "%deps%/bin/libxslt-1.dll" -File "%deps%/bin/libffi-6.dll" -File "%deps%/bin/ffprobe.exe" +File "%static_deps%/bin/libintl-8.dll" +File "%static_deps%/bin/kumu-libdcp.dll" +File "%static_deps%/bin/libboost_chrono-mt.dll" +File "%static_deps%/bin/libboost_filesystem-mt.dll" +File "%static_deps%/bin/libboost_system-mt.dll" +File "%static_deps%/bin/libboost_thread_win32-mt.dll" +File "%static_deps%/bin/libboost_date_time-mt.dll" +File "%static_deps%/bin/libeay32.dll" +File "%static_deps%/bin/libgcc_s_sjlj-1.dll" +File "%static_deps%/bin/libgio-2.0-0.dll" +File "%static_deps%/bin/libglib-2.0-0.dll" +File "%static_deps%/bin/libgobject-2.0-0.dll" +File "%static_deps%/bin/libiconv-2.dll" +File "%static_deps%/bin/libjpeg-8.dll" +File "%static_deps%/bin/libMagick++-6.Q16-2.dll" +File "%static_deps%/bin/libMagickCore-6.Q16-1.dll" +File "%static_deps%/bin/libMagickWand-6.Q16-1.dll" +File "%static_deps%/bin/libpng15-15.dll" +File "%static_deps%/bin/libsigc-2.0-0.dll" +File "%static_deps%/bin/libsndfile-1.dll" +File "%static_deps%/bin/libssh.dll" +File "%static_deps%/bin/libstdc++-6.dll" +File "%static_deps%/bin/zlib1.dll" +File "%static_deps%/bin/libjpeg-8.dll" +File "%static_deps%/bin/wxbase294u_gcc_custom.dll" +File "%static_deps%/bin/wxmsw294u_core_gcc_custom.dll" +File "%static_deps%/bin/wxmsw294u_adv_gcc_custom.dll" +File "%static_deps%/bin/libcairo-2.dll" +File "%static_deps%/bin/libfreetype-6.dll" +File "%static_deps%/bin/libgthread-2.0-0.dll" +File "%static_deps%/bin/libpango-1.0-0.dll" +File "%static_deps%/bin/libgmodule-2.0-0.dll" +File "%static_deps%/bin/libpangocairo-1.0-0.dll" +File "%static_deps%/bin/libpangowin32-1.0-0.dll" +File "%static_deps%/bin/libtiff-5.dll" +File "%static_deps%/bin/libglibmm-2.4-1.dll" +File "%static_deps%/bin/libxml++-2.6-2.dll" +File "%static_deps%/bin/libxml2-2.dll" +File "%static_deps%/bin/libpixman-1-0.dll" +File "%static_deps%/bin/libfontconfig-1.dll" +File "%static_deps%/bin/libexpat-1.dll" +File "%static_deps%/bin/libbz2.dll" +File "%static_deps%/bin/libxmlsec1.dll" +File "%static_deps%/bin/libxmlsec1-openssl.dll" +File "%static_deps%/bin/libexslt-0.dll" +File "%static_deps%/bin/libxslt-1.dll" +File "%static_deps%/bin/libffi-6.dll" + +File "%cdist_deps%/bin/asdcp-libdcp.dll" +File "%cdist_deps%/bin/avcodec-55.dll" +File "%cdist_deps%/bin/avfilter-3.dll" +File "%cdist_deps%/bin/avformat-55.dll" +File "%cdist_deps%/bin/avutil-52.dll" +File "%cdist_deps%/bin/avdevice-55.dll" +File "%cdist_deps%/bin/dcp.dll" +File "%cdist_deps%/bin/libopenjpeg-1.dll" +File "%cdist_deps%/bin/postproc-52.dll" +File "%cdist_deps%/bin/swresample-0.dll" +File "%cdist_deps%/bin/swscale-2.dll" +File "%cdist_deps%/bin/cxml.dll" +File "%cdist_deps%/bin/ffprobe.exe" File "%binaries%/src/wx/dcpomatic-wx.dll" File "%binaries%/src/lib/dcpomatic.dll" @@ -109,9 +110,9 @@ File "%binaries%/src/tools/dcpomatic_server.exe" # I don't know why, but sometimes it seems that # delegates.xml must be in with the binaries, and # sometimes in the $PROFILE. Meh. -File "%deps%/etc/ImageMagick-6/delegates.xml" +File "%static_deps%/etc/ImageMagick-6/delegates.xml" SetOutPath "$PROFILE\.magick" -File "%deps%/etc/ImageMagick-6/delegates.xml" +File "%static_deps%/etc/ImageMagick-6/delegates.xml" SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES" File "%binaries%/src/lib/mo/fr_FR/libdcpomatic.mo" -- cgit v1.2.3