X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=cscript;h=4e877144a3c10074a7bddebed6d7caaf6e007635;hp=f09128645c75639312a857433ed533dee47282d2;hb=84f0cae91025bc9349beb979bb664a4d63e6499c;hpb=2b0cf17f9a20729f8d43541ee405164b3806c038 diff --git a/cscript b/cscript index f09128645..4e877144a 100644 --- a/cscript +++ b/cscript @@ -32,6 +32,9 @@ deb_build_depends_base = ['debhelper', 'g++', 'pkg-config', 'libsndfile1-dev', ' for v in ['16.04', '18.04', '20.04', '20.10', '21.04', '21.10']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-dev', 'python']) +for v in ['22.04']: + deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) + deb_build_depends[v].extend(['libssh-dev', 'python3.10']) for v in ['9', '10']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python']) @@ -117,6 +120,25 @@ deb_depends['21.10'].extend(['libboost-filesystem1.74.0', 'libnanomsg5', 'libdav1d4']) +deb_depends['22.04'] = copy.deepcopy(deb_depends_base) +deb_depends['22.04'].extend(['libboost-filesystem1.74.0', + 'libboost-thread1.74.0', + 'libboost-regex1.74.0', + 'libboost-date-time1.74.0', + 'libcairomm-1.0-1v5', + 'libpangomm-1.4-1v5', + 'libxml++2.6-2v5', + 'libzip4', + 'libicu70', + 'libnettle8', + 'libssh-4', + 'libx264-163', + 'libcurl4', + 'libpulse0', + 'libxerces-c3.2', + 'libnanomsg5', + 'libdav1d5']) + deb_depends['9'] = copy.deepcopy(deb_depends_base) deb_depends['9'].extend(['libboost-filesystem1.62.0', 'libboost-thread1.62.0', @@ -303,6 +325,7 @@ def make_spec(filename, version, target, options, requires=None): print('%{_bindir}/dcpomatic2_batch', file=f) print('%{_bindir}/dcpomatic2_cli', file=f) print('%{_bindir}/dcpomatic2_create', file=f) + print('%{_bindir}/dcpomatic2_editor', file=f) print('%{_bindir}/dcpomatic2_kdm', file=f) print('%{_bindir}/dcpomatic2_server', file=f) print('%{_bindir}/dcpomatic2_server_cli', file=f) @@ -317,6 +340,7 @@ def make_spec(filename, version, target, options, requires=None): print('%caps(cap_dac_override=ep) %{_bindir}/dcpomatic2_disk_writer', file=f) print('%{_datadir}/applications/dcpomatic2.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f) + print('%{_datadir}/applications/dcpomatic2_editor.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_kdm.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_player.desktop', file=f) @@ -341,6 +365,7 @@ def make_spec(filename, version, target, options, requires=None): for r in ['128x128', '16x16', '22x22', '256x256', '32x32', '48x48', '512x512', '64x64']: print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r, file=f) + print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_editor.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.png' % r, file=f) @@ -348,7 +373,7 @@ def make_spec(filename, version, target, options, requires=None): print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_disk.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_combiner.png' % r, file=f) for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', - 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR']: + 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR', 'sl_SI']: print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f) print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l, file=f) print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f) @@ -402,8 +427,8 @@ def dependencies(target, options): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.8.12')) - deps.append(('libsub', 'v1.6.12')) + deps.append(('libdcp', 'v1.8.24')) + deps.append(('libsub', 'v1.6.26')) deps.append(('leqm-nrt', '93ae9e6')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we @@ -412,7 +437,7 @@ def dependencies(target, options): # the appropriate place later deps.append(('openssl', '7f29dd5')) if can_build_disk(target): - deps.append(('lwext4', 'cce3730')) + deps.append(('lwext4', 'ee865fa65f05e348cd4e0bce0552a2725ad5663a')) deps.append(('ffcmp', 'da96af56f3ddf074f2044a0cd6e50c95184fd169')) return deps @@ -730,6 +755,7 @@ def package(target, version, options): out.append(make_appimage(target, 'DCP-o-matic Batch Converter', 'dcpomatic2_batch', version)) out.append(make_appimage(target, 'DCP-o-matic Encode Server', 'dcpomatic2_server', version)) out.append(make_appimage(target, 'DCP-o-matic Combiner', 'dcpomatic2_combiner', version)) + out.append(make_appimage(target, 'DCP-o-matic Editor', 'dcpomatic2_editor', version)) return out else: if target.bits == 32: @@ -742,8 +768,11 @@ def package(target, version, options): elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia': return package_rpm(target, cpu, version, options) elif target.platform == 'osx': - archs = ' '.join(f'{t.arch}/{t.deployment}' for t in target.sub_targets) - target.command('bash platform/osx/make_dmg.sh %s %s %s %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password, archs)) + archs = '-a ' + ' -a '.join(f'{t.arch}/{t.deployment}' for t in target.sub_targets) + cmd = 'bash platform/osx/make_dmg.sh -e %s -r %s -i %s -p %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password, archs) + if 'part' in options: + cmd += ' -b ' + options['part'] + target.command(cmd) packages = [] for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg'): a = os.path.abspath(x) @@ -761,6 +790,8 @@ def package(target, version, options): packages.append((a, "com.dcpomatic.disk")) elif x.find("Combiner") != -1: packages.append((a, "com.dcpomatic.combiner")) + elif x.find("Editor") != -1: + packages.append((a, "com.dcpomatic.editor")) else: packages.append((a, "com.dcpomatic")) return packages