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

diff --git a/cscript b/cscript
index 3b7dc9de6..c5f10ae84 100644
--- a/cscript
+++ b/cscript
@@ -431,8 +431,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.4'))
+    deps.append(('libsub', 'v1.6.4'))
     deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -694,18 +694,19 @@ 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))
+    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/')
     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))
@@ -714,6 +715,7 @@ def make_appimage(target, nice_name, internal_name, version, extra_bin=None):
         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:
@@ -741,7 +743,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 +804,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')]