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 SMPTE subtitle image loading fix.
[dcpomatic.git]
/
cscript
diff --git
a/cscript
b/cscript
index 77c5a94ba6f1dea16b27c93545a9c85ec1c7b8ab..6869e25d7854751e340d478f416eba4dc5fc593d 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-95,7
+95,8
@@
deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
'libnettle6',
'libssh-4',
'libx264-152',
'libnettle6',
'libssh-4',
'libx264-152',
- 'libcurl4'])
+ 'libcurl4',
+ 'libpulse0'])
deb_depends['18.10'] = copy.deepcopy(deb_depends_base)
deb_depends['18.10'].extend(['libboost-filesystem1.65.1',
deb_depends['18.10'] = copy.deepcopy(deb_depends_base)
deb_depends['18.10'].extend(['libboost-filesystem1.65.1',
@@
-111,7
+112,8
@@
deb_depends['18.10'].extend(['libboost-filesystem1.65.1',
'libnettle6',
'libssh-4',
'libx264-152',
'libnettle6',
'libssh-4',
'libx264-152',
- 'libcurl4'])
+ 'libcurl4',
+ 'libpulse0'])
deb_depends['7'] = copy.deepcopy(deb_depends_base)
deb_depends['7'].extend(['libboost-filesystem1.49.0',
deb_depends['7'] = copy.deepcopy(deb_depends_base)
deb_depends['7'].extend(['libboost-filesystem1.49.0',
@@
-256,6
+258,7
@@
def make_spec(filename, version, target, options, requires=None):
print('%{_bindir}/dcpomatic2_server_cli', file=f)
print('%{_bindir}/dcpomatic2_kdm_cli', file=f)
print('%{_bindir}/dcpomatic2_player', file=f)
print('%{_bindir}/dcpomatic2_server_cli', file=f)
print('%{_bindir}/dcpomatic2_kdm_cli', file=f)
print('%{_bindir}/dcpomatic2_player', file=f)
+ print('%{_bindir}/dcpomatic2_playlist', file=f)
print('%{_datadir}/applications/dcpomatic2.desktop', file=f)
print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f)
print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f)
print('%{_datadir}/applications/dcpomatic2.desktop', file=f)
print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f)
print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f)
@@
-280,8
+283,9
@@
def make_spec(filename, version, target, options, requires=None):
print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.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_kdm.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)
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', '
ar_LB', 'fi_FI', 'el_GR', 'tr_TR
']:
+ 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', '
fi_FI
']:
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)
@@
-327,8
+331,8
@@
def dependencies(target):
# Use distro-provided FFmpeg on Arch
deps = []
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', '
4676616
'))
- deps.append(('libsub', '
f93c12c
'))
+ deps.append(('libdcp', '
v1.6.5
'))
+ deps.append(('libsub', '
v1.4.4
'))
deps.append(('rtaudio-cdist', 'aad62d7'))
return deps
deps.append(('rtaudio-cdist', 'aad62d7'))
return deps
@@
-339,8
+343,8
@@
def option_defaults():
def configure_options(target, options):
opt = ''
def configure_options(target, options):
opt = ''
- if not (target.platform == 'linux' and target.distro == 'ubuntu' and
(target.version == '18.04' or target.version == '16.04')
):
- # Currently we only build tests on Ubuntu 1
{6,8}
.04
+ if not (target.platform == 'linux' and target.distro == 'ubuntu' and
target.version == '18.04'
):
+ # Currently we only build tests on Ubuntu 1
8
.04
opt += ' --disable-tests'
if target.debug:
opt += ' --disable-tests'
if target.debug:
@@
-608,6
+612,7
@@
def package(target, version, options):
out = []
out.append(make_appimage(target, 'DCP-o-matic', 'dcpomatic2', version))
out.append(make_appimage(target, 'DCP-o-matic Player', 'dcpomatic2_player', version))
out = []
out.append(make_appimage(target, 'DCP-o-matic', 'dcpomatic2', version))
out.append(make_appimage(target, 'DCP-o-matic Player', 'dcpomatic2_player', version))
+ out.append(make_appimage(target, 'DCP-o-matic Playlist Editor', 'dcpomatic2_playlist', version))
out.append(make_appimage(target, 'DCP-o-matic KDM Creator', 'dcpomatic2_kdm', version))
out.append(make_appimage(target, 'DCP-o-matic Batch Converter', 'dcpomatic2_batch', version))
return out
out.append(make_appimage(target, 'DCP-o-matic KDM Creator', 'dcpomatic2_kdm', version))
out.append(make_appimage(target, 'DCP-o-matic Batch Converter', 'dcpomatic2_batch', version))
return out