projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump libdcp for fix to AudioChannelLabelSubDescriptor count (#2431).
[dcpomatic.git]
/
cscript
diff --git
a/cscript
b/cscript
index a3fcc8c53c93bbe26795303c1ecd323c7fef33e5..4367e024c0bd6efa3dc63efbc6cb97cc43fb5e37 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-354,6
+354,7
@@
def make_spec(filename, version, target, options, requires=None):
print('%{_bindir}/dcpomatic2_openssl', file=f)
print('%{_bindir}/dcpomatic2_combiner', file=f)
print('%{_bindir}/dcpomatic2_verify', file=f)
print('%{_bindir}/dcpomatic2_openssl', file=f)
print('%{_bindir}/dcpomatic2_combiner', file=f)
print('%{_bindir}/dcpomatic2_verify', file=f)
+ print('%{_bindir}/dcpomatic2_kdm_inspect', file=f)
if can_build_disk(target):
print('%{_bindir}/dcpomatic2_disk', file=f)
print('%caps(cap_dac_override=ep) %{_bindir}/dcpomatic2_disk_writer', file=f)
if can_build_disk(target):
print('%{_bindir}/dcpomatic2_disk', file=f)
print('%caps(cap_dac_override=ep) %{_bindir}/dcpomatic2_disk_writer', file=f)
@@
-382,6
+383,10
@@
def make_spec(filename, version, target, options, requires=None):
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/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)
+ print('%{_datadir}/dcpomatic2/add_white.png', file=f)
+ print('%{_datadir}/dcpomatic2/pause_black.png', file=f)
+ print('%{_datadir}/dcpomatic2/pause_white.png', file=f)
print('%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf', file=f)
print('%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f)
print('%{_datadir}/dcpomatic2/LiberationSans-Bold.ttf', file=f)
print('%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf', file=f)
print('%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f)
print('%{_datadir}/dcpomatic2/LiberationSans-Bold.ttf', file=f)
@@
-424,6
+429,7
@@
def make_spec(filename, version, target, options, requires=None):
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/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/dcpkdm %%{buildroot}/usr/bin/dcpomatic2_kdm_inspect' % target.directory, file=f)
print('', file=f)
print('%post', file=f)
print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
print('', file=f)
print('%post', file=f)
print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
@@
-451,8
+457,8
@@
def dependencies(target, options):
# Use distro-provided FFmpeg on Arch
deps = []
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', 'v1.8.
33
'))
- deps.append(('libsub', 'v1.6.
39
'))
+ deps.append(('libdcp', 'v1.8.
54
'))
+ deps.append(('libsub', 'v1.6.
42
'))
deps.append(('leqm-nrt', '93ae9e6'))
deps.append(('rtaudio', 'f619b76'))
# We get our OpenSSL libraries from the environment, but we
deps.append(('leqm-nrt', '93ae9e6'))
deps.append(('rtaudio', 'f619b76'))
# We get our OpenSSL libraries from the environment, but we
@@
-723,6
+729,7
@@
def make_appimage(target, nice_name, internal_name, version):
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/{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/dcpkdm {appdir}/usr/bin/dcpomatic2_kdm_inspect')
target.command(f'mkdir -p {appdir}/usr/share/libdcp')
target.command(f'cp -r {target.directory}/share/dcpomatic2 {appdir}/usr/share/')
target.command(f'cp -r {target.directory}/share/libdcp/xsd {appdir}/usr/share/libdcp/')
target.command(f'mkdir -p {appdir}/usr/share/libdcp')
target.command(f'cp -r {target.directory}/share/dcpomatic2 {appdir}/usr/share/')
target.command(f'cp -r {target.directory}/share/libdcp/xsd {appdir}/usr/share/libdcp/')
@@
-855,7
+862,7
@@
def test(target, options, test):
if target.platform == 'windows':
cmd = 'run\\tests '
else:
if target.platform == 'windows':
cmd = 'run\\tests '
else:
- cmd = 'run/tests --log_level=test_suite '
+ cmd = 'run/tests --
check --
log_level=test_suite '
if target.debug:
cmd += '--backtrace '
if test is not None:
if target.debug:
cmd += '--backtrace '
if test is not None: