X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=052aa6c7c645b654109daf6b1138a45933630ecd;hb=refs%2Fheads%2Fnew-prefs-icons;hp=baf2e570067ea3ddc810209ee4b61625a6ac5b4e;hpb=0c998a7f85f1801287d009a170d5d85b8984a7f6;p=dcpomatic.git diff --git a/cscript b/cscript index baf2e5700..052aa6c7c 100644 --- a/cscript +++ b/cscript @@ -324,7 +324,7 @@ def make_spec(filename, version, target, options, requires=None): 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']: + 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR']: 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) @@ -365,7 +365,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', 'c048a3f', ffmpeg_options)] + deps = [('ffmpeg-cdist', 'd798b45', ffmpeg_options)] else: # Use distro-provided FFmpeg on Arch deps = [] @@ -375,8 +375,8 @@ def dependencies(target, options): (target.platform == 'osx' and target.bits == 64) or (target.platform == 'windows')) else {} - deps.append(('libdcp', 'c6c18f4', cpp_lib_options)) - deps.append(('libsub', '67fff3c', cpp_lib_options)) + deps.append(('libdcp', '9a8faac', cpp_lib_options)) + deps.append(('libsub', '8da829d', cpp_lib_options)) deps.append(('leqm-nrt', 'carl')) deps.append(('rtaudio', 'carl')) # We get our OpenSSL libraries from the environment, but we @@ -550,9 +550,7 @@ def build(target, options): else: target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options))) target.command('./waf') - - if target.platform == 'linux' or target.platform == 'osx': - target.command('./waf install') + target.command('./waf install') def package_windows(target): identifier = ''