diff options
Diffstat (limited to 'cscript')
| -rw-r--r-- | cscript | 18 |
1 files changed, 11 insertions, 7 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', @@ -449,7 +453,7 @@ def make_spec(filename, version, target, options, requires=None): print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_combiner.png' % r, file=f) for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'ko_KR', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR', 'sl_SI', - 'hu_HU', 'fa_IR', 'ja_JP']: + 'hu_HU', 'fa_IR', 'ja_JP', 'el_GR']: print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f) print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l, file=f) print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f) @@ -502,8 +506,8 @@ def build_with_cpp17(target): def dependencies(target, options): - deps = [('libdcp', 'fa4f6f1c83590793b92defeb04d0a68e7b4c39cf', {'c++17': build_with_cpp17(target)})] - deps.append(('libsub', 'v1.6.58')) + deps = [('libdcp', 'c65352a1a7b77dc2665c176b0631c9576a431aaa', {'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': # We get our OpenSSL libraries from the environment, but we @@ -515,7 +519,7 @@ def dependencies(target, options): if can_build_disk(target): deps.append(('lwext4', '5755f8f25aadf18ec49e0350b6daaab3a648b9d7')) if build_tests(target): - deps.append(('ffcmp', '11d2e6cafce8c041f034b99d2912c2275b523e47')) + deps.append(('ffcmp', '42c22683ee4c29b2cba7797d5d5c2367317f3f0d')) 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') @@ -579,7 +583,7 @@ def configure_options(target, options, for_package=False): if target.platform == 'linux' and ( (target.distro == 'ubuntu' and target.version == "24.04") or - (target.distro == 'fedora' and target.version == "42") + (target.distro == 'fedora' and target.version in ("42", "43")) ): opt += ' --enable-grok' |