X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=cscript;h=591ffd54d764809068cb4f6fd99b519be19befa6;hp=fd2e97ae5bdd563806296ecb0fd20a7561f6cad0;hb=HEAD;hpb=5063594e6836cfabed7d55f4963da9c8cf3b9f11 diff --git a/cscript b/cscript index fd2e97ae5..eb2c8e436 100644 --- a/cscript +++ b/cscript @@ -29,18 +29,27 @@ deb_build_depends = dict() deb_build_depends_base = ['debhelper', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev'] -for v in ['16.04', '18.04', '20.04', '20.10', '21.04', '21.10']: +for v in ['16.04', '18.04', '20.04']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-dev', 'python']) -for v in ['22.04', '22.10']: +for v in ['22.04']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-dev', 'python3.10']) +for v in ['23.04', '23.10']: + deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) + deb_build_depends[v].extend(['libssh-dev', 'python3.11']) +for v in ['24.04']: + deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) + deb_build_depends[v].extend(['libssh-dev', 'python3.12']) 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']) @@ -139,8 +148,8 @@ deb_depends['22.04'].extend(['libboost-filesystem1.74.0', 'libnanomsg5', 'libdav1d5']) -deb_depends['22.10'] = copy.deepcopy(deb_depends_base) -deb_depends['22.10'].extend(['libboost-filesystem1.74.0', +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', @@ -148,15 +157,60 @@ deb_depends['22.10'].extend(['libboost-filesystem1.74.0', 'libpangomm-1.4-1v5', 'libxml++2.6-2v5', 'libzip4', - 'libicu71', + 'libicu72', 'libnettle8', 'libssh-4', 'libx264-164', 'libcurl4', 'libpulse0', 'libxerces-c3.2', - 'libnanomsg5']) + 'libnanomsg5', + 'libwxgtk3.2-1', + 'libwxgtk-gl3.2-1']) +deb_depends['23.10'] = copy.deepcopy(deb_depends_base) +deb_depends['23.10'].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']) + +def debs(boost, icu, x264): + output = copy.deepcopy(deb_depends_base) + output.extend(['libboost-filesystem' + boost, + 'libboost-thread' + boost, + 'libboost-regex' + boost, + 'libboost-date-time' + boost, + 'libcairomm-1.0-1v5', + 'libpangomm-1.4-1v5', + 'libxml++2.6-2v5', + 'libzip4', + 'libicu' + icu, + 'libnettle8', + 'libssh-4', + 'libx264-' + x264, + 'libcurl4', + 'libpulse0', + 'libxerces-c3.2', + 'libnanomsg5', + 'libwxgtk3.2-1', + 'libwxgtk-gl3.2-1']) + return output + +deb_depends['24.04'] = debs(boost='1.83.0', icu='74', x264='164') deb_depends['9'] = copy.deepcopy(deb_depends_base) deb_depends['9'].extend(['libboost-filesystem1.62.0', @@ -229,6 +283,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 +432,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) @@ -379,9 +457,8 @@ def make_spec(filename, version, target, options, requires=None): print('%{_datadir}/dcpomatic2/zoom_black.png', file=f) print('%{_datadir}/dcpomatic2/zoom_all_white.png', file=f) print('%{_datadir}/dcpomatic2/zoom_all_black.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/link_black.png', file=f) + print('%{_datadir}/dcpomatic2/link_white.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) @@ -402,7 +479,8 @@ def make_spec(filename, version, target, options, requires=None): 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', 'sl_SI', 'hu_HU']: + 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR', 'sl_SI', 'hu_HU', + 'ka_KA', 'fa_IR']: 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) @@ -452,23 +530,23 @@ def dependencies(target, options): ffmpeg_options = {} if target.platform != 'linux' or target.distro != 'arch': - deps = [('ffmpeg-cdist', '4721b55de017702b0d1c8ce1163331378905c637', ffmpeg_options)] + deps = [('ffmpeg', '7276e269a93c2ae30e302c34708e8095ac5475e8', ffmpeg_options)] else: # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.8.52')) - deps.append(('libsub', 'v1.6.42')) - deps.append(('leqm-nrt', '93ae9e6')) + deps.append(('libdcp', 'v1.8.100')) + deps.append(('libsub', 'v1.6.47')) + deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we # also need a patched openssl binary to make certificates. # This dependency is to get that binary, which is added into # the appropriate place later - deps.append(('openssl', '7f29dd5')) + deps.append(('openssl', '54298369cacfe0ae01c5aa42ace8a463fd2e7a2e')) if can_build_disk(target): - deps.append(('lwext4', 'ee865fa65f05e348cd4e0bce0552a2725ad5663a')) - deps.append(('ffcmp', 'da96af56f3ddf074f2044a0cd6e50c95184fd169')) + deps.append(('lwext4', 'ab082923a791b58478d1d9939d65a0583566ac1f')) + deps.append(('ffcmp', '53c853d2935de3f2b0d53777529e48c102afd237')) return deps @@ -511,7 +589,7 @@ def configure_options(target, options, for_package=False): opt += ' --enable-disk' if target.platform == 'osx' and target.arch == 'arm64': - opt += ' --target-macos-arm64 --wx-config=%s/wx-config' % target.bin + opt += ' --wx-config=%s/wx-config' % target.bin return opt @@ -678,6 +756,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 in ("23.04", "23.10", "24.04") else "3.1") if not target.debug: target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs') @@ -709,6 +788,8 @@ def package_rpm(target, cpu, version, options): make_spec('dcpomatic2.spec', version, target, options, requires) cmd = 'rpmbuild --define "_topdir %s" -bb dcpomatic2.spec' % topdir + # On Centos 7 we build and install boost ourselves, so we must look for it in the right place + target.set('LINKFLAGS', '-L/usr/local/lib') target.command(cmd) rpms = [] @@ -722,7 +803,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') @@ -730,6 +811,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/') @@ -738,8 +822,8 @@ def make_appimage(target, nice_name, internal_name, version): lib = 'usr/lib/x86_64-linux-gnu' target.command(f'mkdir -p build/{nice_filename}.AppDir/{lib}/gdk-pixbuf-2.0/2.10.0') target.command(f'cp -a /{lib}/gdk-pixbuf-2.0 build/{nice_filename}.AppDir/usr/lib/x86_64-linux-gnu/') - target.command('apt update') - for package in ['libc6', 'libglib2.0-0', 'gnome-settings-daemon-schemas', 'librsvg2-common', 'libgdk-pixbuf2.0-0', 'libpango-1.0-0', 'libpangoft2-1.0-0', 'libpangocairo-1.0-0']: + target.command('sudo apt update') + for package in ['libc6', 'libglib2.0-0', 'gnome-settings-daemon-schemas', 'librsvg2-common', 'libgdk-pixbuf2.0-0', 'libpango-1.0-0', 'libpangoft2-1.0-0', 'libpangocairo-1.0-0', 'libthai0']: target.command(f'apt download {package}') target.command(f'dpkg-deb -x {package}*.deb {appdir}') target.command(f'glib-compile-schemas {appdir}/usr/share/glib-2.0/schemas') @@ -779,7 +863,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)) @@ -804,28 +888,7 @@ def package(target, version, options): if 'part' in options: cmd += ' -b ' + options['part'] target.command(cmd) - packages = [] - for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg'): - a = os.path.abspath(x) - if x.find("Player") != -1: - packages.append((a, "com.dcpomatic.player")) - elif x.find("Playlist Editor") != -1: - packages.append((a, "com.dcpomatic.playlist")) - elif x.find("KDM Creator") != -1: - packages.append((a, "com.dcpomatic.kdm")) - elif x.find("Batch Converter") != -1: - packages.append((a, "com.dcpomatic.batch")) - elif x.find("Encode Server") != -1: - packages.append((a, "com.dcpomatic.server")) - elif x.find("Disk Writer") != -1: - packages.append((a, "com.dcpomatic.disk")) - elif x.find("Combiner") != -1: - packages.append((a, "com.dcpomatic.combiner")) - elif x.find("Editor") != -1: - packages.append((a, "com.dcpomatic.editor")) - else: - packages.append((a, "com.dcpomatic")) - return packages + return glob.glob('build/platform/osx/DCP-o-matic*.dmg') elif target.platform == 'docker': shutil.copyfile(target.deb, 'build/platform/docker') f = open('build/platform/docker/Dockerfile', 'w') @@ -862,7 +925,11 @@ def test(target, options, test): if target.platform == 'windows': cmd = 'run\\tests ' else: - cmd = 'run/tests --check --log_level=test_suite ' + cmd = 'run/tests ' + if target.environment_prefix: + cmd += '-e %s ' % target.environment_prefix + if target.platform != 'windows': + cmd += ' --check --log_level=test_suite ' if target.debug: cmd += '--backtrace ' if test is not None: