From e1bb57585baa79f8b21dc9119cd567170244afdd167fb6b07bd4c4abe2a279b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Sun, 4 Aug 2019 13:04:50 +0000
Subject: [PATCH] Accepting request 720819 from
 home:enzokiel:branches:multimedia:libs

Update to version 1.1.2

OBS-URL: https://build.opensuse.org/request/show/720819
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libbluray?expand=0&rev=78
---
 libbluray-1.1.1.tar.bz2 |  3 ---
 libbluray-1.1.2.tar.bz2 |  3 +++
 libbluray-java9.patch   | 44 +++++++++++------------------------------
 libbluray.changes       | 16 +++++++++++++++
 libbluray.spec          |  3 +--
 5 files changed, 31 insertions(+), 38 deletions(-)
 delete mode 100644 libbluray-1.1.1.tar.bz2
 create mode 100644 libbluray-1.1.2.tar.bz2

diff --git a/libbluray-1.1.1.tar.bz2 b/libbluray-1.1.1.tar.bz2
deleted file mode 100644
index 505cc25..0000000
--- a/libbluray-1.1.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:106478a17c8bcac8c7b4174e7432b2bad5a1e6dd2926c4224791fd4669472338
-size 746034
diff --git a/libbluray-1.1.2.tar.bz2 b/libbluray-1.1.2.tar.bz2
new file mode 100644
index 0000000..c5a3ac9
--- /dev/null
+++ b/libbluray-1.1.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42
+size 745779
diff --git a/libbluray-java9.patch b/libbluray-java9.patch
index 2a93901..b39cd35 100644
--- a/libbluray-java9.patch
+++ b/libbluray-java9.patch
@@ -1,51 +1,29 @@
---- libbluray-1.0.1/src/libbluray/bdj/build.xml	2017-03-02 14:33:49.000000000 +0100
-+++ libbluray-1.0.1/src/libbluray/bdj/build.xml	2017-10-30 08:32:10.295848485 +0100
-@@ -8,7 +8,6 @@
+--- libbluray-1.1.2/src/libbluray/bdj/build.xml.orig	2019-08-03 18:40:05.427564607 +0200
++++ libbluray-1.1.2/src/libbluray/bdj/build.xml	2019-08-03 18:40:05.451564195 +0200
+@@ -8,10 +8,9 @@
      <property name="dist"  location="../../.libs"/>
      <property name="src_awt" value=""/>
      <property name="src_asm" value="../../../contrib/asm/src/"/>
 -    <property name="bootclasspath" value=""/>
      <property name="version" value=""/>
+-    <property name="java_version_asm" value="1.5"/>
+-    <property name="java_version_bdj" value="1.4"/>
++    <property name="java_version_asm" value="1.6"/>
++    <property name="java_version_bdj" value="1.6"/>
  
      <target name="init">
-@@ -20,14 +19,12 @@
+         <tstamp/>
+@@ -22,13 +21,11 @@
      <target name="compile" depends="init"
              description="compile the source " >
          <javac srcdir="${src_asm}" destdir="${build}" debug="yes"
 -               bootclasspath="${bootclasspath}"
--               source="1.5" target="1.5">
-+               source="1.6" target="1.6">
+                source="${java_version_asm}" target="${java_version_asm}">
                 <compilerarg value="-XDignore.symbol.file"/>
                 <compilerarg value="-Xlint:-deprecation"/>
          </javac>
          <javac srcdir="${src}${src_awt}" destdir="${build}" debug="yes"
 -               bootclasspath="${bootclasspath}"
--               source="1.4" target="1.4">
-+               source="1.6" target="1.6">
+                source="${java_version_bdj}" target="${java_version_bdj}">
                 <compilerarg value="-XDignore.symbol.file"/>
                 <compilerarg value="-Xlint:-deprecation"/>
-         </javac>
---- 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 @@
-         return ((BDToolkit)BDToolkit.getDefaultToolkit()).createImage((Component)null, width, height);
-     }
- 
--    public boolean requestFocus(Component c, boolean a, boolean b, long l, sun.awt.CausedFocusEvent.Cause d) {
-+    public boolean requestFocus(Component c, boolean a, boolean b, long l, FocusEvent.Cause d) {
-         if (c == null) {
-             return true;
-         }
diff --git a/libbluray.changes b/libbluray.changes
index ec96911..6719ba8 100644
--- a/libbluray.changes
+++ b/libbluray.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sat Aug 03 16:58:13 UTC 2019 - enzokiel@kabelmail.de
+
+- Update to version 1.1.2:
+  + Add libxml version to pkg-config Requires.private.
+  + Improve support for NetBSD operating system.
+  + Improve BD-J compability.
+  + Improve Java 8+ compability.
+  + Fix main playlist caching in Windows.
+  + Fix mark triggering when multiple marks are passed during
+    single read().
+  + Fix seek bar pop-up at chapter boundary with some discs.
+  + Fix reading resources indirectly from mounted .jar file.
+- Fixed libbluray-java9.patch.
+- Enable build against java-devel >= 10.
+
 -------------------------------------------------------------------
 Mon Apr 08 10:41:49 UTC 2019 - enzokiel@kabelmail.de
 
diff --git a/libbluray.spec b/libbluray.spec
index e80116e..31959ae 100644
--- a/libbluray.spec
+++ b/libbluray.spec
@@ -19,7 +19,7 @@
 
 %define         sover 2
 Name:           libbluray
-Version:        1.1.1
+Version:        1.1.2
 Release:        0
 Summary:        Library to access Blu-Ray disk
 License:        LGPL-2.1+
@@ -37,7 +37,6 @@ 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