From 0ffc6ffdcffc20bbb2980cb2d3b83e1bffc9957a Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Sun, 14 Aug 2022 22:40:13 +0200 Subject: [PATCH] Don't build bdj on i386 (RHBZ#2104068) --- libbluray.spec | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/libbluray.spec b/libbluray.spec index bee7e1e..d7d7b3d 100644 --- a/libbluray.spec +++ b/libbluray.spec @@ -1,4 +1,9 @@ %global build_pdf_doc 0 +%ifarch %{java_arches} +%global build_bdj 1 +%else +%global build_bdj 0 +%endif Name: libbluray Version: 1.3.2 @@ -10,20 +15,22 @@ URL: https://www.videolan.org/developers/libbluray.html Source0: https://download.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}.tar.bz2 Patch0: libbluray-0.8.0-no_doxygen_timestamp.patch -BuildRequires: ant BuildRequires: autoconf BuildRequires: automake BuildRequires: doxygen BuildRequires: fontconfig-devel BuildRequires: freetype-devel BuildRequires: graphviz -BuildRequires: java-devel >= 1:1.8.0 -BuildRequires: jpackage-utils BuildRequires: libtool BuildRequires: libudfread-devel >= 1.1.1 BuildRequires: libxml2-devel BuildRequires: make BuildRequires: texlive-latex +%if %{build_bdj} +BuildRequires: ant +BuildRequires: java-devel >= 1:1.8.0 +BuildRequires: jpackage-utils +%endif %description This package is aiming to provide a full portable free open source Blu-Ray @@ -32,6 +39,7 @@ navigation and playback on Linux. It will eventually be compatible with all current titles, and will be easily portable and embeddable in standard players such as MPlayer and VLC. +%if %{build_bdj} %package bdj Summary: BDJ support for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -41,6 +49,7 @@ Requires: jpackage-utils %description bdj The %{name}-bdj package contains the jar file needed to add BD-J support to %{name}. BD-J support is still considered alpha. +%endif %package utils Summary: Test utilities for %{name} @@ -63,10 +72,15 @@ developing applications that use %{name}. %build +%if %{build_bdj} export JDK_HOME="%{_jvmdir}/java" +%endif autoreconf -vif %configure --disable-static \ +%if ! %{build_bdj} + --disable-bdjava-jar \ +%endif %if %{build_pdf_doc} --enable-doxygen-pdf \ %else @@ -92,9 +106,11 @@ find %{buildroot} -name '*.la' -delete %doc ChangeLog README.md %{_libdir}/*.so.2* +%if %{build_bdj} %files bdj %{_javadir}/libbluray-j2se-%{version}.jar %{_javadir}/libbluray-awt-j2se-%{version}.jar +%endif %files utils %{_bindir}/* @@ -111,6 +127,7 @@ find %{buildroot} -name '*.la' -delete %changelog * Wed Aug 10 2022 Xavier Bachelot - 1.3.2-1 - Update to 1.3.2 (RHBZ#2112605, RHBZ#2113476, RHBZ#2089046) +- Don't build bdj on i386 (RHBZ#2104068) * Thu Jul 21 2022 Fedora Release Engineering - 1.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild