diff --git a/libbluray-jvm_dir.patch b/libbluray-jvm_dir.patch new file mode 100644 index 0000000..08b65cf --- /dev/null +++ b/libbluray-jvm_dir.patch @@ -0,0 +1,11 @@ +--- src/libbluray/bdj/bdj.c.orig 2014-09-01 14:06:01.000000000 +0200 ++++ src/libbluray/bdj/bdj.c 2014-12-19 10:34:11.196480400 +0100 +@@ -159,7 +159,7 @@ + "/usr/lib/jvm/java-6-openjdk", + "/usr/lib/jvm/java-7-openjdk", + "/etc/java-config-2/current-system-vm"}; +- static const char jvm_dir[] = "jre/lib/" JAVA_ARCH "/server"; ++ static const char jvm_dir[] = "lib/" JAVA_ARCH "/server"; + static const char jvm_lib[] = "libjvm"; + # endif + #endif diff --git a/libbluray.changes b/libbluray.changes index a9db131..c943f9d 100644 --- a/libbluray.changes +++ b/libbluray.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Dec 19 09:53:26 UTC 2014 - joerg.lorenzen@ki.tng.de + +- Added patch libbluray-jvm_dir.patch to set the correct path to + java lib because variable JAVA_HOME on openSUSE is defined + as '/usr//jvm/jre' by update-alternatives. + ------------------------------------------------------------------- Thu Dec 18 11:15:47 UTC 2014 - joerg.lorenzen@ki.tng.de diff --git a/libbluray.spec b/libbluray.spec index 68f1c8c..e6f2202 100644 --- a/libbluray.spec +++ b/libbluray.spec @@ -28,6 +28,7 @@ Group: Productivity/Multimedia/Other Url: http://bd.videolan.org Source: ftp://ftp.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}.tar.bz2 Patch1: libbluray-autotools.patch +Patch2: libbluray-jvm_dir.patch Source99: baselibs.conf BuildRequires: libtool BuildRequires: pkg-config @@ -84,6 +85,7 @@ MPlayer). We, the authors of this library, do not condone nor endorse piracy. %prep %setup -q %patch1 -p0 +%patch2 -p0 %build autoreconf -fiv %configure --disable-static --enable-bdjava