From 00687b564b5e6d45f56e88f09d93eb42e47b1546af9c5baf7c0ab9fcda0d725c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 9 Aug 2022 08:28:12 +0000 Subject: [PATCH] Accepting request 993853 from home:dirkmueller:Factory - update to 1.3.2: - Fix build/run failure after Oracle Java CPU for April 2022 - drop patch libbluray-April2022CPU.patch (upstream) OBS-URL: https://build.opensuse.org/request/show/993853 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libbluray?expand=0&rev=90 --- libbluray-1.3.1.tar.bz2 | 3 --- libbluray-1.3.2.tar.bz2 | 3 +++ libbluray-April2022CPU.patch | 20 -------------------- libbluray.changes | 7 +++++++ libbluray.spec | 7 ++----- 5 files changed, 12 insertions(+), 28 deletions(-) delete mode 100644 libbluray-1.3.1.tar.bz2 create mode 100644 libbluray-1.3.2.tar.bz2 delete mode 100644 libbluray-April2022CPU.patch diff --git a/libbluray-1.3.1.tar.bz2 b/libbluray-1.3.1.tar.bz2 deleted file mode 100644 index 5442f8e..0000000 --- a/libbluray-1.3.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c24b0f41c5b737bbb65c544fe63495637a771c10a519dfc802e769f112b43b75 -size 754867 diff --git a/libbluray-1.3.2.tar.bz2 b/libbluray-1.3.2.tar.bz2 new file mode 100644 index 0000000..f652f1b --- /dev/null +++ b/libbluray-1.3.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:456814db9f07c1eecdef7e840fcbb20976ef814df875428bfb81ecf45851f170 +size 757957 diff --git a/libbluray-April2022CPU.patch b/libbluray-April2022CPU.patch deleted file mode 100644 index 2cabcef..0000000 --- a/libbluray-April2022CPU.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- libbluray-1.3.1/src/libbluray/bdj/java/java/io/BDFileSystem.java 2022-03-03 18:05:27.000000000 +0100 -+++ libbluray-1.3.1/src/libbluray/bdj/java/java/io/BDFileSystem.java 2022-04-21 17:35:16.594935352 +0200 -@@ -227,6 +227,17 @@ - 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/libbluray.changes b/libbluray.changes index d9c0c7f..984426d 100644 --- a/libbluray.changes +++ b/libbluray.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 8 20:52:35 UTC 2022 - Dirk Müller + +- update to 1.3.2: + - Fix build/run failure after Oracle Java CPU for April 2022 +- drop patch libbluray-April2022CPU.patch (upstream) + ------------------------------------------------------------------- Thu Apr 21 15:17:38 UTC 2022 - Fridrich Strba diff --git a/libbluray.spec b/libbluray.spec index 1f7442c..150fe2b 100644 --- a/libbluray.spec +++ b/libbluray.spec @@ -19,7 +19,7 @@ %define sover 2 Name: libbluray -Version: 1.3.1 +Version: 1.3.2 Release: 0 Summary: Library to access Blu-Ray disk License: LGPL-2.1-or-later @@ -28,7 +28,6 @@ URL: https://www.videolan.org/developers/libbluray.html Source0: https://download.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}.tar.bz2 Source99: baselibs.conf Patch0: libbluray-pkgconfig.patch -Patch1: libbluray-April2022CPU.patch BuildRequires: ant BuildRequires: java-devel >= 1.8 BuildRequires: libtool @@ -89,9 +88,7 @@ intended for software that want to support Blu-ray playback (such as VLC and MPlayer). We, the authors of this library, do not condone nor endorse piracy. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 +%autosetup -p1 %build %configure \