[packages/libx264] add yasm bcond

glen glen at pld-linux.org
Thu Feb 26 18:45:38 CET 2015


commit c010e225a34c34932bc07c5b64fd4a63ac2a07b4
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Feb 26 19:45:34 2015 +0200

    add yasm bcond

 libx264.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/libx264.spec b/libx264.spec
index 9e487ad..d5d059c 100644
--- a/libx264.spec
+++ b/libx264.spec
@@ -1,6 +1,11 @@
 #
 # Conditional build:
 %bcond_with	bootstrap	# no ffmpeg/gpac support in x264 utility
+%bcond_without	asm		# disable asm
+
+%ifnarch %{ix86} %{x8664} x32
+%undefine	with_asm
+%endif
 
 %define		rel	3
 %define		snap	20140824
@@ -20,9 +25,7 @@ Patch1:		altivec-no-vand.patch
 Patch2:		%{name}-gpac.patch
 URL:		http://www.videolan.org/developers/x264.html
 BuildRequires:	pkgconfig
-%ifarch %{ix86} %{x8664} x32
-BuildRequires:	yasm >= 1.2.0
-%endif
+%{?with_asm:BuildRequires:	yasm >= 1.2.0}
 %if %{without bootstrap}
 # which version exactly???
 # for full x264 CLI utility functionality it wants:
@@ -100,6 +103,7 @@ CC="%{__cc}" \
 	--includedir=%{_includedir} \
 	--libdir=%{_libdir} \
 	--extra-cflags="%{rpmcflags}" \
+	%{!?with_asm:--disable-asm} \
 	--enable-pic \
 	--enable-shared \
 	--enable-static
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libx264.git/commitdiff/c010e225a34c34932bc07c5b64fd4a63ac2a07b4



More information about the pld-cvs-commit mailing list