diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-11-23 00:04:57 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-11-29 21:20:31 +0100 |
| commit | cb68d75e06df4df193d977600815185648e31ff0 (patch) | |
| tree | f5cb4e2c648c4afa7cedd7d59d87ac96769ecc17 | |
| parent | db5863ed0c397297cc2b401c791a664c91b9e8bf (diff) | |
Setup grok LD_LIBRARY_PATH when required (#2657).
| -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 3464a73d5..cd9c7a8d0 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -1503,6 +1503,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 () @@ -1755,6 +1761,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 eff425f25..61285167d 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -381,6 +381,12 @@ private: ); } } + +#ifdef DCPOMATIC_GROK + if (what == Config::GROK) { + setup_grok_library_path(); + } +#endif } boost::optional<boost::filesystem::path> _last_parent; @@ -503,6 +509,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 b7100d62a..7dcb82350 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -331,6 +331,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); |