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 ['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'])
'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',
'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',
'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('%{_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('%%{_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']:
+ '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)
ffmpeg_options = {}
if target.platform != 'linux' or target.distro != 'arch':
- deps = [('ffmpeg', '2fb5e99b45e92880bd7953cb98c2027a34884c14', ffmpeg_options)]
+ deps = [('ffmpeg', '7276e269a93c2ae30e302c34708e8095ac5475e8', ffmpeg_options)]
else:
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', 'v1.8.73'))
- deps.append(('libsub', 'v1.6.44'))
- deps.append(('leqm-nrt', '4560105773c66ac9216b62313a24093bb0a027ae'))
+ deps.append(('libdcp', 'v1.8.100'))
+ deps.append(('libsub', 'v1.6.49'))
+ 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', '15e7fdf0b3896e3f7323a950105382a9c8ae3c39'))
+ deps.append(('ffcmp', '53c853d2935de3f2b0d53777529e48c102afd237'))
return deps
opt += ' --enable-disk'
if target.platform == 'osx' and target.arch == 'arm64':
- opt += ' --target-macos-arm64 --wx-config=%s/wx-config' % target.bin
+ opt += ' --wx-config=%s/wx-config' % target.bin
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 == "23.04" 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')
make_spec('dcpomatic2.spec', version, target, options, requires)
cmd = 'rpmbuild --define "_topdir %s" -bb dcpomatic2.spec' % topdir
+ # On Centos 7 we build and install boost ourselves, so we must look for it in the right place
+ target.set('LINKFLAGS', '-L/usr/local/lib')
target.command(cmd)
rpms = []
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')
if target.platform == 'windows':
cmd = 'run\\tests '
else:
- cmd = 'run/tests --check --log_level=test_suite '
+ cmd = 'run/tests '
+ if target.environment_prefix:
+ cmd += '-e %s ' % target.environment_prefix
+ if target.platform != 'windows':
+ cmd += ' --check --log_level=test_suite '
if target.debug:
cmd += '--backtrace '
if test is not None: