commit 62922eb360754a9b158aa9c050dd16c9ecbff7a1
Author: Jan Palus <[email protected]>
Date: Wed Jun 30 09:34:04 2021 +0000
don't make ENABLE_ASSEMBLY x86 exclusive
on %{arm} ENABLE_ASSEMBLY seems effectively mandatory (fails with
missing symbols otherwise)
x265.spec | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/x265.spec b/x265.spec
index 9ef9579..3033261 100644
--- a/x265.spec
+++ b/x265.spec
@@ -1,11 +1,11 @@
# TODO: vmaf
#
# Conditional build:
-%bcond_without asm # x86 assembler
+%bcond_without asm # assembler
%bcond_with vmaf # VMAF support [not ready for vmaf-1.3.x as of x265 3.2]
-%ifnarch %{ix86} %{x8664} x32
-%undefine with_asm
+%ifarch %{arm}
+%define with_asm 1
%endif
Summary: H.265/HEVC video encoder
@@ -28,7 +28,11 @@ BuildRequires: cmake >= 2.8.11
BuildRequires: libstdc++-devel >= 6:4.8
BuildRequires: numactl-devel >= 2
BuildRequires: rpmbuild(macros) >= 2.007
-%{?with_asm:BuildRequires: nasm >= 2.13.0}
+%if %{with asm}
+%ifarch %{ix86} %{x8664} x32
+BuildRequires: nasm >= 2.13.0
+%endif
+%endif
%{?with_vmaf:BuildRequires: vmaf-devel}
Requires: libx265 = %{version}-%{release}
# see CMakeLists.txt, more is probably possible
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/x265.git/commitdiff/62922eb360754a9b158aa9c050dd16c9ecbff7a1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
