Compare commits
No commits in common. "b261c4c8e2135a46533e684777095baaafd10751" and "950153c37de73cf5aac51e2b65b4d79335ce161b" have entirely different histories.
b261c4c8e2
...
950153c37d
@ -1,35 +0,0 @@
|
||||
From 1f291c9c665debc7ddbc52c47c0a43dc72eec7b3 Mon Sep 17 00:00:00 2001
|
||||
From: herengui <herengui@uniontech.com>
|
||||
Date: Thu, 19 May 2022 18:16:53 +0800
|
||||
Subject: [PATCH] Fix build with recent JDK version
|
||||
|
||||
Signed-off-by: herengui <herengui@uniontech.com>
|
||||
---
|
||||
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 0ade43e..65b0f47 100644
|
||||
--- a/src/libbluray/bdj/java/java/io/BDFileSystem.java
|
||||
+++ b/src/libbluray/bdj/java/java/io/BDFileSystem.java
|
||||
@@ -203,6 +203,17 @@ public abstract class BDFileSystem extends FileSystem {
|
||||
return fs.fromURIPath(path);
|
||||
}
|
||||
|
||||
+ 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 boolean isAbsolute(File f) {
|
||||
return fs.isAbsolute(f);
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
|
||||
11
libbluray-0.8.0-no_doxygen_timestamp.patch
Normal file
11
libbluray-0.8.0-no_doxygen_timestamp.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- libbluray-0.2.2/doc/doxygen-footer.html.orig 2012-06-13 02:25:30.740725465 +0200
|
||||
+++ libbluray-0.2.2/doc/doxygen-footer.html 2012-06-13 02:25:56.585725752 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
<hr size="1">
|
||||
<div id="footer">
|
||||
<small>
|
||||
- Generated on $datetime for $projectname by
|
||||
+ Generated for $projectname by
|
||||
<a href="http://www.doxygen.org/index.html">
|
||||
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.1<br />
|
||||
Copyright © 2010 John Stebbins et al.<br />
|
||||
@ -1,15 +1,15 @@
|
||||
Name: libbluray
|
||||
Version: 1.1.2
|
||||
Release: 5
|
||||
Release: 1
|
||||
Summary: Library used to access Blu-ray Disc for video playback
|
||||
License: LGPLv2+
|
||||
URL: https://www.videolan.org/developers/libbluray.html
|
||||
Source0: https://download.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}.tar.bz2
|
||||
|
||||
Patch0: Fix-build-with-recent-JDK-version.patch
|
||||
Patch0: libbluray-0.8.0-no_doxygen_timestamp.patch
|
||||
|
||||
BuildRequires: ant autoconf automake doxygen fontconfig-devel freetype-devel graphviz
|
||||
BuildRequires: java-1.8.0-openjdk javapackages-tools libtool libxml2-devel texlive-latex java-1.8.0-openjdk-devel
|
||||
BuildRequires: java-1.8.0-openjdk-devel javapackages-tools libtool libxml2-devel texlive-latex
|
||||
Provides: %{name}-utils
|
||||
Obsoletes: %{name}-utils
|
||||
|
||||
@ -19,7 +19,7 @@ VLC or MPlayer.Contain The %{name}-utils package contains test utilities for %{n
|
||||
|
||||
%package bdj
|
||||
Summary: BDJ support for %{name}
|
||||
Requires: %{name} = %{version}-%{release} java-headless >= 1:1.8 jpackage-utils
|
||||
Requires: %{name}=%{version}-%{release} java-headless >= 1:1.8 jpackage-utils
|
||||
|
||||
%description bdj
|
||||
The %{name}-bdj contains the jar file for %{name} to provide BD-J support.
|
||||
@ -79,20 +79,5 @@ do install -Dp -m 0755 .libs/$i %{buildroot}%{_bindir}/$i; done;
|
||||
%doc doc/doxygen/html
|
||||
|
||||
%changelog
|
||||
* Thu May 19 2022 herengui <herengui@uniontech.com> - 1.1.2-5
|
||||
- Fix build issue with recent JDK version
|
||||
|
||||
* Mon Jul 26 2021 liuyumeng <liuyumeng5@huawei.com> -1.1.2-4
|
||||
- fix requires:libbluray-1.1.2-4.oe1
|
||||
|
||||
* Mon Mar 08 2021 Shaoning Zhang <zhangshaoning@uniontech.com> - 1.1.2-3
|
||||
- Add BuildRequires for libbluray
|
||||
|
||||
* Thu Jan 9 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.1.2-2
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC: optimization the spec
|
||||
|
||||
* Thu Sep 05 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.1.2-1
|
||||
- Package init
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
version_control: git
|
||||
src_repo: https://code.videolan.org/videolan/libbluray.git
|
||||
tag_prefix:
|
||||
seperator: .
|
||||
Loading…
x
Reference in New Issue
Block a user