[arch-commits] Commit in libbluray/repos (6 files)
Maxime Gauduin
alucryd at archlinux.org
Thu Dec 22 11:39:15 UTC 2016
Date: Thursday, December 22, 2016 @ 11:39:15
Author: alucryd
Revision: 284428
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
libbluray/repos/testing-i686/PKGBUILD
(from rev 284427, libbluray/trunk/PKGBUILD)
libbluray/repos/testing-x86_64/PKGBUILD
(from rev 284427, libbluray/trunk/PKGBUILD)
Deleted:
libbluray/repos/testing-i686/PKGBUILD
libbluray/repos/testing-i686/libbluray-jdk8.patch
libbluray/repos/testing-x86_64/PKGBUILD
libbluray/repos/testing-x86_64/libbluray-jdk8.patch
-------------------------------------+
/PKGBUILD | 110 ++++++++++++++++++++++++++++++++++
testing-i686/PKGBUILD | 43 -------------
testing-i686/libbluray-jdk8.patch | 33 ----------
testing-x86_64/PKGBUILD | 43 -------------
testing-x86_64/libbluray-jdk8.patch | 33 ----------
5 files changed, 110 insertions(+), 152 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2016-12-22 11:39:04 UTC (rev 284427)
+++ testing-i686/PKGBUILD 2016-12-22 11:39:15 UTC (rev 284428)
@@ -1,43 +0,0 @@
-# $Id$
-# 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=4
-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=('fontconfig' 'glibc' 'libfreetype.so' 'libxml2')
-makedepends=('apache-ant')
-optdepends=('java-environment: BD-J library')
-provides=('libbluray.so')
-source=("ftp://ftp.videolan.org/pub/videolan/libbluray/${pkgver}/libbluray-${pkgver}.tar.bz2"
- 'libbluray-jdk8.patch')
-sha256sums=('efc994f42d2bce6af2ce69d05ba89dbbd88bcec7aca065de094fb3a7880ce7ea'
- 'dc7f4300ae98c5a3b88f10c2b12ce74d1ef31e8c8798823baffe17ae6ca8d349')
-
-prepare() {
- cd libbluray-${pkgver}
-
- patch -Np1 -i ../libbluray-jdk8.patch
-}
-
-build() {
- cd libbluray-${pkgver}
-
- ./configure \
- --prefix='/usr'
- make
-}
-
-package() {
- cd libbluray-${pkgver}
-
- make DESTDIR="${pkgdir}" install
-}
-
-# vim: ts=2 sw=2 et:
Copied: libbluray/repos/testing-i686/PKGBUILD (from rev 284427, libbluray/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-12-22 11:39:15 UTC (rev 284428)
@@ -0,0 +1,55 @@
+# $Id$
+# 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.3.r84.05c9fdec
+pkgrel=1
+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=('fontconfig' 'glibc' 'libfreetype.so' 'libxml2')
+makedepends=('apache-ant' 'git')
+optdepends=('java-environment: BD-J library')
+provides=('libbluray.so')
+_commit_libbluray='05c9fdececbff43561f8d8ca704e7e2203bdd5a8'
+_commit_libudfread='64ac239e7aa741ad3e2e2d48eafd6e26fb202ee7'
+source=("git+https://git.videolan.org/git/libbluray.git#commit=${_commit_libbluray}"
+ "git+https://git.videolan.org/git/libudfread.git#commit=${_commit_libudfread}")
+sha256sums=('SKIP'
+ 'SKIP')
+
+pkgver() {
+ cd libbluray
+
+ git describe | sed 's/-/.r/; s/-g/./'
+}
+
+prepare() {
+ cd libbluray
+
+ git submodule init contrib/libudfread
+ git config submodule.contrib/udfread.url ../libudfread
+ git submodule update contrib/libudfread
+
+ ./bootstrap
+}
+
+build() {
+ cd libbluray
+
+ ./configure \
+ --prefix='/usr'
+ make
+}
+
+package() {
+ cd libbluray
+
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
Deleted: testing-i686/libbluray-jdk8.patch
===================================================================
--- testing-i686/libbluray-jdk8.patch 2016-12-22 11:39:04 UTC (rev 284427)
+++ testing-i686/libbluray-jdk8.patch 2016-12-22 11:39:15 UTC (rev 284428)
@@ -1,33 +0,0 @@
-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
---- a/src/libbluray/bdj/bdj.c
-+++ b/src/libbluray/bdj/bdj.c
-@@ -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",
-- "/usr/lib/jvm/java-6-openjdk",
-- "/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",
-+ "/usr/lib/jvm/java-6-openjdk",
-+ };
- static const char jvm_dir[] = "jre/lib/" JAVA_ARCH "/server";
- static const char jvm_lib[] = "libjvm";
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2016-12-22 11:39:04 UTC (rev 284427)
+++ testing-x86_64/PKGBUILD 2016-12-22 11:39:15 UTC (rev 284428)
@@ -1,43 +0,0 @@
-# $Id$
-# 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=4
-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=('fontconfig' 'glibc' 'libfreetype.so' 'libxml2')
-makedepends=('apache-ant')
-optdepends=('java-environment: BD-J library')
-provides=('libbluray.so')
-source=("ftp://ftp.videolan.org/pub/videolan/libbluray/${pkgver}/libbluray-${pkgver}.tar.bz2"
- 'libbluray-jdk8.patch')
-sha256sums=('efc994f42d2bce6af2ce69d05ba89dbbd88bcec7aca065de094fb3a7880ce7ea'
- 'dc7f4300ae98c5a3b88f10c2b12ce74d1ef31e8c8798823baffe17ae6ca8d349')
-
-prepare() {
- cd libbluray-${pkgver}
-
- patch -Np1 -i ../libbluray-jdk8.patch
-}
-
-build() {
- cd libbluray-${pkgver}
-
- ./configure \
- --prefix='/usr'
- make
-}
-
-package() {
- cd libbluray-${pkgver}
-
- make DESTDIR="${pkgdir}" install
-}
-
-# vim: ts=2 sw=2 et:
Copied: libbluray/repos/testing-x86_64/PKGBUILD (from rev 284427, libbluray/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-12-22 11:39:15 UTC (rev 284428)
@@ -0,0 +1,55 @@
+# $Id$
+# 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.3.r84.05c9fdec
+pkgrel=1
+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=('fontconfig' 'glibc' 'libfreetype.so' 'libxml2')
+makedepends=('apache-ant' 'git')
+optdepends=('java-environment: BD-J library')
+provides=('libbluray.so')
+_commit_libbluray='05c9fdececbff43561f8d8ca704e7e2203bdd5a8'
+_commit_libudfread='64ac239e7aa741ad3e2e2d48eafd6e26fb202ee7'
+source=("git+https://git.videolan.org/git/libbluray.git#commit=${_commit_libbluray}"
+ "git+https://git.videolan.org/git/libudfread.git#commit=${_commit_libudfread}")
+sha256sums=('SKIP'
+ 'SKIP')
+
+pkgver() {
+ cd libbluray
+
+ git describe | sed 's/-/.r/; s/-g/./'
+}
+
+prepare() {
+ cd libbluray
+
+ git submodule init contrib/libudfread
+ git config submodule.contrib/udfread.url ../libudfread
+ git submodule update contrib/libudfread
+
+ ./bootstrap
+}
+
+build() {
+ cd libbluray
+
+ ./configure \
+ --prefix='/usr'
+ make
+}
+
+package() {
+ cd libbluray
+
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
Deleted: testing-x86_64/libbluray-jdk8.patch
===================================================================
--- testing-x86_64/libbluray-jdk8.patch 2016-12-22 11:39:04 UTC (rev 284427)
+++ testing-x86_64/libbluray-jdk8.patch 2016-12-22 11:39:15 UTC (rev 284428)
@@ -1,33 +0,0 @@
-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
---- a/src/libbluray/bdj/bdj.c
-+++ b/src/libbluray/bdj/bdj.c
-@@ -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",
-- "/usr/lib/jvm/java-6-openjdk",
-- "/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",
-+ "/usr/lib/jvm/java-6-openjdk",
-+ };
- static const char jvm_dir[] = "jre/lib/" JAVA_ARCH "/server";
- static const char jvm_lib[] = "libjvm";
More information about the arch-commits
mailing list