[arch-commits] Commit in libbluray/trunk (PKGBUILD libbluray-jdk8.patch)

[Maxime Gauduin]

    Date: Monday, May 9, 2016 @ 00:55:29
  Author: alucryd
Revision: 267243

FS#48982: libbluray 0.9.2-3

Modified:
  libbluray/trunk/PKGBUILD
  libbluray/trunk/libbluray-jdk8.patch

----------------------+
 PKGBUILD             |    6 +++---
 libbluray-jdk8.patch |   25 +++++++++++--------------
 2 files changed, 14 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-08 21:59:42 UTC (rev 267242)
+++ PKGBUILD	2016-05-08 22:55:29 UTC (rev 267243)
@@ -6,7 +6,7 @@
 
 pkgname=libbluray
 pkgver=0.9.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Library to access Blu-Ray disks for video playback'
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/libbluray.html'
@@ -18,9 +18,9 @@
 source=("ftp://ftp.videolan.org/pub/videolan/libbluray/${pkgver}/libbluray-${pkgver}.tar.bz2"
         'libbluray-jdk8.patch')
 sha256sums=('efc994f42d2bce6af2ce69d05ba89dbbd88bcec7aca065de094fb3a7880ce7ea'
-            '7021ed1e3d39dc021fc84700a4c8f2372e6d8a6dca9780dae5026cc0b20fb82f')
+            '11d848c931a0256989f8590b49739935ca29a63f8388af17e33379e5b839ced4')
 
-build() {
+prepare() {
   cd libbluray-${pkgver}
 
   patch -Np1 -i ../libbluray-jdk8.patch

Modified: libbluray-jdk8.patch
===================================================================
--- libbluray-jdk8.patch	2016-05-08 21:59:42 UTC (rev 267242)
+++ libbluray-jdk8.patch	2016-05-08 22:55:29 UTC (rev 267243)
@@ -13,23 +13,20 @@
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
-index 6ad6b59..ef82ee4 100644
 --- a/src/libbluray/bdj/bdj.c
 +++ b/src/libbluray/bdj/bdj.c
-@@ -202,9 +202,11 @@ static void *_load_jvm(const char **p_java_home)
+@@ -202,9 +202,12 @@ static void *_load_jvm(const char **p_java_home)
  # else
      static const char *jvm_path[] = {NULL, JDK_HOME,
-                                      "/usr/lib/jvm/default-java",
--                                     "/usr/lib/jvm/java-6-openjdk",
--                                     "/usr/lib/jvm/java-7-openjdk",
-+                                     "/usr/lib/jvm/default",
-                                      "/etc/java-config-2/current-system-vm",
-+                                     "/usr/lib/jvm/java-7-openjdk",
-+                                     "/usr/lib/jvm/java-8-openjdk",
-+                                     "/usr/lib/jvm/java-6-openjdk",
-     };
+                                     "/usr/lib/jvm/default-java",
+-                                    "/usr/lib/jvm/java-6-openjdk",
+-                                    "/usr/lib/jvm/java-7-openjdk",
+-                                    "/etc/java-config-2/current-system-vm"};
++                                    "/usr/lib/jvm/default",
++                                    "/etc/java-config-2/current-system-vm",
++                                    "/usr/lib/jvm/java-7-openjdk",
++                                    "/usr/lib/jvm/java-8-openjdk",
++                                    "/usr/lib/jvm/java-6-openjdk",
++    };
      static const char  jvm_dir[]  = "jre/lib/" JAVA_ARCH "/server";
      static const char  jvm_lib[]  = "libjvm";
--- 
-1.7.10.4
-