X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=d6426787f7d7ecc46230e52e9b9c7fd7ce47b698;hb=122111f680dc186f936960394f0720374d7d5dca;hp=14d1829f115705dfb95f91d79bca075e3625b17c;hpb=e7e7035f800accbb09ac99aa26d15bff22588d0b;p=dcpomatic.git diff --git a/cscript b/cscript index 14d1829f1..d6426787f 100644 --- a/cscript +++ b/cscript @@ -305,7 +305,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 +346,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 +554,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')