diff options
| author | Kyle Lacy <kylelacy+git@pm.me> | 2018-06-07 22:22:51 -0700 |
|---|---|---|
| committer | Kyle Lacy <kylelacy+git@pm.me> | 2018-06-07 22:22:51 -0700 |
| commit | e534844afa650a1cb53a8bc4a55a2af7db3bf7f0 (patch) | |
| tree | f00efbfa3256ab1120a00292c4fbcac57ba2afd4 /pkgs/development/libraries/libbluray | |
| parent | f5b0d6d88963b77659348805f5347bb6655ec713 (diff) | |
| download | nixpkgs-e534844afa650a1cb53a8bc4a55a2af7db3bf7f0.tar nixpkgs-e534844afa650a1cb53a8bc4a55a2af7db3bf7f0.tar.gz nixpkgs-e534844afa650a1cb53a8bc4a55a2af7db3bf7f0.tar.bz2 nixpkgs-e534844afa650a1cb53a8bc4a55a2af7db3bf7f0.tar.lz nixpkgs-e534844afa650a1cb53a8bc4a55a2af7db3bf7f0.tar.xz nixpkgs-e534844afa650a1cb53a8bc4a55a2af7db3bf7f0.tar.zst nixpkgs-e534844afa650a1cb53a8bc4a55a2af7db3bf7f0.zip | |
libbluray: fix Java build
Diffstat (limited to 'pkgs/development/libraries/libbluray')
| -rw-r--r-- | pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch index 2680b1c6de5..8d9c5d0fbba 100644 --- a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch +++ b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch @@ -1,21 +1,26 @@ -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\"'" +diff --git a/configure.ac b/configure.ac +index 5fd3c8de..7ae343e0 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 - 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 ++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" ]) +diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c +index 511ad533..e273b9e0 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 + JARDIR "/" BDJ_JARFILE, "/usr/share/java/" BDJ_JARFILE, "/usr/share/libbluray/lib/" BDJ_JARFILE, |