libbluray: fix broken BDJ patch
This commit is contained in:
parent
ff8e8d4b4f
commit
938ea3de88
@@ -1,27 +1,24 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5fd3c8de..7ae343e0 100644
|
||||
index 5007bbd..335f3f5 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -228,6 +228,10 @@ if test "x$use_bdjava_jar" = "xyes" && test "x$HAVE_ANT" = "xno"; then
|
||||
AC_MSG_ERROR([BD-J requires ANT, but ant was not found. Please install it.])
|
||||
fi
|
||||
@@ -253,6 +253,7 @@ AS_IF([test "x${JDK_HOME}" != "x"], [
|
||||
])
|
||||
|
||||
+if test "x$use_bdjava_jar" = "xyes"; then
|
||||
+ CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'"
|
||||
+fi
|
||||
+
|
||||
AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."])
|
||||
AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
|
||||
AM_CONDITIONAL([USING_BDJAVA_BUILD_JAR], [ test $use_bdjava_jar = "yes" ])
|
||||
AS_IF([test "x$use_bdjava_jar" = "xyes"], [
|
||||
+ CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'"
|
||||
|
||||
dnl check for ant
|
||||
AC_CHECK_PROG(HAVE_ANT, [ant], yes, no)
|
||||
diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
|
||||
index 511ad533..e273b9e0 100644
|
||||
index 1cb1bfe..94a175c 100644
|
||||
--- a/src/libbluray/bdj/bdj.c
|
||||
+++ b/src/libbluray/bdj/bdj.c
|
||||
@@ -478,6 +478,7 @@ static const char *_find_libbluray_jar(BDJ_STORAGE *storage)
|
||||
// pre-defined search paths for libbluray.jar
|
||||
static const char * const jar_paths[] = {
|
||||
#ifndef _WIN32
|
||||
@@ -533,6 +533,7 @@ static char *_find_libbluray_jar0()
|
||||
# ifdef __FreeBSD__
|
||||
"/usr/local/share/java/" BDJ_JARFILE,
|
||||
# else
|
||||
+ JARDIR "/" BDJ_JARFILE,
|
||||
"/usr/share/java/" BDJ_JARFILE,
|
||||
"/usr/share/libbluray/lib/" BDJ_JARFILE,
|
||||
#endif
|
||||
# endif
|
||||
|
||||
Reference in New Issue
Block a user