X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=85d464eaeaff874bf8d5d47ae5575c3f45e2cb62;hb=c78e9f0d5e802e1bb020694870357ef271217628;hp=a38929b4d189442540a41284fc4deae194dd3ae6;hpb=599ce9ce83d3d7fcb6bb42ba76c49c110c9a62cc;p=dcpomatic.git diff --git a/cscript b/cscript index a38929b4d..85d464eae 100644 --- a/cscript +++ b/cscript @@ -33,12 +33,10 @@ deb_build_depends['16.04'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['16.04'].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['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['20.10'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['20.10'].extend(['libssh-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) @@ -86,27 +84,27 @@ deb_depends['18.04'].extend(['libboost-filesystem1.65.1', 'libxerces-c3.2', 'libnanomsg4']) -deb_depends['19.10'] = copy.deepcopy(deb_depends_base) -deb_depends['19.10'].extend(['libboost-filesystem1.67.0', - 'libboost-thread1.67.0', - 'libboost-regex1.67.0', - 'libboost-date-time1.67.0', +deb_depends['20.04'] = copy.deepcopy(deb_depends_base) +deb_depends['20.04'].extend(['libboost-filesystem1.71.0', + 'libboost-thread1.71.0', + 'libboost-regex1.71.0', + 'libboost-date-time1.71.0', 'libcairomm-1.0-1v5', 'libpangomm-1.4-1v5', 'libxml++2.6-2v5', 'libzip5', - 'libwxgtk3.0-0v5', - 'libicu63', - 'libnettle6', + 'libwxgtk3.0-gtk3-0v5', + 'libicu66', + 'libnettle7', 'libssh-4', 'libx264-155', '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', +deb_depends['20.10'] = copy.deepcopy(deb_depends_base) +deb_depends['20.10'].extend(['libboost-filesystem1.71.0', 'libboost-thread1.71.0', 'libboost-regex1.71.0', 'libboost-date-time1.71.0', @@ -122,25 +120,7 @@ deb_depends['20.04'].extend(['libboost-filesystem1.71.0', 'libcurl4', 'libpulse0', 'libxerces-c3.2', - 'libnanomsg4']) - -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']) + 'libnanomsg5']) deb_depends['9'] = copy.deepcopy(deb_depends_base) deb_depends['9'].extend(['libboost-filesystem1.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', @@ -217,7 +197,7 @@ def can_build_disk(target): if target.platform == 'osx': return True if target.platform == 'linux': - if target.distro == 'ubuntu' and target.version in ['18.04', '19.10', '20.04']: + if target.distro == 'ubuntu' and target.version in ['18.04', '20.04', '20.10']: return True if target.distro == 'debian' and target.version == '10': return True @@ -306,6 +286,7 @@ def make_spec(filename, version, target, options, requires=None): print('%{_bindir}/dcpomatic2_player', file=f) print('%{_bindir}/dcpomatic2_playlist', file=f) print('%{_bindir}/dcpomatic2_openssl', file=f) + print('%{_bindir}/dcpomatic2_combiner', file=f) if options['variant'] == 'swaroop-studio': print('%{_bindir}/dcpomatic2_ecinema', file=f) print('%{_bindir}/dcpomatic2_uuid', file=f) @@ -318,6 +299,9 @@ def make_spec(filename, version, target, options, requires=None): 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}/applications/dcpomatic2_combiner.desktop', file=f) + if os.path.exists(os.path.join(tools, "dcpomatic2_disk")): + print('%{_datadir}/applications/dcpomatic2_disk.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) @@ -326,6 +310,7 @@ def make_spec(filename, version, target, options, requires=None): 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/link.png', file=f) print('%{_datadir}/dcpomatic2/me.jpg', file=f) print('%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf', file=f) print('%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f) @@ -338,8 +323,10 @@ 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) + print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_combiner.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) @@ -377,10 +364,8 @@ def dependencies(target, options): else: ffmpeg_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)] + if target.platform != 'linux' or target.distro != 'arch': + deps = [('ffmpeg-cdist', 'd798b45', ffmpeg_options)] else: # Use distro-provided FFmpeg on Arch deps = [] @@ -390,8 +375,8 @@ def dependencies(target, options): (target.platform == 'osx' and target.bits == 64) or (target.platform == 'windows')) else {} - deps.append(('libdcp', None, cpp_lib_options)) - deps.append(('libsub', None, cpp_lib_options)) + deps.append(('libdcp', '627dfd9', cpp_lib_options)) + deps.append(('libsub', 'efea829', cpp_lib_options)) deps.append(('leqm-nrt', 'carl')) deps.append(('rtaudio', 'carl')) # We get our OpenSSL libraries from the environment, but we @@ -400,14 +385,14 @@ 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 option_defaults = { "gui": True, "variant": None } def configure_options(target, options): - opt = '' + opt = ' --warnings-are-errors' if not (target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04'): # Currently we only build tests on Ubuntu 18.04 @@ -565,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 = '' @@ -687,6 +670,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: