X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=138cdd4f6f52e82777607f4e8ffcc1dfab3491e6;hb=87274a4e523068a16e1ce1c6612a270edbc02e6f;hp=2136793f314ac8bbe38a6049a4e4cf37344a814b;hpb=527a2613dd6854becc8ba9bc82f9b9e7d3fee623;p=dcpomatic.git diff --git a/cscript b/cscript index 2136793f3..138cdd4f6 100644 --- a/cscript +++ b/cscript @@ -33,8 +33,6 @@ deb_build_depends['14.04'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['14.04'].extend(['libssh-dev']) deb_build_depends['16.04'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['16.04'].extend(['libssh-dev']) -deb_build_depends['17.10'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['17.10'].extend(['libssh-dev']) deb_build_depends['18.04'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['18.04'].extend(['libssh-dev']) deb_build_depends['18.10'] = copy.deepcopy(deb_build_depends_base) @@ -83,20 +81,6 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0', 'libx264-148', 'libcurl3']) -deb_depends['17.10'] = copy.deepcopy(deb_depends_base) -deb_depends['17.10'].extend(['libboost-filesystem1.62.0', - 'libboost-thread1.62.0', - 'libboost-regex1.62.0', - 'libxml++2.6-2v5', - 'libboost-date-time1.62.0', - 'libzip4', - 'libwxgtk3.0-0v5', - 'libicu57', - 'libnettle6', - 'libssh-4', - 'libx264-148', - 'libcurl3']) - deb_depends['18.04'] = copy.deepcopy(deb_depends_base) deb_depends['18.04'].extend(['libboost-filesystem1.65.1', 'libboost-thread1.65.1', @@ -297,7 +281,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) 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', 'ar_LB', 'fi_FI', 'el_GR', 'tr_TR']: + 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'fi_FI']: 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) @@ -338,14 +322,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', 'c1224ee', ffmpeg_options)] + deps = [('ffmpeg-cdist', 'a820b44', ffmpeg_options)] else: # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', '27e1378')) - deps.append(('libsub', '2728525')) - deps.append(('rtaudio-cdist', 'a227107')) + deps.append(('libdcp', '1b9ef11')) + deps.append(('libsub', '149f2ca')) + deps.append(('rtaudio-cdist', 'aad62d7')) return deps