X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=04c183d669aad300e5029d8a8aad63a8d3808a73;hb=72218f61297458b142e5a2397b01e482d2097270;hp=3b7dc9de64f5b0b53649c418563a4ec52388fea3;hpb=21333e55ec55cce4d8fcf5bb7fa1e21292fc9c17;p=dcpomatic.git

diff --git a/cscript b/cscript
index 3b7dc9de6..04c183d66 100644
--- a/cscript
+++ b/cscript
@@ -408,6 +408,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)
@@ -431,8 +432,8 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'b3cb9c0'))
-    deps.append(('libsub', '587e475'))
+    deps.append(('libdcp', 'v1.8.6'))
+    deps.append(('libsub', 'v1.6.6'))
     deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -694,39 +695,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"""
@@ -741,7 +756,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:
@@ -803,8 +817,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')]