diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-09-21 11:53:32 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-09-21 11:53:32 +0200 |
| commit | a285abf09235bc814fdc0acbdac837d360a10357 (patch) | |
| tree | 072845e71d4fad990ddf05aec3db98c2be4e6478 /cscript | |
| parent | a9cb7313f7846f8b2bf9f96d19cf28abd7caf7fc (diff) | |
| parent | ffa9430ad7519fb1b291af74f3bdae74cc26f453 (diff) | |
Merge remote-tracking branch 'origin/main' into v2.17.x
Diffstat (limited to 'cscript')
| -rw-r--r-- | cscript | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -535,7 +535,7 @@ def make_spec(filename, version, target, options, requires=None): print('/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :', file=f) def dependencies(target, options): - deps = [('libdcp', 'v1.9.20', {'c++17': target.platform.startswith('osx')})] + deps = [('libdcp', 'v1.9.21', {'c++17': target.platform.startswith('osx')})] deps.append(('libsub', 'v1.6.52')) deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23')) deps.append(('rtaudio', 'f619b76')) @@ -767,8 +767,16 @@ def package_debian(target, cpu, version, options): target.set('CDIST_DIRECTORY', target.directory) target.set('CDIST_CONFIGURE', '"' + configure_options(target, options, for_package=True) + '"') +<<<<<<< HEAD target.set('CDIST_PACKAGE', f'{name}{suffix}') target.set('CDIST_WX_VERSION', "3.1" if target.version in ("16.04", "18.04", "20.04", "22.04") else "3.2") +||||||| 4f850f995 + target.set('CDIST_PACKAGE', f'dcpomatic{suffix}') + target.set('CDIST_WX_VERSION', "3.1" if target.version in ("16.04", "18.04", "20.04", "22.04") else "3.2") +======= + target.set('CDIST_PACKAGE', f'dcpomatic{suffix}') + target.set('CDIST_WX_VERSION', "3.1" if target.version in ("16.04", "18.04", "20.04", "22.04", "unstable", "11", "12") else "3.2") +>>>>>>> origin/main if not target.debug: target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs') |