X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=cscript;h=fa82a0d55ae9c912774ad945fdeda58da172ff79;hp=14d1829f115705dfb95f91d79bca075e3625b17c;hb=7e711c654d804a8c57a81c059a0f0afdb3ec8d90;hpb=e7e7035f800accbb09ac99aa26d15bff22588d0b diff --git a/cscript b/cscript index 14d1829f1..fa82a0d55 100644 --- a/cscript +++ b/cscript @@ -45,6 +45,8 @@ deb_build_depends['8'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['8'].extend(['libssh-gcrypt-dev']) deb_build_depends['9'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['9'].extend(['libssh-gcrypt-dev']) +deb_build_depends['10'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['10'].extend(['libssh-gcrypt-dev']) deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base) deb_depends = dict() @@ -190,18 +192,41 @@ deb_depends_gui['9'] = [ 'libwxgtk3.0-0v5', 'libasound2', 'libpulse0' ] +deb_depends['10'] = copy.deepcopy(deb_depends_base) +deb_depends['10'].extend(['libboost-filesystem1.67.0', + 'libboost-thread1.67.0', + 'libboost-regex1.67.0', + 'libboost-date-time1.67.0', + 'libxml++2.6-2v5', + 'libgtk2.0-0', + 'libzip4', + 'libcairomm-1.0-1v5', + 'libpangomm-1.4-1v5', + 'libicu63', + 'libssh-4', + 'libssh-gcrypt-4', + 'libnettle6', + 'libx264-155', + 'libcurl4']) + +deb_depends_gui['10'] = [ 'libwxgtk3.0-0v5', + 'libxcb-xfixes0', + 'libxcb-shape0', + 'libasound2', + 'libpulse0' ] + deb_depends['unstable'] = copy.deepcopy(deb_depends_base) -deb_depends['unstable'].extend(['libboost-filesystem1.62.0', - 'libboost-thread1.62.0', - 'libboost-regex1.62.0', - 'libboost-date-time1.62.0', +deb_depends['unstable'].extend(['libboost-filesystem1.67.0', + 'libboost-thread1.67.0', + 'libboost-regex1.67.0', + 'libboost-date-time1.67.0', 'libxml++2.6-2v5', 'libgtk2.0-0', 'libzip4', - 'libicu57', + 'libicu63', 'libnettle6', - 'libx264-148', - 'libcurl3']) + 'libx264-155', + 'libcurl4']) def packages(name, packages, f): s = '%s: ' % name @@ -278,6 +303,9 @@ def make_spec(filename, version, target, options, requires=None): print('%{_bindir}/dcpomatic2_kdm_cli', file=f) print('%{_bindir}/dcpomatic2_player', file=f) print('%{_bindir}/dcpomatic2_playlist', file=f) + if options['variant'] == 'swaroop-studio': + print('%{_bindir}/dcpomatic2_ecinema', file=f) + print('%{_bindir}/dcpomatic2_uuid', file=f) print('%{_datadir}/applications/dcpomatic2.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f) @@ -305,7 +333,7 @@ def make_spec(filename, version, target, options, requires=None): print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_playlist.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', 'ko_KR']: 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) @@ -346,14 +374,14 @@ def dependencies(target): if target.platform == 'windows' and target.version == 'xp': deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)] elif target.platform != 'linux' or target.distro != 'arch': - deps = [('ffmpeg-cdist', 'a820b44', ffmpeg_options)] + deps = [('ffmpeg-cdist', '20d3ddf', ffmpeg_options)] else: # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.6.7')) - deps.append(('libsub', 'v1.4.7')) - deps.append(('rtaudio-cdist', 'bf0fc23')) + deps.append(('libdcp', None)) + deps.append(('libsub', None)) + deps.append(('rtaudio-cdist', None)) return deps @@ -554,10 +582,6 @@ def package_debian(target, cpu, version, options): target.set('CDIST_CONFIGURE', '"' + configure_options(target, options) + '"') if target.debug: target.set('CDIST_DEBUG_PACKAGE', '--dbg-package=dcpomatic-dbg') - if target.version in ['7', '14.04']: - target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale') - else: - target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale') target.command('dpkg-buildpackage -uc -us') @@ -635,6 +659,7 @@ def package(target, version, options): out.append(make_appimage(target, 'DCP-o-matic Playlist Editor', 'dcpomatic2_playlist', version)) out.append(make_appimage(target, 'DCP-o-matic KDM Creator', 'dcpomatic2_kdm', version)) 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)) return out else: if target.bits == 32: