Rename image -> video.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index d713c383848ef6a335adef90354aeb989805d0ad..b6d00b8ce601c9b0e121840fe27351c29e27f13e 100644 (file)
--- a/cscript
+++ b/cscript
@@ -29,7 +29,7 @@ deb_build_depends = dict()
 
 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', 'python'])
 for v in ['9', '10']:
@@ -55,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',
@@ -72,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',
@@ -136,6 +134,23 @@ 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'])
 
 deb_depends['9'] = copy.deepcopy(deb_depends_base)
 deb_depends['9'].extend(['libboost-filesystem1.62.0',
@@ -155,8 +170,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' ]
@@ -180,8 +194,7 @@ 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' ]
@@ -204,8 +217,7 @@ deb_depends['11'].extend(['libboost-filesystem1.74.0',
                           'libxerces-c3.2',
                           'libnanomsg5'])
 
-deb_depends_gui['11'] = [ 'libwxgtk3.0-gtk3-0v5',
-                          'libxcb-xfixes0',
+deb_depends_gui['11'] = [ 'libxcb-xfixes0',
                           'libxcb-shape0',
                           'libasound2',
                           'libpulse0' ]
@@ -694,6 +706,9 @@ def make_appimage(target, nice_name, internal_name, version, extra_bin=None):
     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))
@@ -702,6 +717,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: