- return (('ffmpeg-cdist', '0e27b2b', ffmpeg_options),
- ('libdcp', '4852a22'),
- ('libsub', 'b98c145'))
+ return (('ffmpeg-cdist', 'd0986a9', ffmpeg_options),
+ ('libdcp', 'de32e99'),
+ ('libsub', '2d6d0e0'))
opt += ' --static-boost --static-xmlpp'
elif target.version == '7':
opt += ' --workaround-gssapi --static-xmlpp'
opt += ' --static-boost --static-xmlpp'
elif target.version == '7':
opt += ' --workaround-gssapi --static-xmlpp'
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)
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])