Merge commit '8e501bcab48b402653be3ca8ec103217098eb477'

Author: Sibras

.gitlab-ci.yml

@@ -24,17 +24,19 @@ build-macos:
     except:
         - schedules
     tags:
-        - catalina
+        - monterey
         - amd64
     script:
-        - curl -sS -O https://artifacts.videolan.org/vlc/macos-x86_64/vlc-contrib-x86_64-apple-darwin19-58c8b6aba888c666612e91d1cbb012aea630c853.tar.bz2
-        - tar xf vlc-contrib-x86_64-apple-darwin19-58c8b6aba888c666612e91d1cbb012aea630c853.tar.bz2
+        - CONTRIB_TARBALL=`curl -s https://artifacts.videolan.org/vlc/macos-x86_64/SHA512SUM 2>/dev/null | cut -d '/' -f 2`
+        - curl -sS -O https://artifacts.videolan.org/vlc/macos-x86_64/$CONTRIB_TARBALL
+        - tar xf "$CONTRIB_TARBALL"
         - cd x86_64-apple-darwin19
         - curl -sS -o ./change_prefix.sh 'https://git.videolan.org/?p=vlc.git;a=blob_plain;f=contrib/src/change_prefix.sh;hb=HEAD'
         - chmod +x ./change_prefix.sh
         - ./change_prefix.sh
         - export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:`pwd -P`/lib/pkgconfig/"
         - cd ../
+        - export PATH="/Users/videolanci/sandbox/bin:$PATH"
         - mkdir build
         - cd build
         - ../bootstrap
@@ -50,8 +52,9 @@ build-win64:
         - docker
         - amd64
     script:
-        - wget -nv https://artifacts.videolan.org/vlc/win64/vlc-contrib-x86_64-w64-mingw32-58c8b6aba888c666612e91d1cbb012aea630c853.tar.bz2
-        - tar xf vlc-contrib-x86_64-w64-mingw32-58c8b6aba888c666612e91d1cbb012aea630c853.tar.bz2
+        - CONTRIB_TARBALL=`wget --output-document - https://artifacts.videolan.org/vlc/win64/SHA512SUM 2>/dev/null | cut -d '/' -f 2`
+        - wget -nv https://artifacts.videolan.org/vlc/win64/$CONTRIB_TARBALL
+        - tar xf "$CONTRIB_TARBALL"
         - cd x86_64-w64-mingw32
         - wget -nv -O ./change_prefix.sh 'https://git.videolan.org/?p=vlc.git;a=blob_plain;f=contrib/src/change_prefix.sh;hb=HEAD'
         - chmod +x ./change_prefix.sh
@@ -73,8 +76,9 @@ build-win32:
         - docker
         - amd64
     script:
-        - wget -nv https://artifacts.videolan.org/vlc/win32/vlc-contrib-i686-w64-mingw32-58c8b6aba888c666612e91d1cbb012aea630c853.tar.bz2
-        - tar xf vlc-contrib-i686-w64-mingw32-58c8b6aba888c666612e91d1cbb012aea630c853.tar.bz2
+        - CONTRIB_TARBALL=`wget --output-document - https://artifacts.videolan.org/vlc/win32/SHA512SUM 2>/dev/null | cut -d '/' -f 2`
+        - wget -nv https://artifacts.videolan.org/vlc/win32/$CONTRIB_TARBALL
+        - tar xf "$CONTRIB_TARBALL"
         - cd i686-w64-mingw32
         - wget -nv -O ./change_prefix.sh 'https://git.videolan.org/?p=vlc.git;a=blob_plain;f=contrib/src/change_prefix.sh;hb=HEAD'
         - chmod +x ./change_prefix.sh

ChangeLog

@@ -1,3 +1,6 @@
+2022-06-28: Version 1.3.2
+- Fix build/run failure after Oracle Java CPU for April 2022
+
 2022-03-03: Version 1.3.1
 - Add support for Java 13 ... 16.
 - Improve JVM probing in Windows.

configure.ac

@@ -1,7 +1,7 @@
 dnl library version number
 m4_define([bluray_major], 1)
 m4_define([bluray_minor], 3)
-m4_define([bluray_micro], 1)
+m4_define([bluray_micro], 2)
 m4_define([bluray_version],[bluray_major.bluray_minor.bluray_micro])
 
 dnl shared library version (.so version)

src/libbluray/bdj/java/java/io/BDFileSystem.java

@@ -227,6 +227,17 @@ public boolean isAbsolute(File f) {
         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);