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

[Maxime Gauduin]

    Date: Monday, May 2, 2016 @ 00:12:21
  Author: alucryd
Revision: 266737

FS#48982: libbluray 0.9.2-2

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

----------------------+
 PKGBUILD             |   35 +++++++++++++++++++++++++----------
 libbluray-jdk8.patch |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-01 18:00:25 UTC (rev 266736)
+++ PKGBUILD	2016-05-01 22:12:21 UTC (rev 266737)
@@ -1,28 +1,43 @@
 # $Id$
-# Maintainer:  Ionut Biru <ibiru at archlinux.org>
-# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
 # Contributor: Andrew Cook <ariscop at gmail.com>
 
 pkgname=libbluray
 pkgver=0.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Library to access Blu-Ray disks for video playback'
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/libbluray.html'
 license=('LGPL2.1')
-depends=('libxml2' 'freetype2' 'fontconfig')
+depends=('fontconfig' 'glibc' 'libfreetype.so' 'libxml2')
 makedepends=('apache-ant')
-optdepends=('java-environment: for BD-J library')
+optdepends=('java-environment: BD-J library')
 provides=('libbluray.so')
-source=(ftp://ftp.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('836b2de16547776bf2726166cf796f13')
+source=("ftp://ftp.videolan.org/pub/videolan/libbluray/${pkgver}/libbluray-${pkgver}.tar.bz2"
+        'libbluray-jdk8.patch')
+sha256sums=('efc994f42d2bce6af2ce69d05ba89dbbd88bcec7aca065de094fb3a7880ce7ea'
+            '7021ed1e3d39dc021fc84700a4c8f2372e6d8a6dca9780dae5026cc0b20fb82f')
 
 build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
+  cd libbluray-${pkgver}
+
+  patch -Np1 -i ../libbluray-jdk8.patch
+}
+
+build() {
+  cd libbluray-${pkgver}
+
+  ./configure \
+    --prefix='/usr'
   make
 }
 
 package() {
-  make DESTDIR="$pkgdir" -C $pkgname-$pkgver install
+  cd libbluray-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
 }
+
+# vim: ts=2 sw=2 et:

Added: libbluray-jdk8.patch
===================================================================
--- libbluray-jdk8.patch	                        (rev 0)
+++ libbluray-jdk8.patch	2016-05-01 22:12:21 UTC (rev 266737)
@@ -0,0 +1,35 @@
+From 448eb757893e3875336004ca8375eb1219b72634 Mon Sep 17 00:00:00 2001
+From: hpi1 <hpi1 at anonymous.org>
+Date: Thu, 28 Apr 2016 16:44:26 +0300
+Subject: [PATCH] bdj: update linux Java search path list and preferred JVM
+
+1) JAVA_HOME
+2) System default JVM
+3) OpenJDK 7
+4) OpenJDK 8
+5) OpenJDK 6
+---
+ src/libbluray/bdj/bdj.c |    6 ++++--
+ 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)
+ # 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",
+     };
+     static const char  jvm_dir[]  = "jre/lib/" JAVA_ARCH "/server";
+     static const char  jvm_lib[]  = "libjvm";
+-- 
+1.7.10.4
+