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 ['24.04']:
+ deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
+ deb_build_depends[v].extend(['libssh-dev', 'python3.12'])
for v in ['9', '10']:
deb_build_depends[v] = copy.deepcopy(deb_build_depends_base)
deb_build_depends[v].extend(['libssh-gcrypt-dev', 'python'])
'libwxgtk3.2-1',
'libwxgtk-gl3.2-1'])
+def debs(boost, icu, x264):
+ output = copy.deepcopy(deb_depends_base)
+ output.extend(['libboost-filesystem' + boost,
+ 'libboost-thread' + boost,
+ 'libboost-regex' + boost,
+ 'libboost-date-time' + boost,
+ 'libcairomm-1.0-1v5',
+ 'libpangomm-1.4-1v5',
+ 'libxml++2.6-2v5',
+ 'libzip4',
+ 'libicu' + icu,
+ 'libnettle8',
+ 'libssh-4',
+ 'libx264-' + x264,
+ 'libcurl4',
+ 'libpulse0',
+ 'libxerces-c3.2',
+ 'libnanomsg5',
+ 'libwxgtk3.2-1',
+ 'libwxgtk-gl3.2-1'])
+ return output
+
+deb_depends['24.04'] = debs(boost='1.83.0', icu='74', x264='164')
+
deb_depends['9'] = copy.deepcopy(deb_depends_base)
deb_depends['9'].extend(['libboost-filesystem1.62.0',
'libboost-thread1.62.0',
print('%{_bindir}/dcpomatic2_playlist', file=f)
print('%{_bindir}/dcpomatic2_openssl', file=f)
print('%{_bindir}/dcpomatic2_combiner', file=f)
- print('%{_bindir}/dcpomatic2_verify', file=f)
+ print('%{_bindir}/dcpomatic2_verify_cli', file=f)
print('%{_bindir}/dcpomatic2_kdm_inspect', file=f)
print('%{_bindir}/dcpomatic2_map', file=f)
if can_build_disk(target):
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/link_black.png', file=f)
+ print('%{_datadir}/dcpomatic2/link_white.png', file=f)
print('%{_datadir}/dcpomatic2/me.jpg', file=f)
print('%{_datadir}/dcpomatic2/add_black.png', file=f)
print('%{_datadir}/dcpomatic2/add_white.png', file=f)
print('/bin/cp -r %s/src/libdcp/tags %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
print('/bin/cp -r %s/src/libdcp/xsd %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
print('/bin/cp %s/src/libdcp/ratings %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
- print('/bin/mv %s/bin/dcpverify %%{buildroot}/usr/bin/dcpomatic2_verify' % target.directory, file=f)
+ print('/bin/mv %s/bin/dcpverify %%{buildroot}/usr/bin/dcpomatic2_verify_cli' % target.directory, file=f)
print('/bin/mv %s/bin/dcpkdm %%{buildroot}/usr/bin/dcpomatic2_kdm_inspect' % target.directory, file=f)
print('', file=f)
print('%post', file=f)
ffmpeg_options = {}
if target.platform != 'linux' or target.distro != 'arch':
- deps = [('ffmpeg', '7276e269a93c2ae30e302c34708e8095ac5475e8', ffmpeg_options)]
+ deps = [('ffmpeg', '0b73d2f5e70a04a67aa902902c42e3025ef3bb77', ffmpeg_options)]
else:
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', 'v1.8.89'))
- deps.append(('libsub', 'v1.6.45'))
+ deps.append(('libdcp', '56b3586247d76b2d07911018ccba63d4b05f4995', {'c++17': target.platform == 'osx'}))
+ 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
deps.append(('openssl', '54298369cacfe0ae01c5aa42ace8a463fd2e7a2e'))
if can_build_disk(target):
deps.append(('lwext4', 'ab082923a791b58478d1d9939d65a0583566ac1f'))
- deps.append(('ffcmp', '53c853d2935de3f2b0d53777529e48c102afd237'))
+ deps.append(('ffcmp', '5ab6ed3b75d8ca7cf1f66bb9fb08792b92f4b419'))
return deps
if can_build_disk(target):
opt += ' --enable-disk'
- if target.platform == 'osx' and target.arch == 'arm64':
- opt += ' --target-macos-arm64 --wx-config=%s/wx-config' % target.bin
+ if target.platform == 'osx':
+ opt += ' --c++17'
+ if target.arch == 'arm64':
+ opt += ' --wx-config=%s/wx-config' % target.bin
+
+ if target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ['22.04']:
+ opt += ' --enable-grok'
return opt
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 in ("23.04", "23.10") else "3.1")
+ target.set('CDIST_WX_VERSION', "3.2" if target.version in ("23.04", "23.10", "24.04") else "3.1")
if not target.debug:
target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs')
os.makedirs(f'{appdir}/usr/bin')
target.command(f'cp {target.directory}/bin/{internal_name} {appdir}/usr/bin')
target.command(f'cp {target.directory}/src/openssl/apps/openssl {appdir}/usr/bin/dcpomatic2_openssl')
- target.command(f'cp {target.directory}/bin/dcpverify {appdir}/usr/bin/dcpomatic2_verify')
+ target.command(f'cp {target.directory}/bin/dcpverify {appdir}/usr/bin/dcpomatic2_verify_cli')
target.command(f'cp {target.directory}/bin/dcpkdm {appdir}/usr/bin/dcpomatic2_kdm_inspect')
if extra_binaries:
for bin in extra_binaries:
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')