Use openjpeg v2.5.2 (#2783).

Tests suggest it is considerably faster:

* arrietty on Linux/AMD
  old: 03:35
  new: 03:58

* Sintel.2010.1080p.mkv on Linux/AMD
  old: 0:29:49
  new: 0:22:39

* TRAILER VERSIE 4.mov on Apple M1
  old: 6:22
  new: 5:15

* TRAILER VERSIE 4.mov on Windows/Intel
  old: 6:10
  new: 4:12

5 files changed, 12 insertions, 8 deletions

diff --git a/cscript b/cscript
index cee888420..3284a6ede 100644
--- a/cscript
+++ b/cscript
@@ -534,7 +534,7 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.97'))
+    deps.append(('libdcp', 'v1.9.0'))
     deps.append(('libsub', 'v1.6.47'))
     deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23'))
     deps.append(('rtaudio', 'f619b76'))
diff --git a/run/tests b/run/tests
index 4315e227f..6f43290c4 100755
--- a/run/tests
+++ b/run/tests
@@ -3,7 +3,7 @@
 # e.g. --run_tests=foo
 set -e
 
-PRIVATE_GIT="f4b0c41b263a17cf33edae7565f16bd21eb80b65"
+PRIVATE_GIT="5298360d6bbae434fb4625fda1cc9dd6be101df3"
 
 if [ "$1" == "--check" ]; then
 	shift 1
diff --git a/test/remake_with_subtitle_test.cc b/test/remake_with_subtitle_test.cc
index 57322d3ac..70d38c1eb 100644
--- a/test/remake_with_subtitle_test.cc
+++ b/test/remake_with_subtitle_test.cc
@@ -48,5 +48,9 @@ BOOST_AUTO_TEST_CASE (remake_with_subtitle_test)
 	content->only_text()->set_use (false);
 	make_and_verify_dcp (film);
 
-	check_one_frame (film->dir(film->dcp_name()), 325, TestPaths::private_data() / "prophet_frame_325_no_subs.j2c");
+#ifdef DCPOMATIC_OSX
+	check_one_frame(film->dir(film->dcp_name()), 325, TestPaths::private_data() / "v2.18.x" / "prophet_frame_325_no_subs_mac.j2c");
+#else
+	check_one_frame(film->dir(film->dcp_name()), 325, TestPaths::private_data() / "v2.18.x" / "prophet_frame_325_no_subs.j2c");
+#endif
 }
diff --git a/test/torture_test.cc b/test/torture_test.cc
index 0c781fdb1..8e6a516bd 100644
--- a/test/torture_test.cc
+++ b/test/torture_test.cc
@@ -248,7 +248,7 @@ BOOST_AUTO_TEST_CASE (torture_test1)
 			for (int c = 0; c < 3; ++c) {
 				for (int y = 0; y < size.height; ++y) {
 					for (int x = 0; x < size.width; ++x) {
-						BOOST_REQUIRE (image->data(c)[y * size.height + x] <= 3);
+						BOOST_REQUIRE (image->data(c)[y * size.height + x] <= 5);
 					}
 				}
 			}
diff --git a/test/video_level_test.cc b/test/video_level_test.cc
index e2419d8e7..0ff2c4732 100644
--- a/test/video_level_test.cc
+++ b/test/video_level_test.cc
@@ -480,7 +480,7 @@ BOOST_AUTO_TEST_CASE (movie_V_to_dcp)
 {
 	auto range = dcp_range (movie_V("movie_V_to_dcp"));
 	/* Video range has been correctly expanded to full for the DCP */
-	check_int_close (range, {0, 4083}, 2);
+	check_int_close(range, {0, 4081}, 2);
 }
 
 
@@ -498,7 +498,7 @@ BOOST_AUTO_TEST_CASE (movie_F_to_dcp)
 {
 	auto range = dcp_range (movie_F("movie_F_to_dcp"));
 	/* The nearly-full-range of the input has been preserved */
-	check_int_close (range, {0, 4083}, 2);
+	check_int_close(range, {0, 4080}, 2);
 }
 
 
@@ -506,14 +506,14 @@ BOOST_AUTO_TEST_CASE (video_FoV_to_dcp)
 {
 	auto range = dcp_range (movie_FoV("video_FoV_to_dcp"));
 	/* The nearly-full-range of the input has become even more full, and clipped */
-	check_int_close (range, {0, 4095}, 2);
+	check_int_close(range, {0, 4093}, 2);
 }
 
 
 BOOST_AUTO_TEST_CASE (image_F_to_dcp)
 {
 	auto range = dcp_range (image_F("image_F_to_dcp"));
-	check_int_close (range, {0, 4083}, 3);
+	check_int_close(range, {0, 4080}, 3);
 }