[libbluray-devel] [Git][videolan/libbluray][master] Add FreeBSD Java paths

[Petri Hintukainen]

Petri Hintukainen pushed to branch master at VideoLAN / libbluray


Commits:
88d89949 by hpi1 at 2021-01-20T19:51:10+02:00
Add FreeBSD Java paths

- - - - -


1 changed file:

- src/libbluray/bdj/bdj.c


Changes:

=====================================
src/libbluray/bdj/bdj.c
=====================================
@@ -398,6 +398,10 @@ static void *_load_jvm(const char **p_java_home)
 #  else
     static const char * const jvm_path[] = {NULL,
                                             JDK_HOME,
+#    ifdef __FreeBSD__
+                                            "/usr/local/openjdk8",
+                                            "/usr/local/openjdk11",
+#    else
                                             "/usr/lib/jvm/default-java",
                                             "/usr/lib/jvm/default",
                                             "/usr/lib/jvm/",
@@ -407,6 +411,7 @@ static void *_load_jvm(const char **p_java_home)
                                             "/usr/lib/jvm/java-8-openjdk",
                                             "/usr/lib/jvm/java-8-openjdk-" JAVA_ARCH,
                                             "/usr/lib/jvm/java-6-openjdk",
+#    endif
     };
     static const char * const jvm_dir[]  = {"jre/lib/" JAVA_ARCH "/server",
                                             "lib/server",
@@ -503,8 +508,12 @@ static char *_find_libbluray_jar0()
     // pre-defined search paths for libbluray.jar
     static const char * const jar_paths[] = {
 #ifndef _WIN32
+#  ifdef __FreeBSD__
+        "/usr/local/share/java/" BDJ_JARFILE,
+#  else
         "/usr/share/java/" BDJ_JARFILE,
         "/usr/share/libbluray/lib/" BDJ_JARFILE,
+#  endif
 #endif
         BDJ_JARFILE,
     };



View it on GitLab: https://code.videolan.org/videolan/libbluray/-/commit/88d899498c7089f02c617e7b7df23fda2cea7e7b

-- 
View it on GitLab: https://code.videolan.org/videolan/libbluray/-/commit/88d899498c7089f02c617e7b7df23fda2cea7e7b
You're receiving this email because of your account on code.videolan.org.