X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=cscript;h=90480a34398ad40220e15ca0f6f0751416957ac7;hp=69feeae14074861e3d8be7ccc4780fce3e97273b;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hpb=8b5bfd3cea63a4d6aa48c11d5d56139d18bba080 diff --git a/cscript b/cscript index 69feeae14..90480a343 100644 --- a/cscript +++ b/cscript @@ -1,6 +1,6 @@ # -*- mode: python -*- # -# Copyright (C) 2012-2020 Carl Hetherington +# Copyright (C) 2012-2022 Carl Hetherington # # This file is part of DCP-o-matic. # @@ -32,6 +32,9 @@ deb_build_depends_base = ['debhelper', 'g++', 'pkg-config', 'libsndfile1-dev', ' for v in ['16.04', '18.04', '20.04', '20.10', '21.04', '21.10']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-dev', 'python']) +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 ['9', '10']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python']) @@ -39,7 +42,7 @@ for v in ['11']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python3.9']) deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base) -deb_build_depends['unstable'].extend(['python']) +deb_build_depends['unstable'].extend(['python3']) deb_depends = dict() deb_depends_gui = dict() @@ -98,26 +101,8 @@ deb_depends['20.04'].extend(['libboost-filesystem1.71.0', 'libxerces-c3.2', 'libnanomsg5']) -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', - 'libcairomm-1.0-1v5', - 'libpangomm-1.4-1v5', - 'libxml++2.6-2v5', - 'libzip5', - 'libicu67', - 'libnettle8', - 'libssh-4', - 'libx264-160', - 'libcurl4', - 'libpulse0', - 'libxerces-c3.2', - 'libnanomsg5']) - -deb_depends['21.04'] = copy.deepcopy(deb_depends_base) -deb_depends['21.04'].extend(['libboost-filesystem1.74.0', +deb_depends['21.10'] = copy.deepcopy(deb_depends_base) +deb_depends['21.10'].extend(['libboost-filesystem1.74.0', 'libboost-thread1.74.0', 'libboost-regex1.74.0', 'libboost-date-time1.74.0', @@ -132,10 +117,11 @@ deb_depends['21.04'].extend(['libboost-filesystem1.74.0', 'libcurl4', 'libpulse0', 'libxerces-c3.2', - 'libnanomsg5']) + 'libnanomsg5', + 'libdav1d4']) -deb_depends['21.10'] = copy.deepcopy(deb_depends_base) -deb_depends['21.10'].extend(['libboost-filesystem1.74.0', +deb_depends['22.04'] = copy.deepcopy(deb_depends_base) +deb_depends['22.04'].extend(['libboost-filesystem1.74.0', 'libboost-thread1.74.0', 'libboost-regex1.74.0', 'libboost-date-time1.74.0', @@ -143,14 +129,15 @@ deb_depends['21.10'].extend(['libboost-filesystem1.74.0', 'libpangomm-1.4-1v5', 'libxml++2.6-2v5', 'libzip4', - 'libicu67', + 'libicu70', 'libnettle8', 'libssh-4', - 'libx264-160', + 'libx264-163', 'libcurl4', 'libpulse0', 'libxerces-c3.2', - 'libnanomsg5']) + 'libnanomsg5', + 'libdav1d5']) deb_depends['9'] = copy.deepcopy(deb_depends_base) deb_depends['9'].extend(['libboost-filesystem1.62.0', @@ -215,7 +202,8 @@ deb_depends['11'].extend(['libboost-filesystem1.74.0', 'libx264-160', 'libcurl4', 'libxerces-c3.2', - 'libnanomsg5']) + 'libnanomsg5', + 'libdav1d4']) deb_depends_gui['11'] = [ 'libxcb-xfixes0', 'libxcb-shape0', @@ -234,7 +222,8 @@ deb_depends['unstable'].extend(['libboost-filesystem1.67.0', 'libnettle6', 'libx264-155', 'libcurl4', - 'libxerces-c3.2']) + 'libxerces-c3.2', + 'libdav1d4']) def can_build_disk(target): # We can build dcpomatic2_disk on platforms that have Boost process and can build the lwext4 @@ -280,6 +269,8 @@ def make_control(debian_version, bits, filename, debug, gui): print('', file=f) suffix = '' if gui else '-cli' print(f'Package: dcpomatic{suffix}', file=f) + if gui: + print('Replaces: dcpomatic-cli', file=f) if bits == 32: print('Architecture: i386', file=f) else: @@ -314,7 +305,6 @@ def make_control(debian_version, bits, filename, debug, gui): def make_spec(filename, version, target, options, requires=None): """Make a .spec file for a RPM build""" - tools = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(filename))), "src/tools") f = open(filename, 'w') print('Summary:A program that generates Digital Cinema Packages (DCPs) from video and audio files', file=f) print('Name:dcpomatic2', file=f) @@ -335,6 +325,7 @@ def make_spec(filename, version, target, options, requires=None): print('%{_bindir}/dcpomatic2_batch', file=f) print('%{_bindir}/dcpomatic2_cli', file=f) print('%{_bindir}/dcpomatic2_create', file=f) + print('%{_bindir}/dcpomatic2_editor', file=f) print('%{_bindir}/dcpomatic2_kdm', file=f) print('%{_bindir}/dcpomatic2_server', file=f) print('%{_bindir}/dcpomatic2_server_cli', file=f) @@ -344,17 +335,18 @@ def make_spec(filename, version, target, options, requires=None): print('%{_bindir}/dcpomatic2_openssl', file=f) print('%{_bindir}/dcpomatic2_combiner', file=f) print('%{_bindir}/dcpomatic2_verify', file=f) - if os.path.exists(os.path.join(tools, "dcpomatic2_disk")): + if can_build_disk(target): print('%{_bindir}/dcpomatic2_disk', file=f) print('%caps(cap_dac_override=ep) %{_bindir}/dcpomatic2_disk_writer', file=f) print('%{_datadir}/applications/dcpomatic2.desktop', file=f) print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f) + print('%{_datadir}/applications/dcpomatic2_editor.desktop', file=f) 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}/applications/dcpomatic2_combiner.desktop', file=f) - if os.path.exists(os.path.join(tools, "dcpomatic2_disk")): + if can_build_disk(target): print('%{_datadir}/applications/dcpomatic2_disk.desktop', file=f) print('%{_datadir}/dcpomatic2/dcpomatic2_server_small.png', file=f) print('%{_datadir}/dcpomatic2/select.png', file=f) @@ -373,6 +365,7 @@ def make_spec(filename, version, target, options, requires=None): for r in ['128x128', '16x16', '22x22', '256x256', '32x32', '48x48', '512x512', '64x64']: print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r, file=f) + print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_editor.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.png' % r, file=f) @@ -386,6 +379,7 @@ def make_spec(filename, version, target, options, requires=None): print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f) print('%{_datadir}/libdcp/tags/*', file=f) print('%{_datadir}/libdcp/xsd/*', file=f) + print('%{_datadir}/libdcp/ratings', file=f) print('%{_datadir}/polkit-1/actions/com.dcpomatic.write-drive.policy', file=f) print('', file=f) print('%prep', file=f) @@ -395,7 +389,7 @@ def make_spec(filename, version, target, options, requires=None): print('cd dcpomatic-%s' % version, file=f) print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:%s/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig' % (target.directory, target.directory), file=f) print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%%{buildroot}/usr --destdir=/usr %s' % - (target.directory, target.directory, configure_options(target, options)), file=f) + (target.directory, target.directory, configure_options(target, options, for_package=True)), file=f) print('./waf', file=f) print('%install', file=f) print('cd dcpomatic-%s' % version, file=f) @@ -404,6 +398,7 @@ def make_spec(filename, version, target, options, requires=None): print('/bin/mkdir -p %{buildroot}/usr/share/libdcp', file=f) print('/bin/cp -r %s/src/libdcp/tags %%{buildroot}/usr/share/libdcp' % target.directory, file=f) print('/bin/cp -r %s/src/libdcp/xsd %%{buildroot}/usr/share/libdcp' % target.directory, file=f) + print('/bin/cp %s/src/libdcp/ratings %%{buildroot}/usr/share/libdcp' % target.directory, file=f) print('/bin/mv %s/bin/dcpverify %%{buildroot}/usr/bin/dcpomatic2_verify' % target.directory, file=f) print('', file=f) print('%post', file=f) @@ -427,13 +422,13 @@ def dependencies(target, options): ffmpeg_options = {} if target.platform != 'linux' or target.distro != 'arch': - deps = [('ffmpeg-cdist', '107f9af8', ffmpeg_options)] + deps = [('ffmpeg-cdist', '4721b55de017702b0d1c8ce1163331378905c637', ffmpeg_options)] else: # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.8.5')) - deps.append(('libsub', 'v1.6.5')) + deps.append(('libdcp', 'v1.8.22')) + deps.append(('libsub', 'v1.6.23')) deps.append(('leqm-nrt', '93ae9e6')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we @@ -443,25 +438,27 @@ def dependencies(target, options): deps.append(('openssl', '7f29dd5')) if can_build_disk(target): deps.append(('lwext4', 'cce3730')) - deps.append(('ffcmp', '6259cd4')) + deps.append(('ffcmp', 'da96af56f3ddf074f2044a0cd6e50c95184fd169')) return deps option_defaults = { "gui": True, "variant": None } -def configure_options(target, options): +def configure_options(target, options, for_package=False): opt = ' --warnings-are-errors' - if not ((target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04') or + if for_package or not ( + (target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04') or (target.platform == 'osx') or - (target.platform == 'windows')): + (target.platform == 'windows') + ): # Currently we only build tests on Ubuntu 18.04, macOS and Windows opt += ' --disable-tests' if target.debug: opt += ' --enable-debug' if target.platform == 'windows': - opt += ' --target-windows' + opt += f' --target-windows-{target.bits}' elif target.platform == 'linux': opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml' if target.distro == 'centos': @@ -488,7 +485,7 @@ def configure_options(target, options): return opt -def build(target, options): +def build(target, options, for_package): if target.platform == 'flatpak': target.checkout_dependencies() prefix = 'https://dcpomatic.com/deps' @@ -603,8 +600,8 @@ def build(target, options): with open('build/com.dcpomatic.DCP-o-matic.json', 'w') as outfile: json.dump(desc, outfile) target.command('%s --repo=build/platform/repo build/platform/flatpak build/com.dcpomatic.DCP-o-matic.json' % target.flatpak_builder()) - else: - target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options))) + elif target.platform != 'linux' or target.detail == 'appimage' or not for_package: + target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options, for_package))) target.command('./waf') target.command('./waf install') @@ -649,10 +646,10 @@ def package_debian(target, cpu, version, options): target.set('CDIST_PKG_CONFIG_PATH', target.get('PKG_CONFIG_PATH')) target.set('CDIST_DIRECTORY', target.directory) - target.set('CDIST_CONFIGURE', '"' + configure_options(target, options) + '"') + target.set('CDIST_CONFIGURE', '"' + configure_options(target, options, for_package=True) + '"') target.set('CDIST_PACKAGE', f'dcpomatic{suffix}') - if target.debug: - target.set('CDIST_DEBUG_PACKAGE_FLAG', f'--dbg-package=dcpomatic{suffix}-dbg') + if not target.debug: + target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs') target.command('dpkg-buildpackage -uc -us') @@ -678,10 +675,10 @@ def package_rpm(target, cpu, version, options): requires = None if target.distro == 'mageia': - requires = "lib64xmlsec1-devel lib64canberra-gtk0" + requires = "lib64xmlsec1-devel lib64canberra-gtk0 libcap-utils" - make_spec('build/platform/linux/dcpomatic2.spec', version, target, options, requires) - cmd = 'rpmbuild --define "_topdir %s" -bb build/platform/linux/dcpomatic2.spec' % topdir + make_spec('dcpomatic2.spec', version, target, options, requires) + cmd = 'rpmbuild --define "_topdir %s" -bb dcpomatic2.spec' % topdir target.command(cmd) rpms = [] @@ -706,9 +703,19 @@ def make_appimage(target, nice_name, internal_name, version): 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/') target.command(f'cp -r {target.directory}/share/libdcp/tags {appdir}/usr/share/libdcp/') + target.command(f'cp {target.directory}/share/libdcp/ratings {appdir}/usr/share/libdcp/') 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(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') + target.command(f'sed -i -e "s|/usr/lib/x86_64-linux-gnu/gdk-pixbuf-.*/.*/loaders/||g" {appdir}/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders.cache') + # Stop anything loading from outside the AppImage + target.command(f'sed -i -e "s|/usr|/xxx|g" {appdir}/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2') + if internal_name == 'dcpomatic2_disk': target.command(f'mkdir -p {appdir}/usr/share/polkit-1/actions') target.command(f'cp {target.directory}/share/polkit-1/actions/com.dcpomatic.write-drive.policy {appdir}/usr/share/polkit-1/actions') @@ -717,7 +724,9 @@ def make_appimage(target, nice_name, internal_name, version): print('#!/bin/bash', file=f) print('export PATH=$APPDIR/usr/bin:$PATH', file=f) print('export XDG_DATA_DIRS="$APPDIR/usr/share/:/usr/share/:$XDG_DATA_DIRS"', file=f) - print('export LD_LIBRARY_PATH=$APPDIR/usr/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}', file=f) + print('export GDK_PIXBUF_MODULEDIR=$(readlink -f "$APPDIR"/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/ )', file=f) + print('export GDK_PIXBUF_MODULE_FILE=$(readlink -f "$APPDIR"/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders.cache )', file=f) + print('export LD_LIBRARY_PATH=$GDK_PIXBUF_MODULEDIR:$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu', file=f) print(f'"$APPDIR"/usr/bin/{internal_name} $@', file=f) target.command(f'chmod a+rx {appdir}/AppRun') with open(f'{appdir}/{internal_name}.desktop', 'w') as f: @@ -746,6 +755,7 @@ def package(target, version, options): 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 Combiner', 'dcpomatic2_combiner', version)) + out.append(make_appimage(target, 'DCP-o-matic Editor', 'dcpomatic2_editor', version)) return out else: if target.bits == 32: @@ -777,6 +787,8 @@ def package(target, version, options): 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