diff options
Diffstat (limited to 'cscript')
| -rw-r--r-- | cscript | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -18,7 +18,7 @@ # along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>. # -# This file is read by the tool "cdist" (git://git.carlh.net/git/cdist.git) +# This file is read by the tool "cdist" (https://git.carlh.net/git/cdist.git) # which is used to build distribution packages and run tests. It relies on # quite a bit of other stuff (e.g. some docker images and qemu VMs) so is # unlikely to be so useful for most people. @@ -56,6 +56,9 @@ for v in ['24.04', '24.10']: for v in ['25.04', '25.10']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-dev', 'python3.13']) +for v in ['26.04']: + deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) + deb_build_depends[v].extend(['libssh-dev', 'python3.14']) for v in ['11']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python3.9']) @@ -188,6 +191,7 @@ 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['25.04'] = debs(boost='1.83.0', icu='76', x264='164', zip='5', fmt='10') deb_depends['25.10'] = debs(boost='1.88.0', icu='76', x264='164', zip='5', fmt='10', xmlsec='1') +deb_depends['26.04'] = debs(boost='1.90.0', icu='78', x264='165', zip='5', fmt='10', xmlsec='1') deb_depends['11'] = copy.deepcopy(deb_depends_base) deb_depends['11'].extend(['libboost-filesystem1.74.0', @@ -502,7 +506,7 @@ def build_with_cpp17(target): def dependencies(target, options): - deps = [('libdcp', 'v1.10.53', {'c++17': build_with_cpp17(target)})] + deps = [('libdcp', 'b47f0559041040495a08eb0b5cc2d62068d83952', {'c++17': build_with_cpp17(target)})] deps.append(('libsub', 'v1.6.59')) deps.append(('leqm-nrt', 'd75d0af984d9c14bfefca8f1bdbc215c3bf3a388')) if target.platform != 'linux' or target.distro != 'arch': @@ -515,7 +519,7 @@ def dependencies(target, options): if can_build_disk(target): deps.append(('lwext4', '5755f8f25aadf18ec49e0350b6daaab3a648b9d7')) if build_tests(target): - deps.append(('ffcmp', 'a398c06349dfbb6f312cefce879294736f298c99')) + deps.append(('ffcmp', '26f17612f391')) return deps @@ -525,7 +529,7 @@ option_defaults = { "gui": True, "variant": None } def build_tests(target): # Currently we only build tests on macOS, Windows, some Ubuntu versions and Arch return ( - (target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ['18.04', '22.04', '24.04', '25.10']) or + (target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ['18.04', '22.04', '24.04', '26.04']) or (target.platform == 'linux' and target.distro == 'arch') or (target.platform == 'osx') or (target.platform == 'windows') |