Use stored has_non_zero_entry_point() instead of parsing the DCP again (#2524).

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 7ef3b1c0d46be7c2b954d3643ff8172249381a85..3284a6edea0033e5c99073d293451f1d0d8961e4 100644 (file)
--- a/cscript
+++ b/cscript
@@ -38,6 +38,9 @@ for v in ['22.04']:
 for v in ['23.04', '23.10']:
     deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
     deb_build_depends[v].extend(['libssh-dev', 'python3.11'])
+for v in ['24.04']:
+    deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+    deb_build_depends[v].extend(['libssh-dev', 'python3.12'])
 for v in ['9', '10']:
     deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
     deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python'])
@@ -185,6 +188,30 @@ deb_depends['23.10'].extend(['libboost-filesystem1.74.0',
                              'libwxgtk3.2-1',
                              'libwxgtk-gl3.2-1'])
 
+def debs(boost, icu, x264):
+    output = copy.deepcopy(deb_depends_base)
+    output.extend(['libboost-filesystem' + boost,
+                   'libboost-thread' + boost,
+                   'libboost-regex' + boost,
+                   'libboost-date-time' + boost,
+                   'libcairomm-1.0-1v5',
+                   'libpangomm-1.4-1v5',
+                   'libxml++2.6-2v5',
+                   'libzip4',
+                   'libicu' + icu,
+                   'libnettle8',
+                   'libssh-4',
+                   'libx264-' + x264,
+                   'libcurl4',
+                   'libpulse0',
+                   'libxerces-c3.2',
+                   'libnanomsg5',
+                   'libwxgtk3.2-1',
+                   'libwxgtk-gl3.2-1'])
+    return output
+
+deb_depends['24.04'] = debs(boost='1.83.0', icu='74', x264='164')
+
 deb_depends['9'] = copy.deepcopy(deb_depends_base)
 deb_depends['9'].extend(['libboost-filesystem1.62.0',
                          'libboost-thread1.62.0',
@@ -502,13 +529,13 @@ 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.93'))
-    deps.append(('libsub', 'v1.6.45'))
+    deps.append(('libdcp', 'v1.9.0'))
+    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
@@ -518,7 +545,7 @@ def dependencies(target, options):
     deps.append(('openssl', '54298369cacfe0ae01c5aa42ace8a463fd2e7a2e'))
     if can_build_disk(target):
         deps.append(('lwext4', 'ab082923a791b58478d1d9939d65a0583566ac1f'))
-    deps.append(('ffcmp', '53c853d2935de3f2b0d53777529e48c102afd237'))
+    deps.append(('ffcmp', '5ab6ed3b75d8ca7cf1f66bb9fb08792b92f4b419'))
 
     return deps
 
@@ -563,6 +590,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):
@@ -728,7 +758,7 @@ def package_debian(target, cpu, version, options):
 
     target.set('CDIST_CONFIGURE', '"' + configure_options(target, options, for_package=True) + '"')
     target.set('CDIST_PACKAGE', f'dcpomatic{suffix}')
-    target.set('CDIST_WX_VERSION', "3.2" if target.version in ("23.04", "23.10") else "3.1")
+    target.set('CDIST_WX_VERSION', "3.2" if target.version in ("23.04", "23.10", "24.04") else "3.1")
     if not target.debug:
         target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs')