Build with an ffmpeg that includes libdav1d.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 04c183d669aad300e5029d8a8aad63a8d3808a73..10cae806f46f13bb075ee0d1f98f53090fee0e74 100644 (file)
--- 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,13 +430,13 @@ 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 = []
 
-    deps.append(('libdcp', 'v1.8.6'))
-    deps.append(('libsub', 'v1.6.6'))
+    deps.append(('libdcp', 'v1.8.7'))
+    deps.append(('libsub', 'v1.6.7'))
     deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
@@ -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
 
@@ -678,7 +681,7 @@ def package_rpm(target, cpu, version, options):
 
     requires = None
     if target.distro == 'mageia':
-        requires = "lib64xmlsec1-devel lib64canberra-gtk0"
+        requires = "lib64xmlsec1-devel lib64canberra-gtk0 libcap-utils"
 
     make_spec('build/platform/linux/dcpomatic2.spec', version, target, options, requires)
     cmd = 'rpmbuild --define "_topdir %s" -bb build/platform/linux/dcpomatic2.spec' % topdir