'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',
+ 'libcairomm-1.0-1': '1.10.0-1ubuntu3',
+ 'libpangomm-1.4-1': '2.34.0-1ubuntu1',
+ '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['15.10'] = {'libc6': '2.21-0ubuntu4',
+ 'libssh-4': '0.6.3-3ubuntu3',
+ 'libboost-filesystem1.58.0': '1.58.0+dfsg-3.1ubuntu1',
+ 'libboost-thread1.58.0': '1.58.0+dfsg-3.1ubuntu1',
+ 'libboost-regex1.58.0': '1.58.0+dfsg-3.1ubuntu1',
+ 'libsndfile1': '1.0.25-9.1',
+ 'libmagick++-6.q16-5v5': '8:6.8.9.9-5ubuntu2',
+ 'libxml++2.6-2v5': '2.38.1-2',
+ 'libgtk2.0-0': '2.24.28-1ubuntu1',
+ 'libxmlsec1': '1.2.20-2ubuntu3',
+ 'libxmlsec1-openssl': '1.2.20-2ubuntu3',
+ 'libboost-date-time1.58.0': '1.58.0+dfsg-3.1ubuntu1',
+ 'libcurl3': '7.43.0-1ubuntu2',
+ 'libzip4': '1.0.1-0ubuntu1',
+ 'libwxgtk3.0-0v5': '3.0.2+dfsg-1.2',
+ 'libsamplerate0': '0.1.8-8',
+ 'libicu55': '55.1-4ubuntu1'}
deb_depends['7'] = {'libc6': '2.13',
'libssh-4': '0.5.4',
'libxmlsec1-openssl': '1.2.18',
'libcurl3': '7.26.0',
'libzip2': '0.10.1',
- 'libcairomm-1.0-1', '1.10.0-1'
- 'libpangomm-1.4-1', '2.28.4-1'}
+ 'libcairomm-1.0-1': '1.10.0-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'}
-
-deb_depends['unstable'] = {'libc6': '2.13',
- 'libssh-4': '0.5.4',
- 'libboost-filesystem1.55.0': '1.55.0',
- 'libboost-thread1.55.0': '1.55.0',
- 'libboost-regex1.55.0': '1.55.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.55.0': '1.55.0',
- 'libxmlsec1-openssl': '1.2.18',
- 'libcurl3': '7.26.0',
- 'libzip2': '0.10.1'}
-
+ 'libxcb-shape0': '1.10',
+ 'libsamplerate0': '0.1.8-8',
+ 'libicu52': '52.1-8+deb8u2'}
+
+deb_depends['unstable'] = {'libc6': '2.19-22',
+ 'libssh-4': '0.6.3-4.1+b1',
+ 'libboost-filesystem1.58.0': '1.58.0+dfsg-4',
+ 'libboost-thread1.58.0': '1.58.0+dfsg-4',
+ 'libboost-regex1.58.0': '1.58.0+dfsg-4',
+ 'libsndfile1': '1.0.25-9.1',
+ 'libmagick++-6.q16-5v5': '8:6.8.9.9-6',
+ 'libxml++2.6-2v5': '2.40.1-1',
+ 'libgtk2.0-0': '2.24.28-1',
+ 'libxmlsec1': '1.2.20-2+b2',
+ 'libboost-date-time1.58.0': '1.58.0+dfsg-4',
+ 'libxmlsec1-openssl': '1.2.20-2+b2',
+ 'libcurl3': '7.45.0-1+b1',
+ 'libzip2': '0.11.2-1.2',
+ 'libsamplerate0': '0.1.8-8',
+ 'libicu52': '52.1-10'}
def packages(name, packages, f):
s = '%s: ' % name
print >>f,'%{_bindir}/dcpomatic2_kdm'
print >>f,'%{_bindir}/dcpomatic2_server'
print >>f,'%{_bindir}/dcpomatic2_server_cli'
+ print >>f,'%{_bindir}/dcpomatic2_kdm_cli'
print >>f,'%{_datadir}/applications/dcpomatic2.desktop'
print >>f,'%{_datadir}/applications/dcpomatic2_batch.desktop'
print >>f,'%{_datadir}/applications/dcpomatic2_server.desktop'
- print >>f,'%{_datadir}/dcpomatic2/taskbar_icon.png'
+ print >>f,'%{_datadir}/applications/dcpomatic2_kdm.desktop'
+ print >>f,'%{_datadir}/dcpomatic2/dcpomatic2_server_small.png'
print >>f,'%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf'
+ print >>f,'%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf'
+ print >>f,'%{_datadir}/dcpomatic2/LiberationSans-Bold.ttf'
print >>f,'%{_datadir}/dcpomatic2/splash.png'
- for r in ['128x128', '22x22', '32x32', '48x48', '64x64']:
+ for r in ['128x128', '16x16', '22x22', '256x256', '32x32', '48x48', '512x512', '64x64']:
print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r
- for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK']:
+ print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r
+ print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r
+ print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r
+ for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT']:
print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l
print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l
print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l
print >>f,'/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :'
def dependencies(target):
- return (('ffmpeg-cdist', 'bd17594'),
- ('libdcp', '1.2.1'),
- ('libsub', '1.1.3'))
+
+ if target.platform == 'linux':
+ ffmpeg_options = { 'shared': False }
+ else:
+ ffmpeg_options = {}
+
+ return (('ffmpeg-cdist', '938d9af', ffmpeg_options),
+ ('libdcp', '1.0'),
+ ('libsub', '1.0'))
def configure_options(target):
opt = ''
if target.platform == 'windows':
opt += ' --target-windows'
elif target.platform == 'linux':
- opt += ' --static-dcpomatic --static-openjpeg --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
+ opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
if target.distro == 'centos':
opt += ' --static-xmlsec --static-ssh --disable-tests'
if target.version == '6.5':
opt += ' --static-boost --static-xmlpp'
elif target.version == '7':
- opt += ' --workaround-gssapi'
+ opt += ' --workaround-gssapi --static-xmlpp'
return opt
target.set('CDIST_CONFIGURE', '"' + configure_options(target) + '"')
if target.debug:
target.set('CDIST_DEBUG_PACKAGE', '--dbg-package=dcpomatic-dbg')
- if target.version == '15.04' or target.version == '8':
+ if target.version in ['15.04', '15.10', '8']:
target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale')
else:
target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale')
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)
)
if cpu == "amd64":
cpu = "x86_64"
+ 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])
projects / dcpomatic.git / blobdiff