diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-09-04 22:35:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-09-06 11:05:38 +0200 |
| commit | 3bfd243404c3d03492bf3a740f09f932db6bf9e8 (patch) | |
| tree | 54a40e941051da348c1baa9189c5a295c2939aa5 | |
| parent | 4049ec5e8bdddbc48689521a26bf47236c2b490d (diff) | |
Support building on Ubuntu 24.10.
| -rw-r--r-- | cscript | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -38,7 +38,7 @@ 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']: +for v in ['24.04', '24.10']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-dev', 'python3.12']) for v in ['9', '10']: @@ -211,6 +211,7 @@ def debs(boost, icu, x264): return output deb_depends['24.04'] = debs(boost='1.83.0', icu='74', x264='164') +deb_depends['24.10'] = 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', @@ -758,7 +759,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", "24.04") else "3.1") + target.set('CDIST_WX_VERSION', "3.1" if target.version in ("16.04", "18.04", "20.04", "22.04") else "3.2") if not target.debug: target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs') |