Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libbluray for openSUSE:Factory checked in at 2023-10-31 20:24:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libbluray (Old) and /work/SRC/openSUSE:Factory/.libbluray.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libbluray" Tue Oct 31 20:24:35 2023 rev:48 rq:1121155 version:1.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/libbluray/libbluray.changes 2022-12-07 17:35:21.076666032 +0100 +++ /work/SRC/openSUSE:Factory/.libbluray.new.17445/libbluray.changes 2023-10-31 20:24:47.887953026 +0100 @@ -1,0 +2,9 @@ +Mon Oct 30 10:50:48 UTC 2023 - Fridrich Strba <[email protected]> + +- Added patch: + * libbluray-java18plus.patch + + allow building with JDK 18 and newer (using source/target + levels 8) + + fixes build with the new OpenJDK 21 LTSS + +------------------------------------------------------------------- New: ---- libbluray-java18plus.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libbluray.spec ++++++ --- /var/tmp/diff_new_pack.WakCni/_old 2023-10-31 20:24:48.691982558 +0100 +++ /var/tmp/diff_new_pack.WakCni/_new 2023-10-31 20:24:48.695982705 +0100 @@ -1,7 +1,7 @@ # # spec file for package libbluray # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2011 Dominique Leuenberger, Amsterdam, The Netherlands # # All modifications and additions to the file contributed by third parties @@ -28,7 +28,10 @@ Source0: https://download.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}.tar.bz2 Source99: baselibs.conf Patch0: libbluray-pkgconfig.patch +Patch1: libbluray-java18plus.patch BuildRequires: ant +BuildRequires: autoconf +BuildRequires: automake BuildRequires: java-devel >= 1.8 BuildRequires: libtool BuildRequires: pkgconfig @@ -91,6 +94,7 @@ %autosetup -p1 %build +autoreconf -fi %configure \ --disable-static \ --enable-bdjava \ ++++++ libbluray-java18plus.patch ++++++ --- libbluray-1.3.4/configure.ac 2023-10-30 11:31:24.385633069 +0100 +++ libbluray-1.3.4/configure.ac 2023-10-30 11:39:34.545384400 +0100 @@ -292,11 +292,13 @@ dnl check for Java 9+ javac_version=`"$JAVAC" -version 2>&1 | head -n 1` [with_java9=`echo "$javac_version" | grep -E -q '^javac\ (9|1[0-1])' && echo yes`] - [with_java12=`echo "$javac_version" | grep -E -q '^javac\ (1[2-9])' && echo yes`] + [with_java12=`echo "$javac_version" | grep -E -q '^javac\ (1[2-7])' && echo yes`] + [with_java18=`echo "$javac_version" | grep -E -q '^javac\ (1[8-9]|21)' && echo yes`] ]) AS_IF([test "x$with_java9" = "xyes" -a "$BDJ_TYPE" != "j2me"], [java_code_version=1.6], [java_code_version=1.4]) AS_IF([test "x$with_java12" = "xyes" -a "$BDJ_TYPE" != "j2me"], [java_code_version=1.7]) + AS_IF([test "x$with_java18" = "xyes" -a "$BDJ_TYPE" != "j2me"], [java_code_version=1.8]) ]) AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."]) @@ -304,6 +306,7 @@ AM_CONDITIONAL([USING_BDJAVA_BUILD_JAR], [ test $use_bdjava_jar = "yes" ]) AM_CONDITIONAL([USING_JAVAC_9], [ test x"$with_java9" = x"yes" ]) AM_CONDITIONAL([USING_JAVAC_12], [ test x"$with_java12" = x"yes" ]) +AM_CONDITIONAL([USING_JAVAC_18], [ test x"$with_java18" = x"yes" ]) dnl BD-J type if test "$BDJ_TYPE" = "j2me"; then --- libbluray-1.3.4/Makefile.am 2023-10-30 11:31:24.385633069 +0100 +++ libbluray-1.3.4/Makefile.am 2023-10-30 11:41:25.962753380 +0100 @@ -241,6 +241,9 @@ if USING_BDJAVA_BUILD_JAR +if USING_JAVAC_18 +java_versions = -Djava_version_asm=1.8 -Djava_version_bdj=1.8 +else if USING_JAVAC_12 java_versions = -Djava_version_asm=1.7 -Djava_version_bdj=1.7 else @@ -250,6 +253,7 @@ java_versions = -Djava_version_asm=1.5 -Djava_version_bdj=1.4 endif endif +endif if BDJ_J2SE awt_src = java-$(BDJ_TYPE):java-build-support
