X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=e91f7361324e4c9487812258c8b2314dcfa3d372;hb=refs%2Fheads%2F2556-subtitles-with-spaces;hp=87e3176f5a38d8b7280d8ee2bbe0718f9bf89ef6;hpb=71bf72cff49e4deb4332bfaab43c9ddd876ca3c5;p=dcpomatic.git diff --git a/cscript b/cscript index 87e3176f5..e91f73613 100644 --- a/cscript +++ b/cscript @@ -35,12 +35,18 @@ for v in ['16.04', '18.04', '20.04', '20.10', '21.04', '21.10']: for v in ['22.04', '22.10']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-dev', 'python3.10']) +for v in ['23.04']: + deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) + deb_build_depends[v].extend(['libssh-dev', 'python3.11']) for v in ['9', '10']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python']) for v in ['11']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python3.9']) +for v in ['12'] + deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) + deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python3.11']) deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base) deb_build_depends['unstable'].extend(['python3']) @@ -157,6 +163,25 @@ deb_depends['22.10'].extend(['libboost-filesystem1.74.0', 'libxerces-c3.2', 'libnanomsg5']) +deb_depends['23.04'] = copy.deepcopy(deb_depends_base) +deb_depends['23.04'].extend(['libboost-filesystem1.74.0', + 'libboost-thread1.74.0', + 'libboost-regex1.74.0', + 'libboost-date-time1.74.0', + 'libcairomm-1.0-1v5', + 'libpangomm-1.4-1v5', + 'libxml++2.6-2v5', + 'libzip4', + 'libicu72', + 'libnettle8', + 'libssh-4', + 'libx264-164', + 'libcurl4', + 'libpulse0', + 'libxerces-c3.2', + 'libnanomsg5', + 'libwxgtk3.2-1', + 'libwxgtk-gl3.2-1']) deb_depends['9'] = copy.deepcopy(deb_depends_base) deb_depends['9'].extend(['libboost-filesystem1.62.0', @@ -229,6 +254,29 @@ deb_depends_gui['11'] = [ 'libxcb-xfixes0', 'libasound2', 'libpulse0' ] +deb_depends['12'] = copy.deepcopy(deb_depends_base) +deb_depends['12'].extend(['libboost-filesystem1.74.0', + 'libboost-thread1.74.0', + 'libboost-regex1.74.0', + 'libboost-date-time1.74.0', + 'libxml++2.6-2v5', + 'libzip4', + 'libcairomm-1.0-1v5', + 'libpangomm-1.4-1v5', + 'libicu72', + 'libssh-4', + 'libssh-gcrypt-4', + 'libnettle8', + 'libx264-164', + 'libcurl4', + 'libxerces-c3.2', + 'libnanomsg5']) + +deb_depends_gui['12'] = [ 'libxcb-xfixes0', + 'libxcb-shape0', + 'libasound2', + 'libpulse0' ] + deb_depends['unstable'] = copy.deepcopy(deb_depends_base) deb_depends['unstable'].extend(['libboost-filesystem1.67.0', 'libboost-thread1.67.0', @@ -355,6 +403,7 @@ def make_spec(filename, version, target, options, requires=None): print('%{_bindir}/dcpomatic2_combiner', file=f) print('%{_bindir}/dcpomatic2_verify', file=f) print('%{_bindir}/dcpomatic2_kdm_inspect', file=f) + print('%{_bindir}/dcpomatic2_map', file=f) if can_build_disk(target): print('%{_bindir}/dcpomatic2_disk', file=f) print('%caps(cap_dac_override=ep) %{_bindir}/dcpomatic2_disk_writer', file=f) @@ -383,6 +432,10 @@ def make_spec(filename, version, target, options, requires=None): 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/add_black.png', file=f) + print('%{_datadir}/dcpomatic2/add_white.png', file=f) + print('%{_datadir}/dcpomatic2/pause_black.png', file=f) + print('%{_datadir}/dcpomatic2/pause_white.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) @@ -448,14 +501,14 @@ def dependencies(target, options): ffmpeg_options = {} if target.platform != 'linux' or target.distro != 'arch': - deps = [('ffmpeg-cdist', '4721b55de017702b0d1c8ce1163331378905c637', ffmpeg_options)] + deps = [('ffmpeg', '2fb5e99b45e92880bd7953cb98c2027a34884c14', ffmpeg_options)] else: # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.8.35')) - deps.append(('libsub', 'v1.6.41')) - deps.append(('leqm-nrt', '93ae9e6')) + deps.append(('libdcp', 'v1.8.73')) + deps.append(('libsub', 'v1.6.44')) + deps.append(('leqm-nrt', '4560105773c66ac9216b62313a24093bb0a027ae')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we # also need a patched openssl binary to make certificates. @@ -463,8 +516,8 @@ def dependencies(target, options): # the appropriate place later deps.append(('openssl', '7f29dd5')) if can_build_disk(target): - deps.append(('lwext4', 'ee865fa65f05e348cd4e0bce0552a2725ad5663a')) - deps.append(('ffcmp', 'da96af56f3ddf074f2044a0cd6e50c95184fd169')) + deps.append(('lwext4', 'ab082923a791b58478d1d9939d65a0583566ac1f')) + deps.append(('ffcmp', '15e7fdf0b3896e3f7323a950105382a9c8ae3c39')) return deps @@ -674,6 +727,7 @@ def package_debian(target, cpu, version, options): target.set('CDIST_CONFIGURE', '"' + configure_options(target, options, for_package=True) + '"') target.set('CDIST_PACKAGE', f'dcpomatic{suffix}') + target.set('CDIST_WX_VERSION', "3.2" if target.version == "23.04" else "3.1") if not target.debug: target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs') @@ -718,7 +772,7 @@ def package_rpm(target, cpu, version, options): return rpms -def make_appimage(target, nice_name, internal_name, version): +def make_appimage(target, nice_name, internal_name, version, extra_binaries=None): nice_filename = nice_name.replace(' ', '_') appdir = f'build/{nice_filename}.AppDir' os.makedirs(f'{appdir}/usr/bin') @@ -726,6 +780,9 @@ def make_appimage(target, nice_name, internal_name, version): target.command(f'cp {target.directory}/src/openssl/apps/openssl {appdir}/usr/bin/dcpomatic2_openssl') target.command(f'cp {target.directory}/bin/dcpverify {appdir}/usr/bin/dcpomatic2_verify') target.command(f'cp {target.directory}/bin/dcpkdm {appdir}/usr/bin/dcpomatic2_kdm_inspect') + if extra_binaries: + for bin in extra_binaries: + target.command(f'cp {target.directory}/bin/{bin} {appdir}/usr/bin') target.command(f'mkdir -p {appdir}/usr/share/libdcp') target.command(f'cp -r {target.directory}/share/dcpomatic2 {appdir}/usr/share/') target.command(f'cp -r {target.directory}/share/libdcp/xsd {appdir}/usr/share/libdcp/') @@ -775,7 +832,7 @@ def package(target, version, options): elif target.platform == 'linux': if target.detail == 'appimage': out = [] - out.append(make_appimage(target, 'DCP-o-matic', 'dcpomatic2', version)) + out.append(make_appimage(target, 'DCP-o-matic', 'dcpomatic2', version, ('dcpomatic2_map', 'dcpomatic2_cli'))) out.append(make_appimage(target, 'DCP-o-matic Player', 'dcpomatic2_player', version)) out.append(make_appimage(target, 'DCP-o-matic Playlist Editor', 'dcpomatic2_playlist', version)) out.append(make_appimage(target, 'DCP-o-matic KDM Creator', 'dcpomatic2_kdm', version))