projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix server icons on OS X.
[dcpomatic.git]
/
cscript
diff --git
a/cscript
b/cscript
index 5ed7e76c04666026e8933bc4351674fd412dff6f..1e18684d9e0d94d434ae556a6a72ec3945469de9 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-44,7
+44,9
@@
deb_depends['12.04'] = {'libc6': '2.15',
'libxmlsec1-openssl': '1.2.14-1.2build1',
'libboost-date-time1.48.0': '1.48.0-3',
'libcurl3': '7.22.0-3ubuntu4',
'libxmlsec1-openssl': '1.2.14-1.2build1',
'libboost-date-time1.48.0': '1.48.0-3',
'libcurl3': '7.22.0-3ubuntu4',
- 'libzip2': '0.10-1ubuntu1'}
+ 'libzip2': '0.10-1ubuntu1',
+ 'libsamplerate0': '0.1.8-4',
+ 'libicu48': '4.8.1.1-3'}
deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
'libssh-4': '0.6.1-0ubuntu3',
deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
'libssh-4': '0.6.1-0ubuntu3',
@@
-60,7
+62,8
@@
deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
'libboost-date-time1.54.0': '1.54.0-4ubuntu3',
'libcurl3': '7.35.0-1ubuntu2',
'libzip2': '0.10.1-1.2',
'libboost-date-time1.54.0': '1.54.0-4ubuntu3',
'libcurl3': '7.35.0-1ubuntu2',
'libzip2': '0.10.1-1.2',
- 'libsoxr0': '0.1.1-1'}
+ 'libsamplerate0': '0.1.8-7',
+ 'libicu52': '52.1-3'}
deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
'libssh-4': '0.6.3-3ubuntu3',
deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
'libssh-4': '0.6.3-3ubuntu3',
@@
-77,7
+80,8
@@
deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
'libcurl3': '7.38.0-3ubuntu2',
'libzip2': '0.11.2-1.2',
'libwxgtk3.0-0': '3.0.2-1',
'libcurl3': '7.38.0-3ubuntu2',
'libzip2': '0.11.2-1.2',
'libwxgtk3.0-0': '3.0.2-1',
- 'libsoxr0': '0.1.1-1'}
+ 'libsamplerate0': '0.1.8-8',
+ 'libicu52': '52.1-8'}
deb_depends['7'] = {'libc6': '2.13',
'libssh-4': '0.5.4',
deb_depends['7'] = {'libc6': '2.13',
'libssh-4': '0.5.4',
@@
-94,7
+98,9
@@
deb_depends['7'] = {'libc6': '2.13',
'libcurl3': '7.26.0',
'libzip2': '0.10.1',
'libcairomm-1.0-1': '1.10.0-1',
'libcurl3': '7.26.0',
'libzip2': '0.10.1',
'libcairomm-1.0-1': '1.10.0-1',
- 'libpangomm-1.4-1': '2.28.4-1'}
+ 'libpangomm-1.4-1': '2.28.4-1',
+ 'libsamplerate0': '0.1.8-5',
+ 'libicu48': '4.8.1.1-12+deb7u3'}
deb_depends['8'] = {'libc6': '2.19-18',
'libssh-4': '0.6.3-4',
deb_depends['8'] = {'libc6': '2.19-18',
'libssh-4': '0.6.3-4',
@@
-113,7
+119,8
@@
deb_depends['8'] = {'libc6': '2.19-18',
'libwxgtk3.0-0': '3.0.2',
'libxcb-xfixes0': '1.10',
'libxcb-shape0': '1.10',
'libwxgtk3.0-0': '3.0.2',
'libxcb-xfixes0': '1.10',
'libxcb-shape0': '1.10',
- 'libsoxr0': '0.1.1-1'}
+ 'libsamplerate0': '0.1.8-8',
+ 'libicu52': '52.1-8+deb8u2'}
deb_depends['unstable'] = {'libc6': '2.13',
'libssh-4': '0.5.4',
deb_depends['unstable'] = {'libc6': '2.13',
'libssh-4': '0.5.4',
@@
-129,8
+136,8
@@
deb_depends['unstable'] = {'libc6': '2.13',
'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',
- 'libs
oxr0': '0.1.1-1'}
-
+ 'libs
amplerate0': '0.1.8-8',
+ 'libicu52': '52.1-9'}
def packages(name, packages, f):
s = '%s: ' % name
def packages(name, packages, f):
s = '%s: ' % name
@@
-244,9
+251,9
@@
def dependencies(target):
else:
ffmpeg_options = {}
else:
ffmpeg_options = {}
- return (('ffmpeg-cdist', '
b11c05f
', ffmpeg_options),
- ('libdcp', '
v1.2.3
'),
- ('libsub', '
v1.1.4
'))
+ return (('ffmpeg-cdist', '
d0986a9
', ffmpeg_options),
+ ('libdcp', '
6a9f369
'),
+ ('libsub', '
04d92c2
'))
def configure_options(target):
opt = ''
def configure_options(target):
opt = ''
@@
-261,7
+268,9
@@
def configure_options(target):
if target.version == '6.5':
opt += ' --static-boost --static-xmlpp'
elif target.version == '7':
if target.version == '6.5':
opt += ' --static-boost --static-xmlpp'
elif target.version == '7':
- opt += ' --workaround-gssapi'
+ opt += ' --workaround-gssapi --static-xmlpp'
+ if target.distro == 'debian' and target.version == 'unstable':
+ target.append_with_space('CXXFLAGS', '-std=c++11')
return opt
return opt
@@
-317,7
+326,7
@@
def package_debian(target, cpu, version):
return debs
return debs
-def package_
centos
(target, cpu, version):
+def package_
rpm
(target, cpu, version):
topdir = os.path.realpath('build/rpmbuild')
os.makedirs('%s/BUILD' % topdir)
os.makedirs('%s/RPMS' % topdir)
topdir = os.path.realpath('build/rpmbuild')
os.makedirs('%s/BUILD' % topdir)
os.makedirs('%s/RPMS' % topdir)
@@
-327,7
+336,7
@@
def package_centos(target, cpu, version):
target.command('./waf dist')
shutil.copyfile(
target.command('./waf dist')
shutil.copyfile(
- "%s/src/dcpomatic
2
/dcpomatic-%s.tar.bz2" % (target.directory, version),
+ "%s/src/dcpomatic/dcpomatic-%s.tar.bz2" % (target.directory, version),
"%s/SOURCES/dcpomatic-%s.tar.bz2" % (topdir, version)
)
"%s/SOURCES/dcpomatic-%s.tar.bz2" % (topdir, version)
)
@@
-340,7
+349,9
@@
def package_centos(target, cpu, version):
else:
cpu = "i686"
else:
cpu = "i686"
+ print 'Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu)
for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)):
for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)):
+ print 'found %s' % p
rpms.append(os.path.abspath(p))
return rpms
rpms.append(os.path.abspath(p))
return rpms
@@
-356,8
+367,8
@@
def package(target, version):
if target.distro == 'debian' or target.distro == 'ubuntu':
return package_debian(target, cpu, version)
if target.distro == 'debian' or target.distro == 'ubuntu':
return package_debian(target, cpu, version)
- elif target.distro == 'centos':
- return package_
centos
(target, cpu, version)
+ elif target.distro == 'centos'
or target.distro == 'fedora'
:
+ return package_
rpm
(target, cpu, version)
elif target.platform == 'osx':
target.command('bash platform/osx/make_dmg.sh %s' % target.directory)
return os.path.abspath(glob.glob('build/platform/osx/DCP-o-matic*.dmg')[0])
elif target.platform == 'osx':
target.command('bash platform/osx/make_dmg.sh %s' % target.directory)
return os.path.abspath(glob.glob('build/platform/osx/DCP-o-matic*.dmg')[0])