projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Musings.
[dcpomatic.git]
/
cscript
diff --git
a/cscript
b/cscript
index b6ca320381e90ac012fb6054f894e8dcd0db1a30..6203a1042b2237d31414e785a3ede1a070f3bb29 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-244,9
+244,9
@@
def dependencies(target):
else:
ffmpeg_options = {}
else:
ffmpeg_options = {}
- return (('ffmpeg-cdist', '
1d4a1a4
', ffmpeg_options),
- ('libdcp', 'v1.4.
2
'),
- ('libsub', 'v1.2.
2
'))
+ return (('ffmpeg-cdist', '
c7df8d5
', ffmpeg_options),
+ ('libdcp', 'v1.4.
4
'),
+ ('libsub', 'v1.2.
4
'))
def configure_options(target):
opt = ''
def configure_options(target):
opt = ''
@@
-312,7
+312,7
@@
def package_debian(target, cpu, version):
target.set('CDIST_CONFIGURE', '"' + configure_options(target) + '"')
if target.debug:
target.set('CDIST_DEBUG_PACKAGE', '--dbg-package=dcpomatic-dbg')
target.set('CDIST_CONFIGURE', '"' + configure_options(target) + '"')
if target.debug:
target.set('CDIST_DEBUG_PACKAGE', '--dbg-package=dcpomatic-dbg')
- if target.version in ['15.04', '15.10', '16.04', '16.10', '8']:
+ if target.version in ['15.04', '15.10', '16.04', '16.10', '8'
, 'unstable'
]:
target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale')
else:
target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale')
target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale')
else:
target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale')