GeezerVison is showing github.com — Teach JNA to look for custom library paths · processing/processing-video@038d80f
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboard Collapse file
Copy file name to clipboardExpand all lines: src/processing/video/Video.java +5-14Lines changed: 5 additions & 14 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -155,20 +155,11 @@ static protected void removePlugins() { |
155 | 155 |
|
156 | 156 |
|
157 | 157 | static protected void buildLinuxPaths() { |
158 | | - // looking pretty dire, make sure at least LD_LIBRARY_PATH is set |
159 | | - // see https://github.com/twall/jna/issues/477 |
160 | | - String ldPath = System.getenv("LD_LIBRARY_PATH"); |
161 | | - if (ldPath == null || ldPath.length() == 0) { |
162 | | - System.out.println("Your system's LD_LIBRARY_PATH environment variable " + |
163 | | - "is not set, limiting the search for the video libraries to /usr/lib " + |
164 | | - "and /lib."); |
165 | | - // temporary hack for testing on Raspbian |
166 | | - if (System.getProperty("os.arch").equals("arm")) { |
167 | | - gstreamerLibPath = "/opt/vc/lib:/usr/local/lib:/lib/arm-linux-gnueabihf:/usr/lib/arm-linux-gnueabihf"; |
168 | | - } |
169 | | - } else { |
170 | | - gstreamerLibPath = ldPath; |
171 | | - } |
| 158 | + // the version of the JNA library bundled automatically tries |
| 159 | + // all library paths known to the host system's ldconfig |
| 160 | + // so we'd even catch locations like /usr/local/lib etc |
| 161 | + // PL for upstream: https://github.com/twall/jna/pull/478 |
| 162 | + gstreamerLibPath = ""; |
172 | 163 | gstreamerPluginPath = ""; |
173 | 164 | } |
174 | 165 |
|
|