From: Carl Hetherington <cth@carlh.net>
Date: Tue, 13 Dec 2022 21:17:31 +0000 (+0100)
Subject: Bump libdcp to a version with UTCOffset.
X-Git-Tag: v2.16.36~13
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=dd9711df97e605e9015445d00337164b40f1bd00

Bump libdcp to a version with UTCOffset.

This is needed for 2.17.x but I ran the tests on main and they look
OK, so doing it this way should save a few merge conflicts.
---

diff --git a/cscript b/cscript
index b025e8690..b56bb23d6 100644
--- a/cscript
+++ b/cscript
@@ -453,7 +453,7 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.38'))
+    deps.append(('libdcp', 'v1.8.39'))
     deps.append(('libsub', 'v1.6.42'))
     deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))
diff --git a/src/lib/dkdm_recipient.cc b/src/lib/dkdm_recipient.cc
index ff19aa265..f25934083 100644
--- a/src/lib/dkdm_recipient.cc
+++ b/src/lib/dkdm_recipient.cc
@@ -23,6 +23,7 @@
 #include "film.h"
 #include "kdm_with_metadata.h"
 #include <dcp/raw_convert.h>
+#include <dcp/utc_offset.h>
 
 
 using std::make_shared;
@@ -71,8 +72,8 @@ kdm_for_dkdm_recipient (
 		return {};
 	}
 
-	dcp::LocalTime const begin(valid_from, recipient->utc_offset_hour, recipient->utc_offset_minute);
-	dcp::LocalTime const end  (valid_to,   recipient->utc_offset_hour, recipient->utc_offset_minute);
+	dcp::LocalTime const begin(valid_from, dcp::UTCOffset(recipient->utc_offset_hour, recipient->utc_offset_minute));
+	dcp::LocalTime const end  (valid_to,   dcp::UTCOffset(recipient->utc_offset_hour, recipient->utc_offset_minute));
 
 	auto const kdm = film->make_kdm (
 			recipient->recipient.get(),
diff --git a/src/lib/kdm_cli.cc b/src/lib/kdm_cli.cc
index a6656fa0e..a76155a2c 100644
--- a/src/lib/kdm_cli.cc
+++ b/src/lib/kdm_cli.cc
@@ -357,8 +357,8 @@ from_dkdm (
 			int const offset_hour = i->cinema ? i->cinema->utc_offset_hour() : 0;
 			int const offset_minute = i->cinema ? i->cinema->utc_offset_minute() : 0;
 
-			dcp::LocalTime begin(valid_from, offset_hour, offset_minute);
-			dcp::LocalTime end(valid_to, offset_hour, offset_minute);
+			dcp::LocalTime begin(valid_from, dcp::UTCOffset(offset_hour, offset_minute));
+			dcp::LocalTime end(valid_to, dcp::UTCOffset(offset_hour, offset_minute));
 
 			auto const kdm = kdm_from_dkdm(
 							dkdm,
diff --git a/src/lib/screen.cc b/src/lib/screen.cc
index a9291e8f0..2c821eceb 100644
--- a/src/lib/screen.cc
+++ b/src/lib/screen.cc
@@ -88,8 +88,8 @@ kdm_for_screen (
 	}
 
 	auto cinema = screen->cinema;
-	dcp::LocalTime const begin(valid_from, cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0);
-	dcp::LocalTime const end  (valid_to,   cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0);
+	dcp::LocalTime const begin(valid_from, dcp::UTCOffset(cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0));
+	dcp::LocalTime const end  (valid_to,   dcp::UTCOffset(cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0));
 
 	auto const kdm = film->make_kdm (
 			screen->recipient.get(),
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 7ecfb443f..5a7b4e6de 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -350,8 +350,8 @@ private:
 						continue;
 					}
 
-					dcp::LocalTime begin(_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
-					dcp::LocalTime end(_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
+					dcp::LocalTime begin(_timing->from(), dcp::UTCOffset(i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()));
+					dcp::LocalTime end(_timing->until(), dcp::UTCOffset(i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()));
 
 					/* Make an empty KDM */
 					dcp::DecryptedKDM kdm (