Setup grok LD_LIBRARY_PATH when required (#2657).

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 3464a73d5ab10d74d793c3a82cd8c10e92911fcc..cd9c7a8d029d1e2ccf9d7c31e94492249b8572f6 100644 (file)
--- 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 eff425f25eb0592f23620d820e81390786e916c9..61285167da6767782c8244fe821d8ae2ab3f53f6 100644 (file)
--- 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 e6aa09df23f5c5e00b1dc7f76ec8b020450d5c78..c335db616f5b8f78eab1aa9d4d7a158b31c8f555 100644 (file)
--- 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 b7100d62a543f783041cad3704bca4e80eaf44e8..7dcb82350e4a90547c146f94060f12f983d8ebe9 100644 (file)
--- 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 9e4a8814f41cdfadd51863f359ec2ece64a5798e..8997bb92c4bf53ba079ade8e9349ef61818ab5c7 100644 (file)
--- 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);