X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=222a911b52b5a78eca527e4b8dab8707b5534af3;hb=9d843365fb77e00dd31c03d1e8ea49126ab550f2;hp=75a6aa6c5d68c11c9f06460a0cd673afe911e225;hpb=c505a48de5f77c35865fe2676af10d36830cc9ba;p=dcpomatic.git diff --git a/cscript b/cscript index 75a6aa6c5..222a911b5 100644 --- a/cscript +++ b/cscript @@ -29,13 +29,13 @@ deb_build_depends = dict() deb_build_depends_base = ['debhelper', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev', 'libx264-dev'] -for v in ['16.04', '18.04', '20.04', '20.10', '21.04', '21.10']: +for v in ['16.04', '18.04', '20.04']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-dev', 'python']) -for v in ['22.04', '22.10']: +for v in ['22.04']: deb_build_depends[v] = copy.deepcopy(deb_build_depends_base) deb_build_depends[v].extend(['libssh-dev', 'python3.10']) -for v in ['23.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 ['9', '10']: @@ -145,8 +145,8 @@ deb_depends['22.04'].extend(['libboost-filesystem1.74.0', 'libnanomsg5', 'libdav1d5']) -deb_depends['22.10'] = copy.deepcopy(deb_depends_base) -deb_depends['22.10'].extend(['libboost-filesystem1.74.0', +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', @@ -154,17 +154,19 @@ deb_depends['22.10'].extend(['libboost-filesystem1.74.0', 'libpangomm-1.4-1v5', 'libxml++2.6-2v5', 'libzip4', - 'libicu71', + 'libicu72', 'libnettle8', 'libssh-4', 'libx264-164', 'libcurl4', 'libpulse0', 'libxerces-c3.2', - 'libnanomsg5']) + 'libnanomsg5', + 'libwxgtk3.2-1', + 'libwxgtk-gl3.2-1']) -deb_depends['23.04'] = copy.deepcopy(deb_depends_base) -deb_depends['23.04'].extend(['libboost-filesystem1.74.0', +deb_depends['23.10'] = copy.deepcopy(deb_depends_base) +deb_depends['23.10'].extend(['libboost-filesystem1.74.0', 'libboost-thread1.74.0', 'libboost-regex1.74.0', 'libboost-date-time1.74.0', @@ -428,8 +430,6 @@ def make_spec(filename, version, target, options, requires=None): print('%{_datadir}/dcpomatic2/zoom_black.png', file=f) print('%{_datadir}/dcpomatic2/zoom_all_white.png', file=f) print('%{_datadir}/dcpomatic2/zoom_all_black.png', file=f) - print('%{_datadir}/dcpomatic2/tick.png', file=f) - print('%{_datadir}/dcpomatic2/no_tick.png', file=f) print('%{_datadir}/dcpomatic2/link.png', file=f) print('%{_datadir}/dcpomatic2/me.jpg', file=f) print('%{_datadir}/dcpomatic2/add_black.png', file=f) @@ -451,7 +451,8 @@ def make_spec(filename, version, target, options, requires=None): print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_disk.png' % r, file=f) print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_combiner.png' % r, file=f) for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', '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', 'ka_KA']: + 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR', 'sl_SI', 'hu_HU', + 'ka_KA', 'fa_IR']: 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) @@ -506,15 +507,15 @@ def dependencies(target, options): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.8.82')) - deps.append(('libsub', 'v1.6.44')) - deps.append(('leqm-nrt', '4560105773c66ac9216b62313a24093bb0a027ae')) + deps.append(('libdcp', 'v1.8.97')) + deps.append(('libsub', 'v1.6.47')) + deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we # also need a patched openssl binary to make certificates. # This dependency is to get that binary, which is added into # the appropriate place later - deps.append(('openssl', '7f29dd5')) + deps.append(('openssl', '54298369cacfe0ae01c5aa42ace8a463fd2e7a2e')) if can_build_disk(target): deps.append(('lwext4', 'ab082923a791b58478d1d9939d65a0583566ac1f')) deps.append(('ffcmp', '53c853d2935de3f2b0d53777529e48c102afd237')) @@ -727,7 +728,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") + target.set('CDIST_WX_VERSION', "3.2" if target.version in ("23.04", "23.10") else "3.1") if not target.debug: target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs') @@ -791,8 +792,8 @@ def make_appimage(target, nice_name, internal_name, version, extra_binaries=None lib = 'usr/lib/x86_64-linux-gnu' target.command(f'mkdir -p build/{nice_filename}.AppDir/{lib}/gdk-pixbuf-2.0/2.10.0') target.command(f'cp -a /{lib}/gdk-pixbuf-2.0 build/{nice_filename}.AppDir/usr/lib/x86_64-linux-gnu/') - target.command('apt update') - for package in ['libc6', 'libglib2.0-0', 'gnome-settings-daemon-schemas', 'librsvg2-common', 'libgdk-pixbuf2.0-0', 'libpango-1.0-0', 'libpangoft2-1.0-0', 'libpangocairo-1.0-0']: + target.command('sudo apt update') + for package in ['libc6', 'libglib2.0-0', 'gnome-settings-daemon-schemas', 'librsvg2-common', 'libgdk-pixbuf2.0-0', 'libpango-1.0-0', 'libpangoft2-1.0-0', 'libpangocairo-1.0-0', 'libthai0']: target.command(f'apt download {package}') target.command(f'dpkg-deb -x {package}*.deb {appdir}') target.command(f'glib-compile-schemas {appdir}/usr/share/glib-2.0/schemas')