mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-18 10:56:53 +00:00
23 lines
1 KiB
Diff
23 lines
1 KiB
Diff
diff -ru3 libbluray-0.8.0/configure.ac libbluray-0.8.0-new/configure.ac
|
|
--- libbluray-0.8.0/configure.ac 2015-04-10 09:48:23.000000000 +0300
|
|
+++ libbluray-0.8.0-new/configure.ac 2015-05-18 14:22:01.002075482 +0300
|
|
@@ -231,6 +231,7 @@
|
|
AC_DEFINE([USING_BDJAVA], [1], ["Define to 1 if using BD-Java"])
|
|
AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."])
|
|
AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
|
|
+ CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'"
|
|
fi
|
|
AM_CONDITIONAL([USING_BDJAVA], [ test $use_bdjava = "yes" ])
|
|
|
|
diff -ru3 libbluray-0.8.0/src/libbluray/bdj/bdj.c libbluray-0.8.0-new/src/libbluray/bdj/bdj.c
|
|
--- libbluray-0.8.0/src/libbluray/bdj/bdj.c 2015-04-06 19:25:09.000000000 +0300
|
|
+++ libbluray-0.8.0-new/src/libbluray/bdj/bdj.c 2015-05-18 14:22:59.241312808 +0300
|
|
@@ -228,6 +228,7 @@
|
|
#ifdef _WIN32
|
|
"" BDJ_JARFILE,
|
|
#else
|
|
+ JARDIR "/" BDJ_JARFILE,
|
|
"/usr/share/java/" BDJ_JARFILE,
|
|
"/usr/share/libbluray/lib/" BDJ_JARFILE,
|
|
#endif
|