X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=10cae806f46f13bb075ee0d1f98f53090fee0e74;hb=83b80141967c7796dedde6c84000622128c038c7;hp=deddcb51aaa5d09f65ae84db5b819384fcf308ff;hpb=0ede9dccbebd6a95b18cb747d73c1dcefd859373;p=dcpomatic.git diff --git a/cscript b/cscript index deddcb51a..10cae806f 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. # @@ -27,15 +27,19 @@ import json deb_build_depends = dict() -deb_build_depends_base = ['debhelper', 'python', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev'] +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']: +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']) + deb_build_depends[v].extend(['libssh-dev', 'python']) for v in ['9', '10']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) - deb_build_depends[v].extend(['libssh-gcrypt-dev']) + 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']) deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base) +deb_build_depends['unstable'].extend(['python']) deb_depends = dict() deb_depends_gui = dict() @@ -51,7 +55,6 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0', 'libzip4', 'libcairomm-1.0-1v5', 'libpangomm-1.4-1v5', - 'libwxgtk3.0-0v5', 'libicu55', 'libnettle6', 'libssh-4', @@ -68,7 +71,6 @@ deb_depends['18.04'].extend(['libboost-filesystem1.65.1', 'libpangomm-1.4-1v5', 'libxml++2.6-2v5', 'libzip4', - 'libwxgtk3.0-0v5', 'libicu60', 'libnettle6', 'libssh-4', @@ -132,6 +134,24 @@ deb_depends['21.04'].extend(['libboost-filesystem1.74.0', 'libxerces-c3.2', 'libnanomsg5']) +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', + 'libcairomm-1.0-1v5', + 'libpangomm-1.4-1v5', + 'libxml++2.6-2v5', + 'libzip4', + 'libicu67', + 'libnettle8', + 'libssh-4', + 'libx264-160', + 'libcurl4', + 'libpulse0', + 'libxerces-c3.2', + 'libnanomsg5', + 'libdav1d4']) deb_depends['9'] = copy.deepcopy(deb_depends_base) deb_depends['9'].extend(['libboost-filesystem1.62.0', @@ -151,8 +171,7 @@ deb_depends['9'].extend(['libboost-filesystem1.62.0', 'libcurl3', 'libxerces-c3.1']) -deb_depends_gui['9'] = [ 'libwxgtk3.0-0v5', - 'libxcb-xfixes0', +deb_depends_gui['9'] = [ 'libxcb-xfixes0', 'libxcb-shape0', 'libasound2', 'libpulse0' ] @@ -176,8 +195,31 @@ deb_depends['10'].extend(['libboost-filesystem1.67.0', 'libxerces-c3.2', 'libnanomsg5']) -deb_depends_gui['10'] = [ 'libwxgtk3.0-0v5', - 'libxcb-xfixes0', +deb_depends_gui['10'] = [ 'libxcb-xfixes0', + 'libxcb-shape0', + 'libasound2', + 'libpulse0' ] + +deb_depends['11'] = copy.deepcopy(deb_depends_base) +deb_depends['11'].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', + 'libicu67', + 'libssh-4', + 'libssh-gcrypt-4', + 'libnettle8', + 'libx264-160', + 'libcurl4', + 'libxerces-c3.2', + 'libnanomsg5', + 'libdav1d4']) + +deb_depends_gui['11'] = [ 'libxcb-xfixes0', 'libxcb-shape0', 'libasound2', 'libpulse0' ] @@ -194,7 +236,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 @@ -238,7 +281,8 @@ def make_control(debian_version, bits, filename, debug, gui): print('Standards-Version: 3.9.3', file=f) print('Homepage: https://dcpomatic.com/', file=f) print('', file=f) - print('Package: dcpomatic', file=f) + suffix = '' if gui else '-cli' + print(f'Package: dcpomatic{suffix}', file=f) if bits == 32: print('Architecture: i386', file=f) else: @@ -254,10 +298,12 @@ def make_control(debian_version, bits, filename, debug, gui): print(' DCP-o-matic generates Digital Cinema Packages (DCPs) from videos, images,', file=f) print(' sound and subtitle files. You can use it to make content for playback on DCI-compliant', file=f) print(' cinema projectors.', file=f) + if not gui: + print(' This package contains the command-line tools only.', file=f) if debug: print('', file=f) - print('Package: dcpomatic-dbg', file=f) + print(f'Package: dcpomatic{suffix}-dbg', file=f) if bits == 32: print('Architecture: i386', file=f) else: @@ -365,6 +411,7 @@ def make_spec(filename, version, target, options, requires=None): print('', file=f) print('%post', file=f) print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f) + print('setcap "cap_dac_override+ep cap_sys_admin+ep" /usr/bin/dcpomatic2_disk_writer', file=f) print('', file=f) print('%postun', file=f) print('if [ $1 -eq 0 ] ; then', file=f) @@ -383,13 +430,13 @@ def dependencies(target, options): ffmpeg_options = {} if target.platform != 'linux' or target.distro != 'arch': - deps = [('ffmpeg-cdist', '107f9af8', ffmpeg_options)] + deps = [('ffmpeg-cdist', 'cb2b073d4f88230fca1d1d74e45235f5268fd825', ffmpeg_options)] else: # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', '6384002')) - deps.append(('libsub', '55ebde1')) + deps.append(('libdcp', 'v1.8.7')) + deps.append(('libsub', 'v1.6.7')) deps.append(('leqm-nrt', '93ae9e6')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we @@ -398,8 +445,8 @@ def dependencies(target, options): # the appropriate place later deps.append(('openssl', '7f29dd5')) if can_build_disk(target): - deps.append(('lwext4', '9d20ec5')) - deps.append(('ffcmp', '6259cd4')) + deps.append(('lwext4', 'cce3730')) + deps.append(('ffcmp', '10934f1a9cd9770ef0b38da153f9576e77e7e925')) return deps @@ -582,14 +629,15 @@ def package_windows(target): def package_debian(target, cpu, version, options): make_control(target.version, target.bits, 'debian/control', target.debug, options['gui']) - if target.version != '9' and target.version != '16.04': + if target.version != '9' and target.version != '16.04' and options['gui']: with open('debian/postinst', 'w') as f: print('#!/bin/sh', file=f) # Get the required capability to write to disks - print('setcap cap_dac_override+ep /usr/bin/dcpomatic2_disk_writer', file=f) + print('setcap "cap_dac_override+ep cap_sys_admin+ep" /usr/bin/dcpomatic2_disk_writer', file=f) target.command('./waf dist') f = open('debian/files', 'w') - print('dcpomatic_%s-1_%s.deb video extra' % (version, cpu), file=f) + suffix = '' if options['gui'] else '-cli' + print(f'dcpomatic{suffix}_{version}-1_{cpu}.deb video extra', file=f) shutil.rmtree('build/deb', ignore_errors=True) os.makedirs('build/deb') @@ -605,8 +653,9 @@ def package_debian(target, cpu, version, options): target.set('CDIST_DIRECTORY', target.directory) target.set('CDIST_CONFIGURE', '"' + configure_options(target, options) + '"') + target.set('CDIST_PACKAGE', f'dcpomatic{suffix}') if target.debug: - target.set('CDIST_DEBUG_PACKAGE', '--dbg-package=dcpomatic-dbg') + target.set('CDIST_DEBUG_PACKAGE_FLAG', f'--dbg-package=dcpomatic{suffix}-dbg') target.command('dpkg-buildpackage -uc -us') @@ -632,7 +681,7 @@ 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 @@ -649,39 +698,53 @@ def package_rpm(target, cpu, version, options): return rpms -def make_appimage(target, nice_name, internal_name, version, extra_bin=None): +def make_appimage(target, nice_name, internal_name, version): nice_filename = nice_name.replace(' ', '_') - os.makedirs('build/%s.AppDir/usr/bin' % nice_filename) - target.command('cp %s/bin/%s build/%s.AppDir/usr/bin' % (target.directory, internal_name, nice_filename)) - if extra_bin: - target.command('cp %s/bin/%s build/%s.AppDir/usr/bin' % (target.directory, extra_bin, nice_filename)) - target.command('cp %s/src/openssl/apps/openssl build/%s.AppDir/usr/bin/dcpomatic2_openssl' % (target.directory, nice_filename)) - target.command('cp %s/bin/dcpverify build/%s.AppDir/usr/bin/dcpomatic2_verify' % (target.directory, nice_filename)) - target.command('mkdir -p build/%s.AppDir/usr/share/libdcp' % nice_filename) - target.command('cp -r %s/share/dcpomatic2 build/%s.AppDir/usr/share/' % (target.directory, nice_filename)) - target.command('cp -r %s/share/libdcp/xsd build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename)) - target.command('cp -r %s/share/libdcp/tags build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename)) + appdir = f'build/{nice_filename}.AppDir' + os.makedirs(f'{appdir}/usr/bin') + target.command(f'cp {target.directory}/bin/{internal_name} {appdir}/usr/bin') + 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'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/') + target.command(f'cp -r {target.directory}/share/libdcp/tags {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('mkdir -p build/%s.AppDir/usr/share/polkit-1/actions' % nice_filename) - target.command('cp %s/share/polkit-1/actions/com.dcpomatic.write-drive.policy build/%s.AppDir/usr/share/polkit-1/actions' % (target.directory, nice_filename)) + 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') - with open('build/%s.AppDir/AppRun' % nice_filename, 'w') as f: + with open(f'{appdir}/AppRun', 'w') as f: 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('"$APPDIR"/usr/bin/%s $@' % internal_name, file=f) - target.command('chmod a+rx build/%s.AppDir/AppRun' % nice_filename) - with open('build/%s.AppDir/%s.desktop' % (nice_filename, internal_name), 'w') as 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: print('[Desktop Entry]', file=f) print('Type=Application', file=f) print('Categories=AudioVideo;', file=f) - print('Name=%s' % nice_name, file=f) - print('Icon=%s' % internal_name, file=f) - target.command('cp graphics/linux/256/%s.png build/%s.AppDir' % (internal_name, nice_filename)) - target.command('linuxdeploy-x86_64.AppImage --appdir build/%s.AppDir' % nice_filename) - target.command('appimagetool-x86_64.AppImage build/%s.AppDir' % nice_filename) - target.command('mv %s-x86_64.AppImage build/%s-%s-x86_64.AppImage' % (nice_filename, nice_filename, version)) - return os.path.abspath('build/%s-%s-x86_64.AppImage' % (nice_filename, version)) + print(f'Name={nice_name}', file=f) + print(f'Icon={internal_name}', file=f) + target.command(f'cp graphics/linux/256/{internal_name}.png {appdir}') + target.command(f'linuxdeploy-x86_64.AppImage --appdir {appdir}') + target.command(f'appimagetool-x86_64.AppImage {appdir}') + target.command(f'mv {nice_filename}-x86_64.AppImage build/{nice_filename}-{version}-x86_64.AppImage') + return os.path.abspath(f'build/{nice_filename}-{version}-x86_64.AppImage') def package(target, version, options): """version: DCP-o-matic version string""" @@ -696,7 +759,6 @@ 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, "dcpomatic2_disk_writer")) out.append(make_appimage(target, 'DCP-o-matic Combiner', 'dcpomatic2_combiner', version)) return out else: @@ -758,8 +820,8 @@ def make_pot(target): os.path.abspath('build/src/tools/dcpomatic.pot')] def make_manual(target): + target.command('make -C doc/manual LIBDCP=../../../libdcp') os.chdir('doc/manual') - target.command('make') target.command('pdflatex colour.tex') return [os.path.abspath('pdf'), os.path.abspath('html'), os.path.abspath('colour.pdf')]