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

[Maxime Gauduin]

Date: Wednesday, December 21, 2016 @ 13:25:05
  Author: alucryd
Revision: 284385

FS#48982: libbluray 0.9.2-4

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

--+
 PKGBUILD |4 ++--
 libbluray-jdk8.patch |3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-21 12:11:05 UTC (rev 284384)
+++ PKGBUILD2016-12-21 13:25:05 UTC (rev 284385)
@@ -6,7 +6,7 @@
 
 pkgname=libbluray
 pkgver=0.9.2
-pkgrel=3
+pkgrel=4
 pkgdesc='Library to access Blu-Ray disks for video playback'
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/libbluray.html'
@@ -18,7 +18,7 @@
 
source=("ftp://ftp.videolan.org/pub/videolan/libbluray/${pkgver}/libbluray-${pkgver}.tar.bz2;
 'libbluray-jdk8.patch')
 sha256sums=('efc994f42d2bce6af2ce69d05ba89dbbd88bcec7aca065de094fb3a7880ce7ea'
-'11d848c931a0256989f8590b49739935ca29a63f8388af17e33379e5b839ced4')
+'dc7f4300ae98c5a3b88f10c2b12ce74d1ef31e8c8798823baffe17ae6ca8d349')
 
 prepare() {
   cd libbluray-${pkgver}

Modified: libbluray-jdk8.patch
===
--- libbluray-jdk8.patch2016-12-21 12:11:05 UTC (rev 284384)
+++ libbluray-jdk8.patch2016-12-21 13:25:05 UTC (rev 284385)
@@ -15,7 +15,7 @@
 diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
 --- a/src/libbluray/bdj/bdj.c
 +++ b/src/libbluray/bdj/bdj.c
-@@ -202,9 +202,12 @@ static void *_load_jvm(const char **p_java_home)
+@@ -202,9 +202,13 @@ static void *_load_jvm(const char **p_java_home)
  # else
  static const char *jvm_path[] = {NULL, JDK_HOME,
  "/usr/lib/jvm/default-java",
@@ -23,6 +23,7 @@
 -"/usr/lib/jvm/java-7-openjdk",
 -"/etc/java-config-2/current-system-vm"};
 +"/usr/lib/jvm/default",
++"/usr/lib/jvm",
 +"/etc/java-config-2/current-system-vm",
 +"/usr/lib/jvm/java-7-openjdk",
 +"/usr/lib/jvm/java-8-openjdk",

[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
===
--- PKGBUILD2016-05-08 21:59:42 UTC (rev 267242)
+++ PKGBUILD2016-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.patch2016-05-08 21:59:42 UTC (rev 267242)
+++ libbluray-jdk8.patch2016-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
-

[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
===
--- PKGBUILD2016-05-01 18:00:25 UTC (rev 266736)
+++ PKGBUILD2016-05-01 22:12:21 UTC (rev 266737)
@@ -1,28 +1,43 @@
 # $Id$
-# Maintainer:  Ionut Biru 
-# Maintainer:  Bartłomiej Piotrowski 
+# Maintainer: Maxime Gauduin 
+# Contributor: Ionut Biru 
+# Contributor: Bartłomiej Piotrowski 
 # Contributor: Andrew Cook 
 
 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.patch2016-05-01 22:12:21 UTC (rev 266737)
@@ -0,0 +1,35 @@
+From 448eb757893e3875336004ca8375eb1219b72634 Mon Sep 17 00:00:00 2001
+From: hpi1 
+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
+