[vlc-commits] [Git][videolan/vlc][3.0.x] contrib: libbluray: Fix build with recent JDK version

[Felix Paul Kühne (@fkuehne)]

Felix Paul Kühne pushed to branch 3.0.x at VideoLAN / VLC


Commits:
36700199 by Hugo Beauzée-Luyssen at 2022-05-07T11:04:57+00:00
contrib: libbluray: Fix build with recent JDK version

(cherry picked from commit aeb120a889fe12f4636fe470bbc25b0fbc53a4d5)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

- - - - -


2 changed files:

- + contrib/src/bluray/0001-Fix-build-failure-after-Oracle-Java-CPU-for-April-20.patch
- contrib/src/bluray/rules.mak


Changes:

=====================================
contrib/src/bluray/0001-Fix-build-failure-after-Oracle-Java-CPU-for-April-20.patch
=====================================
@@ -0,0 +1,34 @@
+From 8f26777b1ce124ff761f80ef52d6be10bcea323e Mon Sep 17 00:00:00 2001
+From: Fridrich Strba <fstrba at suse.com>
+Date: Mon, 25 Apr 2022 14:28:58 +0300
+Subject: [PATCH] Fix build failure after Oracle Java CPU for April 2022
+
+---
+ src/libbluray/bdj/java/java/io/BDFileSystem.java | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/libbluray/bdj/java/java/io/BDFileSystem.java b/src/libbluray/bdj/java/java/io/BDFileSystem.java
+index 03add5d1..fabe57bc 100644
+--- a/src/libbluray/bdj/java/java/io/BDFileSystem.java
++++ b/src/libbluray/bdj/java/java/io/BDFileSystem.java
+@@ -227,6 +227,17 @@ public abstract class BDFileSystem extends FileSystem {
+         return fs.isAbsolute(f);
+     }
+ 
++    public boolean isInvalid(File f) {
++        try {
++            Method m = fs.getClass().getDeclaredMethod("isInvalid", new Class[] { File.class });
++            Object[] args = new Object[] {(Object)f};
++            Boolean result = (Boolean)m.invoke(fs, args);
++            return result.booleanValue();
++        } finally {
++            return false;
++        }
++    }
++
+     public String resolve(File f) {
+         if (!booted)
+             return fs.resolve(f);
+-- 
+2.35.1
+


=====================================
contrib/src/bluray/rules.mak
=====================================
@@ -49,6 +49,7 @@ $(TARBALLS)/libbluray-$(BLURAY_VERSION).tar.bz2:
 bluray: libbluray-$(BLURAY_VERSION).tar.bz2 .sum-bluray
 	$(UNPACK)
 	$(APPLY) $(SRC)/bluray/0001-install-bdjo_data-header.patch
+	$(APPLY) $(SRC)/bluray/0001-Fix-build-failure-after-Oracle-Java-CPU-for-April-20.patch
 	$(call pkg_static,"src/libbluray.pc.in")
 	$(MOVE)
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/367001997fa588ab18e13c648501667906cc3fb7

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/367001997fa588ab18e13c648501667906cc3fb7
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance