X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=cscript;h=d82b377f204853a146245424fa84b09c0f9c139f;hp=043aba64ce9cfbcc95e5415d8f8b03a315059042;hb=a5be11a965c2c38442e4e069874e7e21b5b43a5c;hpb=a62f4bbc26bb506f41d8143efebf0fb186bdfa5c diff --git a/cscript b/cscript index 043aba64c..d82b377f2 100644 --- a/cscript +++ b/cscript @@ -33,10 +33,10 @@ 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) +deb_build_depends['18.10'].extend(['libssh-dev']) deb_build_depends['7'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['7'].extend(['libssh-dev']) deb_build_depends['8'] = copy.deepcopy(deb_build_depends_base) @@ -81,22 +81,24 @@ 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', +deb_depends['18.04'] = copy.deepcopy(deb_depends_base) +deb_depends['18.04'].extend(['libboost-filesystem1.65.1', + 'libboost-thread1.65.1', + 'libboost-regex1.65.1', + 'libboost-date-time1.65.1', + 'libcairomm-1.0-1v5', + 'libpangomm-1.4-1v5', 'libxml++2.6-2v5', - 'libboost-date-time1.62.0', 'libzip4', 'libwxgtk3.0-0v5', - 'libicu57', + 'libicu60', 'libnettle6', 'libssh-4', - 'libx264-148', - 'libcurl3']) + 'libx264-152', + 'libcurl4']) -deb_depends['18.04'] = copy.deepcopy(deb_depends_base) -deb_depends['18.04'].extend(['libboost-filesystem1.65.1', +deb_depends['18.10'] = copy.deepcopy(deb_depends_base) +deb_depends['18.10'].extend(['libboost-filesystem1.65.1', 'libboost-thread1.65.1', 'libboost-regex1.65.1', 'libboost-date-time1.65.1', @@ -242,8 +244,7 @@ def make_spec(filename, version, target, options, requires=None): print('', file=f) print('%description', file=f) print('DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio ', file=f) - print('files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant ', file=f) - print('digital projectors.', file=f) + print('files for presentation on DCI-compliant digital projectors.', file=f) print('', file=f) print('%files', file=f) print('%{_bindir}/dcpomatic2', file=f) @@ -260,12 +261,15 @@ def make_spec(filename, version, target, options, requires=None): print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_kdm.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_player.desktop', file=f) + print('%{_datadir}/applications/dcpomatic2_playlist.desktop', file=f) print('%{_datadir}/dcpomatic2/dcpomatic2_server_small.png', file=f) print('%{_datadir}/dcpomatic2/select.png', file=f) print('%{_datadir}/dcpomatic2/sequence.png', file=f) print('%{_datadir}/dcpomatic2/snap.png', file=f) print('%{_datadir}/dcpomatic2/zoom.png', file=f) print('%{_datadir}/dcpomatic2/zoom_all.png', file=f) + print('%{_datadir}/dcpomatic2/tick.png', file=f) + print('%{_datadir}/dcpomatic2/no_tick.png', file=f) print('%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf', file=f) print('%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f) print('%{_datadir}/dcpomatic2/LiberationSans-Bold.ttf', file=f) @@ -277,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) @@ -318,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', '27f25fb', ffmpeg_options)] + deps = [('ffmpeg-cdist', 'a820b44', ffmpeg_options)] else: # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', '7930f76')) - deps.append(('libsub', '7bf99dc')) - deps.append(('rtaudio-cdist', '739969e')) + deps.append(('libdcp', '6a85c30')) + deps.append(('libsub', '1c70f3a')) + deps.append(('rtaudio-cdist', 'aad62d7')) return deps @@ -335,8 +339,8 @@ def option_defaults(): def configure_options(target, options): opt = '' - if not (target.platform == 'linux' and target.distro == 'ubuntu' and (target.version == '18.04' or target.version == '16.04')): - # Currently we only build tests on Ubuntu 1{6,8}.04 + if not (target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04'): + # Currently we only build tests on Ubuntu 18.04 opt += ' --disable-tests' if target.debug: @@ -567,9 +571,7 @@ def package_rpm(target, cpu, version, options): else: cpu = "i686" - print('Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu)) for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)): - print('found %s' % p) rpms.append(os.path.abspath(p)) return rpms