From: Carl Hetherington <cth@carlh.net>
Date: Tue, 25 Jul 2023 20:49:23 +0000 (+0200)
Subject: Bump libdcp to one with some cleanups / header re-arrangement.
X-Git-Tag: v2.16.61~27
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=67f39ff3eebb5ac727324b12130ff9cc262e9ffa

Bump libdcp to one with some cleanups / header re-arrangement.
---

diff --git a/cscript b/cscript
index 937cecd3c..0f5daa308 100644
--- a/cscript
+++ b/cscript
@@ -506,7 +506,7 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.74'))
+    deps.append(('libdcp', '9f7980e15f14c0d5f6b59e53b9bf939e62df20c9'))
     deps.append(('libsub', 'v1.6.44'))
     deps.append(('leqm-nrt', '4560105773c66ac9216b62313a24093bb0a027ae'))
     deps.append(('rtaudio', 'f619b76'))
diff --git a/src/lib/atmos_content.h b/src/lib/atmos_content.h
index cfacb9729..afa3c75a2 100644
--- a/src/lib/atmos_content.h
+++ b/src/lib/atmos_content.h
@@ -21,6 +21,7 @@
 
 #include "content_part.h"
 #include "types.h"
+#include <dcp/types.h>
 
 
 class Content;
diff --git a/src/lib/cross.h b/src/lib/cross.h
index 4be121d2b..4281700a7 100644
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -29,6 +29,8 @@
 #include <IOKit/pwr_mgt/IOPMLib.h>
 #endif
 #include <boost/filesystem.hpp>
+/* windows.h defines this but we want to use it */
+#undef ERROR
 #include <boost/thread/mutex.hpp>
 #include <boost/optional.hpp>
 
diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index b815afb7c..387cca9f6 100644
--- a/src/wx/video_view.h
+++ b/src/wx/video_view.h
@@ -29,6 +29,7 @@
 #include "lib/timer.h"
 #include "lib/types.h"
 #include <dcp/warnings.h>
+#include <dcp/types.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
 LIBDCP_ENABLE_WARNINGS
diff --git a/test/recover_test.cc b/test/recover_test.cc
index 9508adca7..5c7ac4f9c 100644
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -32,6 +32,7 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/video_content.h"
 #include "lib/ratio.h"
+#include <dcp/equality_options.h>
 #include <dcp/mono_picture_asset.h>
 #include <dcp/stereo_picture_asset.h>
 #include <boost/test/unit_test.hpp>
diff --git a/test/ssa_subtitle_test.cc b/test/ssa_subtitle_test.cc
index 8132ba3a0..2d8102a07 100644
--- a/test/ssa_subtitle_test.cc
+++ b/test/ssa_subtitle_test.cc
@@ -32,6 +32,7 @@
 #include "lib/string_text_file_content.h"
 #include "lib/text_content.h"
 #include "test.h"
+#include <dcp/equality_options.h>
 #include <dcp/interop_subtitle_asset.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
diff --git a/test/test.cc b/test/test.cc
index ce98bf3a9..bd23f7522 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -45,6 +45,7 @@
 #include "test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
+#include <dcp/equality_options.h>
 #include <dcp/mono_picture_asset.h>
 #include <dcp/mono_picture_frame.h>
 #include <dcp/openjpeg_image.h>
diff --git a/test/video_mxf_content_test.cc b/test/video_mxf_content_test.cc
index 3ecc2775e..f3766e4af 100644
--- a/test/video_mxf_content_test.cc
+++ b/test/video_mxf_content_test.cc
@@ -32,6 +32,7 @@
 #include "lib/ratio.h"
 #include "lib/video_mxf_content.h"
 #include "test.h"
+#include <dcp/equality_options.h>
 #include <dcp/mono_picture_asset.h>
 #include <boost/test/unit_test.hpp>