From 3bfd243404c3d03492bf3a740f09f932db6bf9e8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 4 Sep 2024 22:35:19 +0200 Subject: Support building on Ubuntu 24.10. --- cscript | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 68e62c581..284facb60 100644 --- a/cscript +++ b/cscript @@ -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') -- cgit v1.2.3 From 07154903ef7d52f1b41b7ddd9f6e1b0ecca9d0b2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 6 Sep 2024 12:05:29 +0200 Subject: Remove (unused) import which is no longer present on Python 3.14. --- cscript | 4 ++-- waf-tools/clang_compilation_database.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 284facb60..0437c0131 100644 --- a/cscript +++ b/cscript @@ -536,8 +536,8 @@ def dependencies(target, options): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.8.103')) - deps.append(('libsub', 'v1.6.49')) + deps.append(('libdcp', 'v1.8.104')) + deps.append(('libsub', 'v1.6.52')) deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we diff --git a/waf-tools/clang_compilation_database.py b/waf-tools/clang_compilation_database.py index 189de1eb6..982e150f3 100644 --- a/waf-tools/clang_compilation_database.py +++ b/waf-tools/clang_compilation_database.py @@ -14,7 +14,7 @@ Usage: conf.load('clang_compilation_database') """ -import sys, os, json, shlex, pipes +import sys, os, json, shlex from waflib import Logs, TaskGen, Task Task.Task.keep_last_cmd = True -- cgit v1.2.3