summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD47
2 files changed, 29 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a6282b2dc13f..f36376ccb0dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,16 +7,17 @@ pkgbase = libbluray-git
license = LGPL2.1
makedepends = git
makedepends = apache-ant
- makedepends = libxml2
- makedepends = fontconfig
- makedepends = libudfread-git
- makedepends = java-environment<=19
+ makedepends = java-environment
+ depends = libxml2
depends = libxml2.so
+ depends = fontconfig
depends = libfontconfig.so
+ depends = freetype2
depends = libfreetype.so
+ depends = libudfread
depends = libudfread.so
optdepends = libaacs: Enable AACS decryption
- optdepends = java-runtime<=19: BD-J library
+ optdepends = java-runtime: BD-J library
provides = libbluray
provides = libbluray.so
conflicts = libbluray
diff --git a/PKGBUILD b/PKGBUILD
index 632ab675e4bb..2cb5b34f6c1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,24 +7,25 @@ pkgdesc="Library to access Blu-Ray disks for video playback. (GIT version)"
arch=('x86_64')
license=('LGPL2.1')
url='https://www.videolan.org/developers/libbluray.html'
-depends=('libxml2.so'
- 'libfontconfig.so'
- 'libfreetype.so'
- 'libudfread.so'
- )
-makedepends=('git'
- 'apache-ant'
- 'libxml2'
- 'fontconfig'
- 'libudfread-git'
- 'java-environment<=19'
- )
-optdepends=('libaacs: Enable AACS decryption'
- 'java-runtime<=19: BD-J library'
- )
-provides=('libbluray'
- 'libbluray.so'
- )
+depends=(
+ 'libxml2' 'libxml2.so'
+ 'fontconfig' 'libfontconfig.so'
+ 'freetype2' 'libfreetype.so'
+ 'libudfread' 'libudfread.so'
+)
+makedepends=(
+ 'git'
+ 'apache-ant'
+ 'java-environment'
+)
+optdepends=(
+ 'libaacs: Enable AACS decryption'
+ 'java-runtime: BD-J library'
+)
+provides=(
+ 'libbluray'
+ 'libbluray.so'
+)
conflicts=('libbluray')
source=('git+https://code.videolan.org/videolan/libbluray.git')
sha256sums=('SKIP')
@@ -36,12 +37,13 @@ pkgver() {
prepare() {
mkdir -p build
+
+ sed -e 's|java_version_asm=1.5|java_version_asm=1.8|g' \
+ -e 's|java_version_bdj=1.4|java_version_bdj=1.8|g' \
+ -i libbluray/Makefile.am
}
build() {
- export JDK_HOME="/usr/lib/jvm/java-19-openjdk"
- export JAVAC="/usr/lib/jvm/java-19-openjdk/bin/javac"
-
cd libbluray
./bootstrap
cd "${srcdir}/build"
@@ -53,8 +55,5 @@ build() {
}
package() {
- export JDK_HOME="/usr/lib/jvm/java-19-openjdk"
- export JAVAC="/usr/lib/jvm/java-19-openjdk/bin/javac"
-
make -C build DESTDIR="${pkgdir}" install
}