Accepting request 558332 from multimedia:libs
OBS-URL: https://build.opensuse.org/request/show/558332 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libbluray?expand=0&rev=35
This commit is contained in:
commit
acca1349a7
@ -25,17 +25,19 @@
|
||||
<compilerarg value="-XDignore.symbol.file"/>
|
||||
<compilerarg value="-Xlint:-deprecation"/>
|
||||
</javac>
|
||||
--- libbluray-1.0.1/src/libbluray/bdj/java/java/io/BDFileSystem.java 2017-03-02 14:33:49.000000000 +0100
|
||||
+++ libbluray-1.0.1/src/libbluray/bdj/java/java/io/BDFileSystem.java 2017-10-30 09:25:33.483391121 +0100
|
||||
@@ -38,7 +38,7 @@
|
||||
import org.videolan.BDJXletContext;
|
||||
import org.videolan.Logger;
|
||||
|
||||
-public abstract class BDFileSystem extends FileSystem {
|
||||
+public abstract class BDFileSystem extends UnixFileSystem {
|
||||
|
||||
private static final Logger logger = Logger.getLogger(BDFileSystem.class.getName());
|
||||
|
||||
--- libbluray-1.0.1/src/libbluray/bdj/java-j2se/java/io/BDFileSystemImpl.java
|
||||
+++ libbluray-1.0.1/src/libbluray/bdj/java-j2se/java/io/BDFileSystemImpl.java
|
||||
@@ -38,4 +38,9 @@ class BDFileSystemImpl extends BDFileSystem {
|
||||
public long getSpace(File f, int t) {
|
||||
return fs.getSpace(f, t);
|
||||
}
|
||||
+
|
||||
+ /* Java 9 */
|
||||
+ public int getNameMax(String path) {
|
||||
+ return 255;
|
||||
+ }
|
||||
}
|
||||
|
||||
--- libbluray-1.0.1/src/libbluray/bdj/java-j2se/java/awt/peer/BDFramePeer.java 2017-03-02 14:33:49.000000000 +0100
|
||||
+++ libbluray-1.0.1/src/libbluray/bdj/java-j2se/java/awt/peer/BDFramePeer.java 2017-10-30 09:08:08.259034704 +0100
|
||||
@@ -173,7 +173,7 @@
|
||||
|
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 19 07:42:07 UTC 2017 - fstrba@suse.com
|
||||
|
||||
- Modified patch:
|
||||
* libbluray-java9.patch
|
||||
+ Some change in hunks integrating upstream fixes that were
|
||||
partially different from ours.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 19 06:53:39 UTC 2017 - fstrba@suse.com
|
||||
|
||||
- BuildConflict with jdk10 or higher, since some removal of
|
||||
deprecated SecurityManager functions makes BD-J not buildable
|
||||
with jdk10
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 05 11:22:37 UTC 2017 - joerg.lorenzen@ki.tng.de
|
||||
|
||||
|
@ -36,6 +36,7 @@ BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(fontconfig)
|
||||
BuildRequires: pkgconfig(freetype2)
|
||||
BuildRequires: pkgconfig(libxml-2.0) >= 2.6
|
||||
BuildConflicts: java-devel >= 10
|
||||
|
||||
%description
|
||||
This library is written for the purpose of playing Blu-ray movies. It is
|
||||
@ -73,12 +74,12 @@ MPlayer). We, the authors of this library, do not condone nor endorse piracy.
|
||||
%package bdj
|
||||
Summary: Library to access Blu-Ray disk - BD-J support
|
||||
Group: Development/Libraries/Java
|
||||
Requires: jpackage-utils
|
||||
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
|
||||
Requires: java >= 9
|
||||
%else
|
||||
Requires: java >= 1.8
|
||||
%endif
|
||||
Requires: jpackage-utils
|
||||
%if 0%{?suse_version} > 1110
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
@ -107,26 +108,21 @@ make %{?_smp_mflags}
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
|
||||
%post -n libbluray%{sover} -p /sbin/ldconfig
|
||||
|
||||
%postun -n libbluray%{sover} -p /sbin/ldconfig
|
||||
|
||||
%files tools
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/bd_info
|
||||
|
||||
%files -n libbluray%{sover}
|
||||
%defattr(-, root, root)
|
||||
%doc COPYING
|
||||
%{_libdir}/libbluray.so.*
|
||||
|
||||
%files devel
|
||||
%defattr(-, root, root)
|
||||
%{_includedir}/%{name}/
|
||||
%{_libdir}/libbluray.so
|
||||
%{_libdir}/pkgconfig/libbluray.pc
|
||||
|
||||
%files bdj
|
||||
%defattr(-, root, root)
|
||||
%{_javadir}/libbluray-j2se-%{version}.jar
|
||||
|
||||
%changelog
|
||||
|
Loading…
Reference in New Issue
Block a user