From 54010eb460cb1038ded4177154fa63947f766a05 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 1 Mar 2024 13:42:50 +0100
Subject: [PATCH] Build for Ubuntu 24.04.

---
 cscript | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/cscript b/cscript
index 222a911b5..84b6076e6 100644
--- 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',
@@ -728,7 +755,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')
 
-- 
2.30.2