[vlc-commits] contrib: bluray: disable building jar for aarch64 macOS

Marvin Scholz git at videolan.org
Mon Sep 7 11:48:49 CEST 2020


vlc/vlc-3.0 | branch: master | Marvin Scholz <epirat07 at gmail.com> | Mon Jul 27 18:59:13 2020 +0200| [be000ae14025ef2a14a85b4b0a5965bf32d5fa4e] | committer: Felix Paul Kühne

contrib: bluray: disable building jar for aarch64 macOS

(cherry picked from commit a9ffa5bf9013b4dc2e99cb8d19b3c93ed3c50856)
Signed-off-by: Felix Paul Kühne <felix at feepk.net>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=be000ae14025ef2a14a85b4b0a5965bf32d5fa4e
---

 contrib/src/bluray/rules.mak | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/contrib/src/bluray/rules.mak b/contrib/src/bluray/rules.mak
index 1150ea2caa..c37ee53320 100644
--- a/contrib/src/bluray/rules.mak
+++ b/contrib/src/bluray/rules.mak
@@ -41,6 +41,14 @@ ifndef WITH_OPTIMIZATION
 BLURAY_CONF += --disable-optimizations
 endif
 
+ifdef HAVE_MACOSX
+ifeq ($(ARCH),aarch64)
+# There is no Java yet for this OS/arch,
+# so let's disable it for now
+BLURAY_CONF += --disable-bdjava-jar
+endif
+endif
+
 $(TARBALLS)/libbluray-$(BLURAY_VERSION).tar.bz2:
 	$(call download,$(BLURAY_URL))
 



More information about the vlc-commits mailing list