gentoo resync : 29.12.2022

3 files changed, 31 insertions, 1 deletions

diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 357902f9b193..d03410408819 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1,7 +1,8 @@
+AUX libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch 1050 BLAKE2B 3792c0512cd7d5dcae3c2f1554aef5d611c65810b65a67b8b88babdd35a34298bc35b2a4cd5c6f976e4a7240aca9366259ddeb8c713b64485c0d11f391b8cec9 SHA512 0b58071988c0bf6f0966f258e162be845f248c3752c38f046dc9182e73520fa32afdca4407affab0a1827a896c0a57703a598fff5ae7a862a0621da28231f74a
 AUX libbluray-jars.patch 1371 BLAKE2B 1c32115ec03db19b849248bcdbe4b9868527717b279d9222ad94bf4c3875522db75ba585566b0609d1a27cbd4e25066832b19351acf05f5b00295ed5364c2984 SHA512 2b376149680edf6891f2129de2fc074dfc32a236d8eb19b3d899e1f7d3ac98eaf8cdf6e13c7b548ab59354c558e2c149f06d85c1c5be61c5e05cc5ec4382d86d
 DIST libbluray-1.3.0.tar.bz2 754069 BLAKE2B d4c699ce28d2e5b1d4dda461a1359d3a446afe72368e9d76066ca4d5c49d1f24b4bcec307608d96913d0c668168a86267416b9db37ad942628c2926b79ec47d9 SHA512 3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc
 DIST libbluray-1.3.1.tar.bz2 754867 BLAKE2B 471963bc5b77f9da31c2ad900e7bbb1528943d2341aa4f12471e5d9a0db6964e62e917c4f19e29115c8c129bb7f8730780b44dbb1c8939c94c686f39d8521fe8 SHA512 f39fc8a11771e8fdd5eeebf0ab23535ffab44721f64b350e5d153eee44555b31c618b6d765da114254dc83ff0ff89e84c6b185f61cdbcfedd2d47a5f6e26b75a
 EBUILD libbluray-1.3.0-r1.ebuild 2026 BLAKE2B afdec663eeda2df1dfda5bab20fadc416b718c0f1fa9198c9d382316f79220dd7773b3e8fc16cb37c96202fd6a2bb2004093b785caf572debe94e410fc70965e SHA512 ad3e56facfd5a192c3787096414baeaf0fd29a7f2e9550739c42ef76670aac2ff8cfd6390f46dd3fc6076b1384217c02b19d8739369fd969ad1913475a3d7b02
-EBUILD libbluray-1.3.1.ebuild 1967 BLAKE2B 6c0d9471ffb0d0e1ddbcab410042d136e5d23455a97e5ed024d027b232001c6e1cfd1aefdc7bc4039004d695ed69649e8695b59418a186a921696666929124f6 SHA512 1cd12292d1918822e668961c233a7b8ffaea9216e64618c903666dc0fcf34f3858bceb3dad3cd2ae7193134b6f303efec57a14fa05a4f0e12d1cacec7c76f4e1
+EBUILD libbluray-1.3.1.ebuild 2055 BLAKE2B 386214b48440b49fa436b3e48aa261a9ed7447089590189bca0aa0ed959ee7a48085a9a065c5c6095b74aee541ede6d68494d57d95ee190870e6e652295da4ed SHA512 4bf8f7fda1832f6ed9d951eeef24ef04ff6938443887cfb84d4cf6ff94021dabd989fb65d5d34f2945751a2a790a7482c636dd0c6101da86ec14b98e3a0ecd5d
 EBUILD libbluray-9999.ebuild 1967 BLAKE2B 6c0d9471ffb0d0e1ddbcab410042d136e5d23455a97e5ed024d027b232001c6e1cfd1aefdc7bc4039004d695ed69649e8695b59418a186a921696666929124f6 SHA512 1cd12292d1918822e668961c233a7b8ffaea9216e64618c903666dc0fcf34f3858bceb3dad3cd2ae7193134b6f303efec57a14fa05a4f0e12d1cacec7c76f4e1
 MISC metadata.xml 541 BLAKE2B 5a2652471709a6c8784f756ad2d5c9bbfd1611637fede987c298e1b4588ddab74346ac0d607c36bc3fa662a1e80287d2dd9963019b52daad9cd3ac2f0ecff02f SHA512 70349aab49af818166f114ed16c0eaf4264e548e8f204d636da57086b68a17f42a6b119a2533a5fb9f6a60dc3c3a9948910536f4eaecb1a75e682d439b12d558
diff --git a/media-libs/libbluray/files/libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch b/media-libs/libbluray/files/libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch
new file mode 100644
index 000000000000..9556884435b9
--- /dev/null
+++ b/media-libs/libbluray/files/libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch
@@ -0,0 +1,28 @@
+https://code.videolan.org/videolan/libbluray/-/commit/8f26777b1ce124ff761f80ef52d6be10bcea323e
+https://bugs.gentoo.org/844187
+
+From 8f26777b1ce124ff761f80ef52d6be10bcea323e Mon Sep 17 00:00:00 2001
+From: Fridrich Strba <fstrba@suse.com>
+Date: Mon, 25 Apr 2022 14:28:58 +0300
+Subject: [PATCH] Fix build failure after Oracle Java CPU for April 2022
+
+--- 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);
diff --git a/media-libs/libbluray/libbluray-1.3.1.ebuild b/media-libs/libbluray/libbluray-1.3.1.ebuild
index 9d617a0039d2..165a31b2189e 100644
--- a/media-libs/libbluray/libbluray-1.3.1.ebuild
+++ b/media-libs/libbluray/libbluray-1.3.1.ebuild
@@ -43,6 +43,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-jars.patch
+	"${FILESDIR}"/${PN}-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch
 )
 
 DOCS=( ChangeLog README.md )