Don't build bdj on i386 (RHBZ#2104068)

This commit is contained in:
Xavier Bachelot 2022-08-14 22:40:13 +02:00
parent 57d37aa77a
commit 0ffc6ffdcf

View File

@ -1,4 +1,9 @@
%global build_pdf_doc 0 %global build_pdf_doc 0
%ifarch %{java_arches}
%global build_bdj 1
%else
%global build_bdj 0
%endif
Name: libbluray Name: libbluray
Version: 1.3.2 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 Source0: https://download.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}.tar.bz2
Patch0: libbluray-0.8.0-no_doxygen_timestamp.patch Patch0: libbluray-0.8.0-no_doxygen_timestamp.patch
BuildRequires: ant
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: fontconfig-devel BuildRequires: fontconfig-devel
BuildRequires: freetype-devel BuildRequires: freetype-devel
BuildRequires: graphviz BuildRequires: graphviz
BuildRequires: java-devel >= 1:1.8.0
BuildRequires: jpackage-utils
BuildRequires: libtool BuildRequires: libtool
BuildRequires: libudfread-devel >= 1.1.1 BuildRequires: libudfread-devel >= 1.1.1
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: make BuildRequires: make
BuildRequires: texlive-latex BuildRequires: texlive-latex
%if %{build_bdj}
BuildRequires: ant
BuildRequires: java-devel >= 1:1.8.0
BuildRequires: jpackage-utils
%endif
%description %description
This package is aiming to provide a full portable free open source Blu-Ray 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 current titles, and will be easily portable and embeddable in standard players
such as MPlayer and VLC. such as MPlayer and VLC.
%if %{build_bdj}
%package bdj %package bdj
Summary: BDJ support for %{name} Summary: BDJ support for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
@ -41,6 +49,7 @@ Requires: jpackage-utils
%description bdj %description bdj
The %{name}-bdj package contains the jar file needed to add BD-J support to The %{name}-bdj package contains the jar file needed to add BD-J support to
%{name}. BD-J support is still considered alpha. %{name}. BD-J support is still considered alpha.
%endif
%package utils %package utils
Summary: Test utilities for %{name} Summary: Test utilities for %{name}
@ -63,10 +72,15 @@ developing applications that use %{name}.
%build %build
%if %{build_bdj}
export JDK_HOME="%{_jvmdir}/java" export JDK_HOME="%{_jvmdir}/java"
%endif
autoreconf -vif autoreconf -vif
%configure --disable-static \ %configure --disable-static \
%if ! %{build_bdj}
--disable-bdjava-jar \
%endif
%if %{build_pdf_doc} %if %{build_pdf_doc}
--enable-doxygen-pdf \ --enable-doxygen-pdf \
%else %else
@ -92,9 +106,11 @@ find %{buildroot} -name '*.la' -delete
%doc ChangeLog README.md %doc ChangeLog README.md
%{_libdir}/*.so.2* %{_libdir}/*.so.2*
%if %{build_bdj}
%files bdj %files bdj
%{_javadir}/libbluray-j2se-%{version}.jar %{_javadir}/libbluray-j2se-%{version}.jar
%{_javadir}/libbluray-awt-j2se-%{version}.jar %{_javadir}/libbluray-awt-j2se-%{version}.jar
%endif
%files utils %files utils
%{_bindir}/* %{_bindir}/*
@ -111,6 +127,7 @@ find %{buildroot} -name '*.la' -delete
%changelog %changelog
* Wed Aug 10 2022 Xavier Bachelot <xavier@bachelot.org> - 1.3.2-1 * Wed Aug 10 2022 Xavier Bachelot <xavier@bachelot.org> - 1.3.2-1
- Update to 1.3.2 (RHBZ#2112605, RHBZ#2113476, RHBZ#2089046) - 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 <releng@fedoraproject.org> - 1.3.1-2 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild