From b70f85bce27480c6c616a46807b3da9d2732d851 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 7 Feb 2014 15:59:44 +0000 Subject: Add basic stuff to build RPMs for Centos. Suggested-by: Manuel Weber --- cscript | 110 ++++++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 73 insertions(+), 37 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 4103f9366..9595cb162 100644 --- a/cscript +++ b/cscript @@ -137,52 +137,88 @@ def build(target, options): if target.platform == 'windows': cmd += ' --target-windows' elif target.platform == 'linux': - cmd += ' --static' - target.command(cmd) + if target.distro == 'debian' or target.distro == 'ubuntu': + cmd += ' --target-debian' + elif target.distro == 'centos': + cmd += ' --target-centos' + target.command(cmd) target.command('./waf') if target.platform == 'linux' or target.platform == 'osx': target.command('./waf install') +def package_windows(target): + 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~%%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) + return os.path.abspath(glob.glob('build/platform/windows/*%s*.exe' % target.bits)[0]) + +def package_debian(target, cpu): + make_control(target.version, target.bits, 'debian/control') + target.command('./waf dist') + f = open('debian/files', 'w') + 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('../../dcpomatic-%s.tar.bz2' % version, 'dcpomatic_%s.orig.tar.bz2' % version) + target.command('tar xjf dcpomatic_%s.orig.tar.bz2' % version) + os.chdir('dcpomatic-%s' % version) + 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'): + debs.append(os.path.abspath(p)) + + return debs + +def package_centos(target, cpu, version): + os.makedirs('%s/rpmbuild/BUILD' % target.work_dir_cdist()) + os.makedirs('%s/rpmbuild/RPMS' % target.work_dir_cdist()) + os.makedirs('%s/rpmbuild/SOURCES' % target.work_dir_cdist()) + os.makedirs('%s/rpmbuild/SPECS' % target.work_dir_cdist()) + os.makedirs('%s/rpmbuild/SRPMS' % target.work_dir_cdist()) + + f = open('%s/.rpmmacros' % target.dir_in_chroot, 'w') + print >>f,"%%_topdir %srpmbuild" % target.dir_in_chroot + f.close() + + target.command('./waf dist') + shutil.copyfile( + "%s/src/dcpomatic/dcpomatic-%s.tar.bz2" % (target.work_dir_cdist(), version), + "%s/rpmbuild/SOURCES/dcpomatic-%s.tar.bz2" % (target.work_dir_cdist(), version) + ) + + target.command('rpmbuild -bb build/platform/linux/dcpomatic.spec') + rpms = [] + for p in glob.glob('%s/rpmbuild/RPMS/x86_64/*.rpm' % target.work_dir_cdist()): + rpms.append(os.path.abspath(p)) + + return rpms + def package(target, version): + if target.bits == 32: + cpu = 'i386' + else: + cpu = 'amd64' + 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~%%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) - return os.path.abspath(glob.glob('build/platform/windows/*%s*.exe' % target.bits)[0]) + return package_windows(target) elif target.platform == 'linux': - if target.bits == 32: - cpu = 'i386' - else: - cpu = 'amd64' - - make_control(target.version, target.bits, 'debian/control', target.debug) - target.command('./waf dist') - f = open('debian/files', 'w') - 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('../../dcpomatic-%s.tar.bz2' % version, 'dcpomatic_%s.orig.tar.bz2' % version) - target.command('tar xjf dcpomatic_%s.orig.tar.bz2' % version) - os.chdir('dcpomatic-%s' % version) - 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'): - debs.append(os.path.abspath(p)) - - return debs + if target.distro == 'debian' or target.distro == 'ubuntu': + return package_debian(target, cpu) + elif target.distro == 'centos': + return package_centos(target, cpu, version) elif target.platform == 'osx': target.command('bash platform/osx/make_dmg.sh %s' % target.work_dir_cscript()) return os.path.abspath(glob.glob('build/platform/osx/DCP-o-matic*.dmg')[0]) -- cgit v1.2.3 From 0e457d48ac7dad571fdbe85c159b86bfc01cce21 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 8 Feb 2014 13:32:11 +0000 Subject: Bump libdcp to get some fixes for Interop XML Reported-by: Ivan Pullman --- ChangeLog | 4 ++++ cscript | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'cscript') diff --git a/ChangeLog b/ChangeLog index d04c76fb4..5a842a4f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-02-08 Carl Hetherington + + * Bump libdcp version to get some fixes for Interop XML. + 2014-02-07 Carl Hetherington * Add basic stuff to build RPMs for Centos. diff --git a/cscript b/cscript index 9595cb162..9177ce12c 100644 --- a/cscript +++ b/cscript @@ -130,7 +130,7 @@ def make_control(version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', '5ac3a6af077c10f07c31954c372a8f29e4e18e2a'), - ('libdcp', '054cc86')) + ('libdcp', '71de90f')) def build(target, options): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From df45c5e6d63ad0927844839056735ce5a8db3c92 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 8 Feb 2014 16:37:30 +0000 Subject: Bump libdcp to fix windows build. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 9177ce12c..405780ae1 100644 --- a/cscript +++ b/cscript @@ -130,7 +130,7 @@ def make_control(version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', '5ac3a6af077c10f07c31954c372a8f29e4e18e2a'), - ('libdcp', '71de90f')) + ('libdcp', '8e663fa')) def build(target, options): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From 005157c20f3b3894337c82e82a1f8b9fa1dc77b9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 8 Feb 2014 18:47:07 +0000 Subject: Bump libdcp for daft typo. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 405780ae1..e2975ce50 100644 --- a/cscript +++ b/cscript @@ -130,7 +130,7 @@ def make_control(version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', '5ac3a6af077c10f07c31954c372a8f29e4e18e2a'), - ('libdcp', '8e663fa')) + ('libdcp', 'a7dac85')) def build(target, options): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From 0eeec5d8988073bd22bb964d76b6b3196c74b5bb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 8 Feb 2014 20:51:46 +0000 Subject: Fix OS X build. --- cscript | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index e2975ce50..49b2720af 100644 --- a/cscript +++ b/cscript @@ -207,14 +207,14 @@ def package_centos(target, cpu, version): return rpms def package(target, version): - if target.bits == 32: - cpu = 'i386' - else: - cpu = 'amd64' - if target.platform == 'windows': return package_windows(target) elif target.platform == 'linux': + if target.bits == 32: + cpu = 'i386' + else: + cpu = 'amd64' + if target.distro == 'debian' or target.distro == 'ubuntu': return package_debian(target, cpu) elif target.distro == 'centos': -- cgit v1.2.3 From d6f65dc0146215aea4c9021264ec641a620482fb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 8 Feb 2014 21:15:40 +0000 Subject: Linux build fix. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 49b2720af..73bddcd9f 100644 --- a/cscript +++ b/cscript @@ -159,7 +159,7 @@ def package_windows(target): return os.path.abspath(glob.glob('build/platform/windows/*%s*.exe' % target.bits)[0]) def package_debian(target, cpu): - make_control(target.version, target.bits, 'debian/control') + make_control(target.version, target.bits, 'debian/control', target.debug) target.command('./waf dist') f = open('debian/files', 'w') print >>f,'dcpomatic_%s-1_%s.deb video extra' % (version, cpu) -- cgit v1.2.3 From 34d72cafae36a0e886c7ff103325345cf2d76aac Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 8 Feb 2014 21:41:24 +0000 Subject: Linux build fix. --- cscript | 164 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 82 insertions(+), 82 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 73bddcd9f..569b8a3da 100644 --- a/cscript +++ b/cscript @@ -2,88 +2,88 @@ import glob import shutil import os -build_depends = {'debhelper': '8.0.0', - 'python': '2.7.3', - 'g++': '4:4.6.3', - 'pkg-config': '0.26', - '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', - 'libgtk2.0-dev': '2.24.10'} - -depends = dict() - -depends['12.04'] = {'libc6': '2.15', - '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', - 'libgtk2.0-0': '2.24.10', - 'libxmlsec1': '1.2.14-1.2build1', - 'libxmlsec1-openssl': '1.2.14-1.2build1', - 'libboost-date-time1.46.1': '1.46.1', - 'libcurl3': '7.22.0-3ubuntu4', - 'libzip2': '0.10-1ubuntu1'} - -depends['12.10'] = {'libc6': '2.15', - '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', - 'libgtk2.0-0': '2.24.13', - 'libxmlsec1': '1.2.18-2', - 'libxmlsec1-openssl': '1.2.18-2', - 'libboost-date-time1.49.0': '1.49.0', - 'libcurl3': '7.27.0-1ubuntu1', - 'libzip2': '0.10.1-1.1'} - -depends['13.04'] = {'libc6': '2.15', - 'libssh-4': '0.5.2', +deb_build_depends = {'debhelper': '8.0.0', + 'python': '2.7.3', + 'g++': '4:4.6.3', + 'pkg-config': '0.26', + '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', + 'libgtk2.0-dev': '2.24.10'} + +deb_depends = dict() + +deb_depends['12.04'] = {'libc6': '2.15', + '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', + 'libgtk2.0-0': '2.24.10', + 'libxmlsec1': '1.2.14-1.2build1', + 'libxmlsec1-openssl': '1.2.14-1.2build1', + 'libboost-date-time1.46.1': '1.46.1', + 'libcurl3': '7.22.0-3ubuntu4', + 'libzip2': '0.10-1ubuntu1'} + +deb_depends['12.10'] = {'libc6': '2.15', + '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', + 'libgtk2.0-0': '2.24.13', + 'libxmlsec1': '1.2.18-2', + 'libxmlsec1-openssl': '1.2.18-2', + 'libboost-date-time1.49.0': '1.49.0', + 'libcurl3': '7.27.0-1ubuntu1', + 'libzip2': '0.10.1-1.1'} + +deb_depends['13.04'] = {'libc6': '2.15', + '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', + 'libgtk2.0-0': '2.24.13', + 'libxmlsec1': '1.2.18-2', + 'libxmlsec1-openssl': '1.2.18-2', + 'libboost-date-time1.49.0': '1.49.0', + 'libcurl3': '7.29.0-1ubuntu3', + 'libzip2': '0.10.1-1.1'} + +deb_depends['13.10'] = {'libc6': '2.17-93', + 'libssh-4': '0.5.4', + 'libboost-filesystem1.53.0': '1.53.0', + 'libboost-thread1.53.0': '1.53.0', + 'libsndfile1': '1.0.25', + 'libmagick++5': '8:6.7.7.10', + 'libxml++2.6-2': '2.36.0', + 'libgtk2.0-0': '2.24.20', + 'libxmlsec1': '1.2.18-2', + 'libxmlsec1-openssl': '1.2.18-2', + 'libboost-date-time1.49.0': '1.49.0', + 'libcurl3': '7.29.0-1ubuntu3', + 'libzip2': '0.10.1-1.1'} + +deb_depends['7'] = {'libc6': '2.13', + 'libssh-4': '0.5.4', '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', - 'libgtk2.0-0': '2.24.13', - 'libxmlsec1': '1.2.18-2', - 'libxmlsec1-openssl': '1.2.18-2', - 'libboost-date-time1.49.0': '1.49.0', - 'libcurl3': '7.29.0-1ubuntu3', - 'libzip2': '0.10.1-1.1'} - -depends['13.10'] = {'libc6': '2.17-93', - 'libssh-4': '0.5.4', - 'libboost-filesystem1.53.0': '1.53.0', - 'libboost-thread1.53.0': '1.53.0', - 'libsndfile1': '1.0.25', - 'libmagick++5': '8:6.7.7.10', - 'libxml++2.6-2': '2.36.0', - 'libgtk2.0-0': '2.24.20', - 'libxmlsec1': '1.2.18-2', - 'libxmlsec1-openssl': '1.2.18-2', + 'libgtk2.0-0': '2.24.10', + 'libxmlsec1': '1.2.18', 'libboost-date-time1.49.0': '1.49.0', - 'libcurl3': '7.29.0-1ubuntu3', - 'libzip2': '0.10.1-1.1'} - -depends['7'] = {'libc6': '2.13', - 'libssh-4': '0.5.4', - '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', - 'libgtk2.0-0': '2.24.10', - 'libxmlsec1': '1.2.18', - 'libboost-date-time1.49.0': '1.49.0', - 'libxmlsec1-openssl': '1.2.18', - 'libcurl3': '7.26.0', - 'libzip2': '0.10.1'} + 'libxmlsec1-openssl': '1.2.18', + 'libcurl3': '7.26.0', + 'libzip2': '0.10.1'} def packages(name, packages, f): s = '%s: ' % name @@ -91,13 +91,13 @@ def packages(name, packages, f): s += str(p) + ', ' print >>f,s[:-2] -def make_control(version, bits, filename, debug): +def make_control(debian_version, bits, filename, debug): f = open(filename, 'w') print >>f,'Source: dcpomatic' print >>f,'Section: video' print >>f,'Priority: extra' print >>f,'Maintainer: Carl Hetherington ' - packages('Build-Depends', build_depends, f) + packages('Build-Depends', deb_build_depends, f) print >>f,'Standards-Version: 3.9.3' print >>f,'Homepage: http://dcpomatic.com/' print >>f,'' @@ -107,7 +107,7 @@ def make_control(version, bits, filename, debug): else: print >>f,'Architecture: amd64' - packages('Depends', depends[version], f) + packages('Depends', deb_depends[debian_version], f) print >>f,'Description: Generator of Digital Cinema Packages (DCPs)' print >>f,' DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio' @@ -123,7 +123,7 @@ def make_control(version, bits, filename, debug): print >>f,'Architecture: amd64' print >>f,'Section: debug' print >>f,'Priority: extra' - packages('Depends', depends[version], f) + packages('Depends', deb_depends[debian_version], f) print >>f,'Description: debugging symbols for dcpomatic' print >>f,' This package contains the debugging symbols for dcpomatic.' print >>f,'' @@ -158,7 +158,7 @@ def package_windows(target): 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]) -def package_debian(target, cpu): +def package_debian(target, cpu, version): make_control(target.version, target.bits, 'debian/control', target.debug) target.command('./waf dist') f = open('debian/files', 'w') @@ -216,7 +216,7 @@ def package(target, version): cpu = 'amd64' if target.distro == 'debian' or target.distro == 'ubuntu': - return package_debian(target, cpu) + return package_debian(target, cpu, version) elif target.distro == 'centos': return package_centos(target, cpu, version) elif target.platform == 'osx': -- cgit v1.2.3 From e3e01d8c9772b34bf35191197d77e31bee5c9882 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 9 Feb 2014 23:33:45 +0000 Subject: Try to fix centos 32-bit build; bump libdcp for better OOM-handling in openjpeg. --- cscript | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 569b8a3da..e6738250c 100644 --- a/cscript +++ b/cscript @@ -130,7 +130,7 @@ def make_control(debian_version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', '5ac3a6af077c10f07c31954c372a8f29e4e18e2a'), - ('libdcp', 'a7dac85')) + ('libdcp', 'a6bc997')) def build(target, options): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() @@ -201,7 +201,11 @@ def package_centos(target, cpu, version): target.command('rpmbuild -bb build/platform/linux/dcpomatic.spec') rpms = [] - for p in glob.glob('%s/rpmbuild/RPMS/x86_64/*.rpm' % target.work_dir_cdist()): + + if cpu == "amd64": + cpu = "x86_64" + + for p in glob.glob('%s/rpmbuild/RPMS/%s/*.rpm' % (target.work_dir_cdist(), cpu)): rpms.append(os.path.abspath(p)) return rpms -- cgit v1.2.3 From 27a1a32dc77ff55da61f064ec469b7fbda47f037 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 10 Feb 2014 10:30:29 +0000 Subject: Bump libdcp for windows build fixes to openjpeg. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index e6738250c..c1af7f68c 100644 --- a/cscript +++ b/cscript @@ -130,7 +130,7 @@ def make_control(debian_version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', '5ac3a6af077c10f07c31954c372a8f29e4e18e2a'), - ('libdcp', 'a6bc997')) + ('libdcp', '728e0b6')) def build(target, options): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From 6356ea4be14cfc0867afed9e86be90f6fd3a9286 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 10 Feb 2014 12:25:45 +0000 Subject: Bump libdcp for an openjpeg build fix. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index c1af7f68c..1e566f0e9 100644 --- a/cscript +++ b/cscript @@ -130,7 +130,7 @@ def make_control(debian_version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', '5ac3a6af077c10f07c31954c372a8f29e4e18e2a'), - ('libdcp', '728e0b6')) + ('libdcp', '606ff25')) def build(target, options): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From 0deea9a1b6096dc52d33a8879cc71c2bea9d22ee Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 10 Feb 2014 16:41:26 +0000 Subject: Bump libdcp to fix linux build. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 1e566f0e9..13e5599ae 100644 --- a/cscript +++ b/cscript @@ -130,7 +130,7 @@ def make_control(debian_version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', '5ac3a6af077c10f07c31954c372a8f29e4e18e2a'), - ('libdcp', '606ff25')) + ('libdcp', 'f221b1c')) def build(target, options): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3 From 6deab916855c1cab079817bf4ecc6824a067bb4d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 10 Feb 2014 19:08:06 +0000 Subject: Fix linux build. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 13e5599ae..ef9294f9a 100644 --- a/cscript +++ b/cscript @@ -130,7 +130,7 @@ def make_control(debian_version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', '5ac3a6af077c10f07c31954c372a8f29e4e18e2a'), - ('libdcp', 'f221b1c')) + ('libdcp', 'f74c462')) def build(target, options): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() -- cgit v1.2.3