diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-09-14 22:16:01 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-09-15 14:27:21 +0200 |
| commit | 7cd1d82e33d074050b132dba8c4ae4e0d4804310 (patch) | |
| tree | be8a4e4e630450736b4cba12a518e1219a688c71 /src | |
| parent | de3466fa0e6b8fa39fda86d39c2d4792ec69ecbf (diff) | |
Allow building with boost::process v2 (added in Ubuntu 25.10).
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/dcpomatic_disk.cc | 9 | ||||
| -rw-r--r-- | src/tools/wscript | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc index 287efb901..176fbd208 100644 --- a/src/tools/dcpomatic_disk.cc +++ b/src/tools/dcpomatic_disk.cc @@ -211,7 +211,11 @@ public: LOG_DISK_NC("Not starting writer process as DCPOMATIC_NO_START_WRITER is set"); } else { LOG_DISK("Starting writer process {}", disk_writer_path().string()); +#ifdef DCPOMATIC_BOOST_PROCESS_V1 _writer = new boost::process::child (disk_writer_path()); +#else + _writer = new boost::process::v2::process(_context, disk_writer_path(), {}); +#endif } #endif @@ -428,7 +432,12 @@ private: std::vector<boost::filesystem::path> _dcp_paths; std::vector<Drive> _drives; #ifndef DCPOMATIC_OSX +#ifdef DCPOMATIC_BOOST_PROCESS_V1 boost::process::child* _writer; +#else + boost::process::v2::process* _writer; + boost::asio::io_context _context; +#endif #endif Nanomsg _nanomsg; wxSizer* _sizer; diff --git a/src/tools/wscript b/src/tools/wscript index 45ce81533..3128486f5 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -98,7 +98,7 @@ def configure(conf): def build(bld): uselib = 'BOOST_THREAD BOOST_DATETIME DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC ' uselib += 'AVUTIL SWSCALE SWRESAMPLE POSTPROC CURL BOOST_FILESYSTEM SSH ZIP CAIROMM FONTCONFIG PANGOMM SUB ' - uselib += 'SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO PNG JPEG LEQM_NRT SQLITE3 ' + uselib += 'SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO PNG JPEG LEQM_NRT SQLITE3 BOOST_PROCESS ' if bld.env.ENABLE_DISK: if bld.env.TARGET_LINUX: |