pyrox.dev
lol
libbluray: fix Java build
+21
-16
+21
-16
pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
+21
-16
pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
···
1
-
diff -ru3 libbluray-0.8.0/configure.ac libbluray-0.8.0-new/configure.ac
2
-
--- libbluray-0.8.0/configure.ac 2015-04-10 09:48:23.000000000 +0300
3
-
+++ libbluray-0.8.0-new/configure.ac 2015-05-18 14:22:01.002075482 +0300
4
-
@@ -231,6 +231,7 @@
5
-
AC_DEFINE([USING_BDJAVA], [1], ["Define to 1 if using BD-Java"])
6
-
AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."])
7
-
AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
8
-
+ CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'"
1
+
diff --git a/configure.ac b/configure.ac
2
+
index 5fd3c8de..7ae343e0 100644
3
+
--- a/configure.ac
4
+
+++ b/configure.ac
5
+
@@ -228,6 +228,10 @@ if test "x$use_bdjava_jar" = "xyes" && test "x$HAVE_ANT" = "xno"; then
6
+
AC_MSG_ERROR([BD-J requires ANT, but ant was not found. Please install it.])
9
7
fi
10
-
AM_CONDITIONAL([USING_BDJAVA], [ test $use_bdjava = "yes" ])
11
8
12
-
diff -ru3 libbluray-0.8.0/src/libbluray/bdj/bdj.c libbluray-0.8.0-new/src/libbluray/bdj/bdj.c
13
-
--- libbluray-0.8.0/src/libbluray/bdj/bdj.c 2015-04-06 19:25:09.000000000 +0300
14
-
+++ libbluray-0.8.0-new/src/libbluray/bdj/bdj.c 2015-05-18 14:22:59.241312808 +0300
15
-
@@ -228,6 +228,7 @@
16
-
#ifdef _WIN32
17
-
"" BDJ_JARFILE,
18
-
#else
9
+
+if test "x$use_bdjava_jar" = "xyes"; then
10
+
+ CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'"
11
+
+fi
12
+
+
13
+
AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."])
14
+
AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
15
+
AM_CONDITIONAL([USING_BDJAVA_BUILD_JAR], [ test $use_bdjava_jar = "yes" ])
16
+
diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
17
+
index 511ad533..e273b9e0 100644
18
+
--- a/src/libbluray/bdj/bdj.c
19
+
+++ b/src/libbluray/bdj/bdj.c
20
+
@@ -478,6 +478,7 @@ static const char *_find_libbluray_jar(BDJ_STORAGE *storage)
21
+
// pre-defined search paths for libbluray.jar
22
+
static const char * const jar_paths[] = {
23
+
#ifndef _WIN32
19
24
+ JARDIR "/" BDJ_JARFILE,
20
25
"/usr/share/java/" BDJ_JARFILE,
21
26
"/usr/share/libbluray/lib/" BDJ_JARFILE,