projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
367d9ab
)
Bump ffmpeg to build on newer binutils.
author
Carl Hetherington
<cth@carlh.net>
Thu, 24 Feb 2022 16:23:40 +0000
(17:23 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 25 Feb 2022 13:55:24 +0000
(14:55 +0100)
cscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index 7feb7eb036090bdadb0630583580a2ec78285eff..4e40559842f2df24b92cff868f79ba193a1fea5d 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-393,7
+393,7
@@
def dependencies(target, options):
ffmpeg_options = {}
if target.platform != 'linux' or target.distro != 'arch':
ffmpeg_options = {}
if target.platform != 'linux' or target.distro != 'arch':
- deps = [('ffmpeg-cdist', '
cb2b073d4f88230fca1d1d74e45235f5268fd825
', ffmpeg_options)]
+ deps = [('ffmpeg-cdist', '
4721b55de017702b0d1c8ce1163331378905c637
', ffmpeg_options)]
else:
# Use distro-provided FFmpeg on Arch
deps = []
else:
# Use distro-provided FFmpeg on Arch
deps = []
@@
-409,7
+409,7
@@
def dependencies(target, options):
deps.append(('openssl', '7f29dd5'))
if can_build_disk(target):
deps.append(('lwext4', 'cce3730'))
deps.append(('openssl', '7f29dd5'))
if can_build_disk(target):
deps.append(('lwext4', 'cce3730'))
- deps.append(('ffcmp', '
10934f1a9cd9770ef0b38da153f9576e77e7e925
'))
+ deps.append(('ffcmp', '
da96af56f3ddf074f2044a0cd6e50c95184fd169
'))
return deps
return deps