[packages/libbluray] don't look blindly for javac in $PATH
atler
atler at pld-linux.org
Fri Mar 20 00:02:08 CET 2026
commit ffd05943b17003293a67f0d1852a9dc6579b7072
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Mar 19 23:57:40 2026 +0100
don't look blindly for javac in $PATH
javac.patch | 14 ++++++++++++++
libbluray.spec | 2 ++
2 files changed, 16 insertions(+)
---
diff --git a/libbluray.spec b/libbluray.spec
index baa5d31..0cad49f 100644
--- a/libbluray.spec
+++ b/libbluray.spec
@@ -14,6 +14,7 @@ License: LGPL v2+
Group: Libraries
Source0: https://download.videolan.org/videolan/libbluray/%{version}/%{name}-%{version}.tar.xz
# Source0-md5: e9d2fcb48ab14a43fe48797db4429437
+Patch0: javac.patch
URL: http://www.videolan.org/developers/libbluray.html
%{?with_apidocs:BuildRequires: doxygen}
BuildRequires: fontconfig-devel
@@ -109,6 +110,7 @@ Dokumentacja API biblioteki libbluray.
%prep
%setup -q
+%patch -P0 -p1
%build
%if %{with java}
diff --git a/javac.patch b/javac.patch
new file mode 100644
index 0000000..a0870ba
--- /dev/null
+++ b/javac.patch
@@ -0,0 +1,14 @@
+--- libbluray-1.4.1/src/libbluray/bdj/meson.build.orig 2026-03-19 23:41:30.282336410 +0100
++++ libbluray-1.4.1/src/libbluray/bdj/meson.build 2026-03-19 23:51:24.631908106 +0100
+@@ -6,8 +6,9 @@
+ ant = find_program('ant', required: get_option('bdj_jar'), disabler: true)
+
+ if ant.found() and add_languages('java', native: false, required: get_option('bdj_jar'))
+- javac_version = meson.get_compiler('java').version()
+- javac_path = find_program('javac').full_path()
++ javac = meson.get_compiler('java')
++ javac_version = javac.version()
++ javac_path = javac.cmd_array().get(0)
+ javac_arg = '-Xlint:-deprecation'
+ if get_option('java9') and bdj_type == 'j2se'
+ if javac_version.version_compare('>= 18.0')
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libbluray.git/commitdiff/04c0baa3cefff8f62c97e727300dd40e87d890c1
More information about the pld-cvs-commit
mailing list