X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=af1db69a66dd9a908dca48e6cba2a14e5d52fc4b;hb=82f87c7711fb664b06b04d44792ed3820b3d1e01;hp=50eb211d87f31d6a6474c4cc1164dd1e505cb4a3;hpb=118c17b15441d956a6840bfc28e4968758b703fa;p=dcpomatic.git

diff --git a/cscript b/cscript
index 50eb211d8..af1db69a6 100644
--- a/cscript
+++ b/cscript
@@ -430,8 +430,6 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_datadir}/dcpomatic2/zoom_black.png', file=f)
     print('%{_datadir}/dcpomatic2/zoom_all_white.png', file=f)
     print('%{_datadir}/dcpomatic2/zoom_all_black.png', file=f)
-    print('%{_datadir}/dcpomatic2/tick.png', file=f)
-    print('%{_datadir}/dcpomatic2/no_tick.png', file=f)
     print('%{_datadir}/dcpomatic2/link.png', file=f)
     print('%{_datadir}/dcpomatic2/me.jpg', file=f)
     print('%{_datadir}/dcpomatic2/add_black.png', file=f)
@@ -453,7 +451,8 @@ def make_spec(filename, version, target, options, requires=None):
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_disk.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_combiner.png' % r, file=f)
     for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK',
-              'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR', 'sl_SI', 'hu_HU', 'ka_KA']:
+              'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR', 'sl_SI', 'hu_HU',
+              'ka_KA', 'fa_IR']:
         print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f)
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l, file=f)
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f)
@@ -503,23 +502,23 @@ def dependencies(target, options):
         ffmpeg_options = {}
 
     if target.platform != 'linux' or target.distro != 'arch':
-        deps = [('ffmpeg', '7276e269a93c2ae30e302c34708e8095ac5475e8', ffmpeg_options)]
+        deps = [('ffmpeg', '0b73d2f5e70a04a67aa902902c42e3025ef3bb77', ffmpeg_options)]
     else:
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.89'))
-    deps.append(('libsub', 'v1.6.44'))
+    deps.append(('libdcp', 'v1.8.97'))
+    deps.append(('libsub', 'v1.6.47'))
     deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
     # also need a patched openssl binary to make certificates.
     # This dependency is to get that binary, which is added into
     # the appropriate place later
-    deps.append(('openssl', '7f29dd5'))
+    deps.append(('openssl', '54298369cacfe0ae01c5aa42ace8a463fd2e7a2e'))
     if can_build_disk(target):
         deps.append(('lwext4', 'ab082923a791b58478d1d9939d65a0583566ac1f'))
-    deps.append(('ffcmp', '53c853d2935de3f2b0d53777529e48c102afd237'))
+    deps.append(('ffcmp', '5ab6ed3b75d8ca7cf1f66bb9fb08792b92f4b419'))
 
     return deps
 
@@ -564,6 +563,9 @@ def configure_options(target, options, for_package=False):
     if target.platform == 'osx' and target.arch == 'arm64':
         opt += ' --target-macos-arm64 --wx-config=%s/wx-config' % target.bin
 
+    if target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ['22.04']:
+        opt += ' --enable-grok'
+
     return opt
 
 def build(target, options, for_package):
@@ -793,8 +795,8 @@ def make_appimage(target, nice_name, internal_name, version, extra_binaries=None
     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('sudo 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', 'libthai0']:
         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')