diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-11-23 00:04:57 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-01-28 02:01:58 +0100 |
| commit | ec2ae7e150392725b0f1dbbccffce8f0cafe1c09 (patch) | |
| tree | 9618eec03dfcb4c01fc4f1cf606a55db8bc7b769 /src | |
| parent | 00e41726073ccaabe5cb0899cce74c7c72721a06 (diff) | |
Setup grok LD_LIBRARY_PATH when required (#2657).
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/dcpomatic.cc | 7 | ||||
| -rw-r--r-- | src/tools/dcpomatic_batch.cc | 7 | ||||
| -rw-r--r-- | src/tools/dcpomatic_cli.cc | 1 | ||||
| -rw-r--r-- | src/tools/dcpomatic_server.cc | 1 | ||||
| -rw-r--r-- | src/tools/dcpomatic_server_cli.cc | 1 |
5 files changed, 17 insertions, 0 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 1a2f4100b..7c00ef12f 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -1504,6 +1504,12 @@ private: _history_items = history.size (); dcpomatic_log->set_types (Config::instance()->log_types()); + +#ifdef DCPOMATIC_GROK + if (what == Config::GROK) { + setup_grok_library_path(); + } +#endif } void update_checker_state_changed () @@ -1756,6 +1762,7 @@ private: #ifdef DCPOMATIC_GROK grk_plugin::setMessengerLogger(new grk_plugin::GrokLogger("[GROK] ")); + setup_grok_library_path(); #endif } catch (exception& e) diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc index 273078b89..df49acfac 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -382,6 +382,12 @@ private: ); } } + +#ifdef DCPOMATIC_GROK + if (what == Config::GROK) { + setup_grok_library_path(); + } +#endif } boost::optional<boost::filesystem::path> _last_parent; @@ -504,6 +510,7 @@ class App : public wxApp #ifdef DCPOMATIC_GROK grk_plugin::setMessengerLogger(new grk_plugin::GrokLogger("[GROK] ")); + setup_grok_library_path(); #endif return true; diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index e6aa09df2..c335db616 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -501,6 +501,7 @@ main (int argc, char* argv[]) #ifdef DCPOMATIC_GROK grk_plugin::setMessengerLogger(new grk_plugin::GrokLogger("[GROK] ")); + setup_grok_library_path(); #endif if (progress) { diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index 10af74728..622704d21 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -334,6 +334,7 @@ private: #ifdef DCPOMATIC_GROK grk_plugin::setMessengerLogger(new grk_plugin::GrokLogger("[GROK] ")); + setup_grok_library_path(); #endif return true; diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc index 9e4a8814f..8997bb92c 100644 --- a/src/tools/dcpomatic_server_cli.cc +++ b/src/tools/dcpomatic_server_cli.cc @@ -114,6 +114,7 @@ main (int argc, char* argv[]) #ifdef DCPOMATIC_GROK setMessengerLogger(new grk_plugin::GrokLogger("[GROK] ")); + setup_grok_library_path(); #endif EncodeServer server (verbose, num_threads); |