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)
ffmpeg_options = {}
if target.platform != 'linux' or target.distro != 'arch':
- deps = [('ffmpeg-cdist', '107f9af8', ffmpeg_options)]
+ deps = [('ffmpeg-cdist', '4c5269fa', 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', '24e7ed8'))
+ deps.append(('libsub', 'bc00091'))
deps.append(('leqm-nrt', '93ae9e6'))
deps.append(('rtaudio', 'f619b76'))
# We get our OpenSSL libraries from the environment, but we
deps.append(('openssl', '7f29dd5'))
if can_build_disk(target):
deps.append(('lwext4', 'cce3730'))
- deps.append(('ffcmp', '6259cd4'))
+ deps.append(('ffcmp', 'b9b29fc6'))
return deps
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))
- 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('export LD_LIBRARY_PATH=$APPDIR/usr/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}', 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"""