projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a test to trigger #1786 - crash when exporting 7.1 project to MP4.
[dcpomatic.git]
/
cscript
diff --git
a/cscript
b/cscript
index 26a7df1774f211e33481bded66fe425417712f93..7f262bf81f8a8ed88f1964ef9468bea37a72d879 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-309,6
+309,7
@@
def make_spec(filename, version, target, options, requires=None):
print('%{_datadir}/dcpomatic2/zoom_all.png', file=f)
print('%{_datadir}/dcpomatic2/tick.png', file=f)
print('%{_datadir}/dcpomatic2/no_tick.png', file=f)
print('%{_datadir}/dcpomatic2/zoom_all.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/LiberationSans-Regular.ttf', file=f)
print('%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f)
print('%{_datadir}/dcpomatic2/me.jpg', file=f)
print('%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf', file=f)
print('%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f)
@@
-321,8
+322,9
@@
def make_spec(filename, version, target, options, requires=None):
print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r, file=f)
print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.png' % r, file=f)
print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_playlist.png' % r, file=f)
print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r, file=f)
print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.png' % r, file=f)
print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_playlist.png' % r, file=f)
+ print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_disk.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',
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'
, 'ko_KR'
]:
+ 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR']:
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)
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)
@@
-363,7
+365,7
@@
def dependencies(target, options):
if target.platform == 'windows' and target.version == 'xp':
deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)]
elif target.platform != 'linux' or target.distro != 'arch':
if target.platform == 'windows' and target.version == 'xp':
deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)]
elif target.platform != 'linux' or target.distro != 'arch':
- deps = [('ffmpeg-cdist', '
20d3ddf
', ffmpeg_options)]
+ deps = [('ffmpeg-cdist', '
d798b45
', ffmpeg_options)]
else:
# Use distro-provided FFmpeg on Arch
deps = []
else:
# Use distro-provided FFmpeg on Arch
deps = []
@@
-373,8
+375,8
@@
def dependencies(target, options):
(target.platform == 'osx' and target.bits == 64) or
(target.platform == 'windows')) else {}
(target.platform == 'osx' and target.bits == 64) or
(target.platform == 'windows')) else {}
- deps.append(('libdcp',
None
, cpp_lib_options))
- deps.append(('libsub',
None
, cpp_lib_options))
+ deps.append(('libdcp',
'9a8faac'
, cpp_lib_options))
+ deps.append(('libsub',
'8da829d'
, cpp_lib_options))
deps.append(('leqm-nrt', 'carl'))
deps.append(('rtaudio', 'carl'))
# We get our OpenSSL libraries from the environment, but we
deps.append(('leqm-nrt', 'carl'))
deps.append(('rtaudio', 'carl'))
# We get our OpenSSL libraries from the environment, but we
@@
-383,14
+385,14
@@
def dependencies(target, options):
# the appropriate place later
deps.append(('openssl', 'carl'))
if can_build_disk(target):
# the appropriate place later
deps.append(('openssl', 'carl'))
if can_build_disk(target):
- deps.append(('lwext4', '
carl2
'))
+ deps.append(('lwext4', '
370b3de6
'))
return deps
option_defaults = { "gui": True, "variant": None }
def configure_options(target, options):
return deps
option_defaults = { "gui": True, "variant": None }
def configure_options(target, options):
- opt = ''
+ opt = '
--warnings-are-errors
'
if not (target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04'):
# Currently we only build tests on Ubuntu 18.04
if not (target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04'):
# Currently we only build tests on Ubuntu 18.04
@@
-548,9
+550,7
@@
def build(target, options):
else:
target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options)))
target.command('./waf')
else:
target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options)))
target.command('./waf')
-
- if target.platform == 'linux' or target.platform == 'osx':
- target.command('./waf install')
+ target.command('./waf install')
def package_windows(target):
identifier = ''
def package_windows(target):
identifier = ''