X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=cscript;h=b9cfd940d1cef010603c770d7fbc29f6f9c31af8;hp=467bb9a5000c088cfa69a20f2ef9ffff84a7e6f4;hb=15a83d720780d58f905d40f8493cdcb86596eaee;hpb=6e60e90a4e10cc5e24915b5bf16e93145a823e32 diff --git a/cscript b/cscript index 467bb9a50..b9cfd940d 100644 --- a/cscript +++ b/cscript @@ -37,8 +37,6 @@ deb_build_depends['19.10'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['19.10'].extend(['libssh-dev']) deb_build_depends['20.04'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['20.04'].extend(['libssh-dev']) -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) @@ -103,7 +101,7 @@ deb_depends['19.10'].extend(['libboost-filesystem1.67.0', 'libcurl4', 'libpulse0', 'libxerces-c3.2', - 'libnanomsg4']) + 'libnanomsg5']) deb_depends['20.04'] = copy.deepcopy(deb_depends_base) deb_depends['20.04'].extend(['libboost-filesystem1.71.0', @@ -124,24 +122,6 @@ deb_depends['20.04'].extend(['libboost-filesystem1.71.0', 'libxerces-c3.2', 'libnanomsg5']) -deb_depends['8'] = copy.deepcopy(deb_depends_base) -deb_depends['8'].extend(['libboost-filesystem1.55.0', - 'libboost-thread1.55.0', - 'libboost-date-time1.55.0', - 'libboost-regex1.55.0', - 'libxml++2.6-2', - 'libzip2', - 'libcairomm-1.0-1', - 'libpangomm-1.4-1', - 'libwxgtk3.0-0', - 'libxcb-xfixes0', - 'libxcb-shape0', - 'libicu52', - 'libnettle4', - 'libssh-4', - 'libx264-142', - 'libcurl3']) - deb_depends['9'] = copy.deepcopy(deb_depends_base) deb_depends['9'].extend(['libboost-filesystem1.62.0', 'libboost-thread1.62.0', @@ -158,7 +138,7 @@ deb_depends['9'].extend(['libboost-filesystem1.62.0', 'libnettle6', 'libx264-148', 'libcurl3', - 'libxerces-c3.2']) + 'libxerces-c3.1']) deb_depends_gui['9'] = [ 'libwxgtk3.0-0v5', 'libxcb-xfixes0', @@ -341,6 +321,7 @@ def make_spec(filename, version, target, options, requires=None): print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_playlist.png' % r, file=f) + print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_disk.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', 'ko_KR']: print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f) @@ -383,7 +364,7 @@ def dependencies(target, options): 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', '20d3ddf', ffmpeg_options)] + deps = [('ffmpeg-cdist', '7427ffe', ffmpeg_options)] else: # Use distro-provided FFmpeg on Arch deps = [] @@ -403,7 +384,7 @@ def dependencies(target, options): # the appropriate place later deps.append(('openssl', 'carl')) if can_build_disk(target): - deps.append(('lwext4', 'carl2')) + deps.append(('lwext4', '370b3de6')) return deps @@ -690,6 +671,7 @@ def package(target, version, options): 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)) + out.append(make_appimage(target, 'DCP-o-matic Disk Writer', 'dcpomatic2_disk', version)) return out else: if target.bits == 32: