[rpms/libbluray] rawhide: Undo version bump and rebuild again

[rpms/libbluray] rawhide: Undo version bump and rebuild again

[@ 2026-09-11 8:29 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/libbluray
            Branch : rawhide
            Commit : df457a63d329e4259c18911852476640080da2a4
            Author : Zbigniew Jędrzejewski-Szmek <zbyszek@amutable.com>
            Date   : 2026-09-11T10:22:01+02:00
            Stats  : +87/-4 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/libbluray/c/df457a63d329e4259c18911852476640080da2a4?branch=rawhide

            Log:
            Undo version bump and rebuild again

libbluray-1.5.0-1.fc46 bumped the libbluray soname, but it never made
it to Rawhide. It was only ever built on a side tag -
f46-build-side-148243 - from which no update was ever created.
Undo the version and SONAME version bump and rebuild again so that
things become installable again.

---
diff --git a/libbluray-1.4.0-java_23_support.patch b/libbluray-1.4.0-java_23_support.patch
new file mode 100644
index 0000000..c2e0ef1
--- /dev/null
+++ b/libbluray-1.4.0-java_23_support.patch
@@ -0,0 +1,76 @@
+From 48d76414455ab6a7d270cec96d6e83673df8a00d Mon Sep 17 00:00:00 2001
+From: Fridrich Strba <fstrba@suse.com>
+Date: Sat, 25 Oct 2025 07:30:12 +0000
+Subject: [PATCH] Fix build with java 23
+
+1) Thread.stop and ThreadGroup.stop are deprecated since 1.2 and removed
+in Java 23. Before that, they only throw UnsupportedOperationException
+when called. So call them by reflection and if they don't exist, just
+ignore them.
+
+2) Implement the new WindowPeer interface method
+getAppropriateGraphicsConfiguration as a pass-through method
+
+Fixes #46.
+---
+ .../java-j2se/java/awt/peer/BDFramePeer.java  |  4 ++++
+ .../java-j2se/org/videolan/PortingHelper.java | 22 +++++++++++++++++--
+ 2 files changed, 24 insertions(+), 2 deletions(-)
+
+diff --git a/src/libbluray/bdj/java-j2se/java/awt/peer/BDFramePeer.java b/src/libbluray/bdj/java-j2se/java/awt/peer/BDFramePeer.java
+index 87895de7..45144083 100644
+--- a/src/libbluray/bdj/java-j2se/java/awt/peer/BDFramePeer.java
++++ b/src/libbluray/bdj/java-j2se/java/awt/peer/BDFramePeer.java
+@@ -157,6 +157,10 @@ public class BDFramePeer extends BDComponentPeer implements FramePeer
+         return true;
+     }
+ 
++    public GraphicsConfiguration getAppropriateGraphicsConfiguration(GraphicsConfiguration gc) {
++        return gc;
++    }
++
+     //
+     // ComponentPeer
+     //
+diff --git a/src/libbluray/bdj/java-j2se/org/videolan/PortingHelper.java b/src/libbluray/bdj/java-j2se/org/videolan/PortingHelper.java
+index 1cb5f43d..55fd1c20 100644
+--- a/src/libbluray/bdj/java-j2se/org/videolan/PortingHelper.java
++++ b/src/libbluray/bdj/java-j2se/org/videolan/PortingHelper.java
+@@ -19,14 +19,32 @@
+ 
+ package org.videolan;
+ 
++import java.lang.reflect.InvocationTargetException;
++
+ public class PortingHelper {
+ 
+     public static void stopThread(Thread t) {
+-        t.stop();
++        try {
++            Thread.class.getMethod("stop").invoke(t);
++        } catch (NoSuchMethodException e) {
++            // ignore
++        } catch (IllegalAccessException e) {
++            // ignore
++        } catch (InvocationTargetException e) {
++            // ignore
++        }
+     }
+ 
+     public static void stopThreadGroup(ThreadGroup t) {
+-        t.stop();
++        try {
++            ThreadGroup.class.getMethod("stop").invoke(t);
++        } catch (NoSuchMethodException e) {
++            // ignore
++        } catch (IllegalAccessException e) {
++            // ignore
++        } catch (InvocationTargetException e) {
++            // ignore
++        }
+     }
+ 
+     public static String dumpStack(Thread t) {
+-- 
+GitLab
+

diff --git a/libbluray.spec b/libbluray.spec
index 23a2b17..943b165 100644
--- a/libbluray.spec
+++ b/libbluray.spec
@@ -5,14 +5,16 @@
 %endif
 
 Name:           libbluray
-Version:        1.5.0
-Release:        2%{?dist}
+Version:        1.4.0
+Release:        5%{?dist}
 Summary:        Library to access Blu-Ray disks for video playback 
 License:        LGPL-2.0-or-later
 URL:            https://www.videolan.org/developers/libbluray.html
 
 Source0:        https://download.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}.tar.xz
 Patch0:         libbluray-0.8.0-no_doxygen_timestamp.patch
+# https://code.videolan.org/videolan/libbluray/-/commit/48d76414455ab6a7d270cec96d6e83673df8a00d
+Patch1:         libbluray-1.4.0-java_23_support.patch
 
 BuildRequires:  doxygen
 BuildRequires:  fontconfig-devel
@@ -67,6 +69,7 @@ developing applications that use %{name}.
 %prep
 %setup -q
 %patch -P0 -p1 -b .no_timestamp
+%patch -P1 -p1 -b .java_23
 
 rm -rf contrib/libudfread
 
@@ -75,6 +78,7 @@ rm -rf contrib/libudfread
   --default-library=shared \
 %if %{build_bdj}
   -Dbdj_jar=enabled \
+  -Djava9=true \
   -Dbdj_type=j2se \
   -Djdk_home=%{_jvmdir}/java \
 %else
@@ -95,7 +99,7 @@ mv %{buildroot}%{_docdir}/%{name}/html .
 %files
 %license COPYING
 %doc ChangeLog README.md
-%{_libdir}/*.so.4*
+%{_libdir}/*.so.3*
 
 %if %{build_bdj}
 %files bdj
@@ -114,6 +118,9 @@ mv %{buildroot}%{_docdir}/%{name}/html .
 
 
 %changelog
+* Fri Sep 11 2026 Zbigniew Jędrzejewski-Szmek  <zbyszek@in.waw.pl> - 1.4.0-5
+- Undo version bump and rebuild again
+
 * Thu Sep 10 2026 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.5.0-2
 - Rebuilt for libxml-2.5.4
 

diff --git a/sources b/sources
index a53684e..c66ead7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libbluray-1.5.0.tar.xz) = f35d89097ad0c263ffa2102aba0068e7fe9b85afe27b14cf3c34ed6eff5876d1528aa8a62c3941b767353be2e1de4ae765f1402bd44af4544d922ffb69cea354
+SHA512 (libbluray-1.4.0.tar.xz) = 7284169b32624e5ca4fd71b260a4cc2921efafb1f63143a562568be45e373bfcbfeac63895d5659ccdcb11d7dbd0236cc46ccb15c12eff855703010e46991f27