X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=cscript;h=ddb4cbf4d300b02cbe270e79effdefae0db09347;hp=fd2e97ae5bdd563806296ecb0fd20a7561f6cad0;hb=94c5406966c255fc5f9d265b09b3f16441e36ca4;hpb=5063594e6836cfabed7d55f4963da9c8cf3b9f11 diff --git a/cscript b/cscript index fd2e97ae5..ddb4cbf4d 100644 --- a/cscript +++ b/cscript @@ -35,6 +35,9 @@ for v in ['16.04', '18.04', '20.04', '20.10', '21.04', '21.10']: for v in ['22.04', '22.10']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-dev', 'python3.10']) +for v in ['23.04']: + deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) + deb_build_depends[v].extend(['libssh-dev', 'python3.11']) for v in ['9', '10']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python']) @@ -157,6 +160,23 @@ deb_depends['22.10'].extend(['libboost-filesystem1.74.0', 'libxerces-c3.2', 'libnanomsg5']) +deb_depends['23.04'] = copy.deepcopy(deb_depends_base) +deb_depends['23.04'].extend(['libboost-filesystem1.74.0', + 'libboost-thread1.74.0', + 'libboost-regex1.74.0', + 'libboost-date-time1.74.0', + 'libcairomm-1.0-1v5', + 'libpangomm-1.4-1v5', + 'libxml++2.6-2v5', + 'libzip4', + 'libicu72', + 'libnettle8', + 'libssh-4', + 'libx264-164', + 'libcurl4', + 'libpulse0', + 'libxerces-c3.2', + 'libnanomsg5']) deb_depends['9'] = copy.deepcopy(deb_depends_base) deb_depends['9'].extend(['libboost-filesystem1.62.0', @@ -457,9 +477,9 @@ def dependencies(target, options): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.8.52')) - deps.append(('libsub', 'v1.6.42')) - deps.append(('leqm-nrt', '93ae9e6')) + deps.append(('libdcp', 'v1.8.64')) + deps.append(('libsub', 'v1.6.44')) + deps.append(('leqm-nrt', '4560105773c66ac9216b62313a24093bb0a027ae')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we # also need a patched openssl binary to make certificates. @@ -467,7 +487,7 @@ def dependencies(target, options): # the appropriate place later deps.append(('openssl', '7f29dd5')) if can_build_disk(target): - deps.append(('lwext4', 'ee865fa65f05e348cd4e0bce0552a2725ad5663a')) + deps.append(('lwext4', 'b98f55b806f9dfe9e9374faceed99b689c29f28e')) deps.append(('ffcmp', 'da96af56f3ddf074f2044a0cd6e50c95184fd169')) return deps @@ -678,6 +698,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 == "23.04" else "3.1") if not target.debug: target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs')