'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',
'libxmlsec1-openssl': '1.2.18-2ubuntu1',
'libboost-date-time1.54.0': '1.54.0-4ubuntu3',
'libcurl3': '7.35.0-1ubuntu2',
- 'libzip2': '0.10.1-1.2'}
+ 'libzip2': '0.10.1-1.2',
+ 'libsamplerate0': '0.1.8-7',
+ 'libicu52': '52.1-3'}
deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
'libssh-4': '0.6.3-3ubuntu3',
'libboost-date-time1.55.0': '1.55.0+dfsg-3ubuntu2',
'libcurl3': '7.38.0-3ubuntu2',
'libzip2': '0.11.2-1.2',
- 'libwxgtk3.0-0': '3.0.2-1'}
+ 'libwxgtk3.0-0': '3.0.2-1',
+ 'libsamplerate0': '0.1.8-8',
+ 'libicu52': '52.1-8'}
deb_depends['7'] = {'libc6': '2.13',
'libssh-4': '0.5.4',
'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',
'libzip2': '0.11.2',
'libwxgtk3.0-0': '3.0.2',
'libxcb-xfixes0': '1.10',
- 'libxcb-shape0': '1.10'}
+ 'libxcb-shape0': '1.10',
+ 'libsamplerate0': '0.1.8-8',
+ 'libicu52': '52.1-8+deb8u2'}
deb_depends['unstable'] = {'libc6': '2.13',
'libssh-4': '0.5.4',
'libboost-date-time1.55.0': '1.55.0',
'libxmlsec1-openssl': '1.2.18',
'libcurl3': '7.26.0',
- 'libzip2': '0.10.1'}
-
+ 'libzip2': '0.10.1',
+ 'libsamplerate0': '0.1.8-8',
+ 'libicu52': '52.1-9'}
def packages(name, packages, f):
s = '%s: ' % name
print >>f,'/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :'
def dependencies(target):
- return (('ffmpeg-cdist', '1d37f80'),
- ('libdcp', 'v1.2.3'),
- ('libsub', 'v1.1.4'))
+
+ if target.platform == 'linux':
+ ffmpeg_options = { 'shared': False }
+ else:
+ ffmpeg_options = {}
+
+ return (('ffmpeg-cdist', 'd0986a9', ffmpeg_options),
+ ('libdcp', '6a9f369'),
+ ('libsub', '04d92c2'))
def configure_options(target):
opt = ''
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 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)
target.command('./waf dist')
shutil.copyfile(
- "%s/src/dcpomatic2/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)
)
else:
cpu = "i686"
+ print 'Looking in %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
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])