summaryrefslogtreecommitdiff
path: root/cscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-02-15 22:53:20 +0100
committerCarl Hetherington <cth@carlh.net>2022-02-17 09:59:26 +0100
commit83b80141967c7796dedde6c84000622128c038c7 (patch)
tree03d63b4a02f0285b562cd4e63ffb3ab94c129331 /cscript
parentd113a4b1b0e5dab6924510861f3f2b9c30fc9610 (diff)
Build with an ffmpeg that includes libdav1d.
Diffstat (limited to 'cscript')
-rw-r--r--cscript15
1 files changed, 9 insertions, 6 deletions
diff --git a/cscript b/cscript
index d2a9cf8a8..10cae806f 100644
--- a/cscript
+++ b/cscript
@@ -1,6 +1,6 @@
# -*- mode: python -*-
#
-# Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+# Copyright (C) 2012-2022 Carl Hetherington <cth@carlh.net>
#
# This file is part of DCP-o-matic.
#
@@ -150,7 +150,8 @@ deb_depends['21.10'].extend(['libboost-filesystem1.74.0',
'libcurl4',
'libpulse0',
'libxerces-c3.2',
- 'libnanomsg5'])
+ 'libnanomsg5',
+ 'libdav1d4'])
deb_depends['9'] = copy.deepcopy(deb_depends_base)
deb_depends['9'].extend(['libboost-filesystem1.62.0',
@@ -215,7 +216,8 @@ deb_depends['11'].extend(['libboost-filesystem1.74.0',
'libx264-160',
'libcurl4',
'libxerces-c3.2',
- 'libnanomsg5'])
+ 'libnanomsg5',
+ 'libdav1d4'])
deb_depends_gui['11'] = [ 'libxcb-xfixes0',
'libxcb-shape0',
@@ -234,7 +236,8 @@ deb_depends['unstable'].extend(['libboost-filesystem1.67.0',
'libnettle6',
'libx264-155',
'libcurl4',
- 'libxerces-c3.2'])
+ 'libxerces-c3.2',
+ 'libdav1d4'])
def can_build_disk(target):
# We can build dcpomatic2_disk on platforms that have Boost process and can build the lwext4
@@ -427,7 +430,7 @@ def dependencies(target, options):
ffmpeg_options = {}
if target.platform != 'linux' or target.distro != 'arch':
- deps = [('ffmpeg-cdist', '107f9af8', ffmpeg_options)]
+ deps = [('ffmpeg-cdist', 'cb2b073d4f88230fca1d1d74e45235f5268fd825', ffmpeg_options)]
else:
# Use distro-provided FFmpeg on Arch
deps = []
@@ -443,7 +446,7 @@ def dependencies(target, options):
deps.append(('openssl', '7f29dd5'))
if can_build_disk(target):
deps.append(('lwext4', 'cce3730'))
- deps.append(('ffcmp', '6259cd4'))
+ deps.append(('ffcmp', '10934f1a9cd9770ef0b38da153f9576e77e7e925'))
return deps