Build with an ffmpeg that includes libdav1d.

diff --git a/cscript b/cscript
index d2a9cf8a87507ba5e45e5e44962f9032e9a8da6d..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,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
 

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index b33dd8a43565abc1f03c72614d10cb3a331bdb52..f997af8175713f2ce2e2cf08b8ae9cb95783acf3 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -181,6 +181,7 @@ function copy_libs {
     copy_lib_env libfribidi "$dest"
     copy_lib_env libgio "$dest"
     copy_lib_env libz "$dest"
+       copy_lib_env libdav1d "$dest"
 }
 
 # @param #1 directory to copy to

diff --git a/platform/windows/wscript b/platform/windows/wscript
index ed5f5d4f2e0ba10324b6a1372f779fe54e829836..2cc3d6453aa03b63a24facc517afa999e6d515e1 100644 (file)
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -165,6 +165,7 @@ File "%static_deps%/bin/libpangoft2-1.0-0.dll"
 File "%static_deps%/bin/libx264-155.dll"
 File "%static_deps%/bin/libwebp-7.dll"
 File "%static_deps%/bin/GLEW.dll"
+File "%static_deps%/bin/libdav1d.dll"
     """, file=f)
 
     if bits == 32: