[vlc-commits] [Git][videolan/vlc][master] Contrib: update libbluray to 1.3.2

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
d0b87b53 by Jean-Baptiste Kempf at 2022-08-02T12:58:17+00:00
Contrib: update libbluray to 1.3.2

- - - - -


3 changed files:

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


Changes:

=====================================
contrib/src/bluray/0001-Fix-build-failure-after-Oracle-Java-CPU-for-April-20.patch deleted
=====================================
@@ -1,34 +0,0 @@
-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/SHA512SUMS
=====================================
@@ -1 +1 @@
-f39fc8a11771e8fdd5eeebf0ab23535ffab44721f64b350e5d153eee44555b31c618b6d765da114254dc83ff0ff89e84c6b185f61cdbcfedd2d47a5f6e26b75a  libbluray-1.3.1.tar.bz2
+6f2d3a984809db33a99d2fe3618370a3fda3ef1c417b725d3c2e1f24ff21495f95a6a5f78b30b2b26bab47865f68dd08c08e8a554809d3a5225956da712dc064  libbluray-1.3.2.tar.bz2


=====================================
contrib/src/bluray/rules.mak
=====================================
@@ -1,6 +1,6 @@
 # LIBBLURAY
 
-BLURAY_VERSION := 1.3.1
+BLURAY_VERSION := 1.3.2
 BLURAY_URL := $(VIDEOLAN)/libbluray/$(BLURAY_VERSION)/libbluray-$(BLURAY_VERSION).tar.bz2
 
 ifdef BUILD_DISCS
@@ -49,7 +49,6 @@ $(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/d0b87b53ac8ac941883c950c13f77abc964c7f22

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


VideoLAN code repository instance