projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7bc591a
)
Bump libdcp for fix to subtitle formatting (#2205).
author
Carl Hetherington
<cth@carlh.net>
Tue, 15 Mar 2022 14:37:23 +0000
(15:37 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Sun, 20 Mar 2022 20:24:50 +0000
(21:24 +0100)
cscript
patch
|
blob
|
history
wscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index 25208d1a2825c88d878b14a6a6c6af543e685faa..f09128645c75639312a857433ed533dee47282d2 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-402,8
+402,8
@@
def dependencies(target, options):
# Use distro-provided FFmpeg on Arch
deps = []
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', 'v1.8.1
1
'))
- deps.append(('libsub', 'v1.6.1
1
'))
+ deps.append(('libdcp', 'v1.8.1
2
'))
+ deps.append(('libsub', 'v1.6.1
2
'))
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
diff --git
a/wscript
b/wscript
index 91a0ee2433311500e2b57b29f45700769e8f0a2b..60be947eb1a6c1b9a48d0502078f40e477c2e588 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-35,8
+35,8
@@
except ImportError:
from waflib import Logs, Context
APPNAME = 'dcpomatic'
from waflib import Logs, Context
APPNAME = 'dcpomatic'
-libdcp_version = '1.8.
9
'
-libsub_version = '1.6.
9
'
+libdcp_version = '1.8.
12
'
+libsub_version = '1.6.
12
'
this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0]
last_version = subprocess.Popen(shlex.split('git describe --tags --match v* --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0]
last_version = subprocess.Popen(shlex.split('git describe --tags --match v* --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]