libbluray | branch: master | hpi1 <[email protected]> | Tue May 27 12:19:14 
2014 +0300| [008d084e96cd925fdcb40cfe732a7aacd7d0dd9e] | committer: hpi1

Add some common paths for JVM in linux

> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=008d084e96cd925fdcb40cfe732a7aacd7d0dd9e
---

 src/libbluray/bdj/bdj.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
index 740ae07..754c79e 100644
--- a/src/libbluray/bdj/bdj.c
+++ b/src/libbluray/bdj/bdj.c
@@ -154,7 +154,11 @@ static void *_load_jvm(const char **p_java_home)
     static const char  jvm_dir[]  = "jre/bin/server";
     static const char  jvm_lib[]  = "jvm";
 # else
-    static const char *jvm_path[] = {NULL, JDK_HOME, 
"/usr/lib/jvm/default-java/"};
+    static const char *jvm_path[] = {NULL, JDK_HOME,
+                                    "/usr/lib/jvm/default-java",
+                                    "/usr/lib/jvm/java-6-openjdk",
+                                    "/usr/lib/jvm/java-7-openjdk",
+                                    "/etc/java-config-2/current-system-vm"};
     static const char  jvm_dir[]  = "jre/lib/" JAVA_ARCH "/server";
     static const char  jvm_lib[]  = "libjvm";
 # endif

_______________________________________________
libbluray-devel mailing list
[email protected]
https://mailman.videolan.org/listinfo/libbluray-devel

Reply via email to