From c04fec82d25127fafa73c3daff87bece9aa8c8e8 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 27 Aug 2020 20:37:32 +0000
Subject: Build fixes for Boost >= 1.73

Forward-ported-from: d1e9749ca290673639a49d693a8fe5c6557cc2de
---
 src/lib/analyse_audio_job.cc    | 3 +++
 src/lib/butler.cc               | 3 +++
 src/lib/dcp_video.cc            | 5 ++++-
 src/lib/encode_server_finder.cc | 4 ++++
 src/lib/ffmpeg_encoder.cc       | 3 +++
 src/lib/ffmpeg_file_encoder.cc  | 3 +++
 src/lib/hints.cc                | 3 +++
 src/lib/playlist.cc             | 4 ++++
 src/lib/upload_job.cc           | 3 +++
 src/lib/verify_dcp_job.cc       | 3 +++
 10 files changed, 33 insertions(+), 1 deletion(-)

(limited to 'src/lib')

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index acd730a68..6ba6b5ecf 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -50,6 +50,9 @@ using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 int const AnalyseAudioJob::_num_points = 1024;
 
diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index 33938ece4..39da0bd5c 100644
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -39,6 +39,9 @@ using boost::bind;
 using boost::optional;
 using boost::function;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 /** Minimum video readahead in frames */
 #define MINIMUM_VIDEO_READAHEAD 10
diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index d6b9d4f27..36928b3fc 100644
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -62,6 +62,9 @@ using boost::shared_ptr;
 using dcp::Size;
 using dcp::Data;
 using dcp::raw_convert;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 #define DCI_COEFFICENT (48.0 / 52.37)
 
@@ -120,7 +123,7 @@ DCPVideo::encode_locally ()
 {
 	string const comment = Config::instance()->dcp_j2k_comment();
 
-	Data enc = compress_j2k (
+	Data enc = dcp::compress_j2k (
 		convert_to_xyz (_frame, boost::bind(&Log::dcp_log, dcpomatic_log.get(), _1, _2)),
 		_j2k_bandwidth,
 		_frames_per_second,
diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc
index 7297734ec..1c6120257 100644
--- a/src/lib/encode_server_finder.cc
+++ b/src/lib/encode_server_finder.cc
@@ -27,6 +27,7 @@
 #include "dcpomatic_socket.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
+#include <boost/bind/placeholders.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <iostream>
 
@@ -40,6 +41,9 @@ using boost::shared_ptr;
 using boost::scoped_array;
 using boost::weak_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::raw_convert;
 
 EncodeServerFinder* EncodeServerFinder::_instance = 0;
diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 786f97dd7..8f9b3defc 100644
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -43,6 +43,9 @@ using boost::bind;
 using boost::weak_ptr;
 using boost::optional;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 /** @param key Key to use to encrypt MP4 outputs */
 FFmpegEncoder::FFmpegEncoder (
diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index d15bdabde..511730185 100644
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -40,6 +40,9 @@ using boost::bind;
 using boost::weak_ptr;
 using boost::optional;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 int FFmpegFileEncoder::_video_stream_index = 0;
 int FFmpegFileEncoder::_audio_stream_index_base = 1;
diff --git a/src/lib/hints.cc b/src/lib/hints.cc
index e936332a2..34a7a8392 100644
--- a/src/lib/hints.cc
+++ b/src/lib/hints.cc
@@ -50,6 +50,9 @@ using boost::weak_ptr;
 using boost::optional;
 using boost::bind;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 Hints::Hints (weak_ptr<const Film> film)
 	: _film (film)
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index b96b0fbe0..89990a427 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -34,6 +34,7 @@
 #include "compose.hpp"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
+#include <boost/bind/placeholders.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/foreach.hpp>
 #include <iostream>
@@ -52,6 +53,9 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 Playlist::Playlist ()
 	: _sequence (true)
diff --git a/src/lib/upload_job.cc b/src/lib/upload_job.cc
index fbfbb92d8..c07e0c3d4 100644
--- a/src/lib/upload_job.cc
+++ b/src/lib/upload_job.cc
@@ -38,6 +38,9 @@ using std::string;
 using std::min;
 using boost::shared_ptr;
 using boost::scoped_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 UploadJob::UploadJob (shared_ptr<const Film> film)
 	: Job (film)
diff --git a/src/lib/verify_dcp_job.cc b/src/lib/verify_dcp_job.cc
index c1dcbc792..3d28fe759 100644
--- a/src/lib/verify_dcp_job.cc
+++ b/src/lib/verify_dcp_job.cc
@@ -28,6 +28,9 @@ using std::string;
 using std::vector;
 using boost::shared_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 VerifyDCPJob::VerifyDCPJob (vector<boost::filesystem::path> directories)
 	: Job (shared_ptr<Film>())
-- 
cgit v1.2.3