rpms/x264/EL-6 x264.spec,1.26,1.27

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/x264/EL-6
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15776

Modified Files:
	x264.spec 
Log Message:
Build without asm on EL-6



Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/EL-6/x264.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- x264.spec	20 Nov 2011 22:07:05 -0000	1.26
+++ x264.spec	20 Nov 2011 22:22:41 -0000	1.27
@@ -2,6 +2,7 @@
 %global branch   stable
 #Defined to bootstrap for EL-6
 %global _without_gpac  1
+%global _without_asm   1
 
 Summary: H264/AVC video streams encoder
 Name: x264
@@ -19,9 +20,11 @@
 %{?_with_libavformat:BuildRequires: ffmpeg-devel}
 %{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel}
 %{?_with_visualize:BuildRequires: libX11-devel}
+%{!?_without_asm:
 %ifarch x86_64 i686
 BuildRequires: yasm
 %endif
+}
 Requires: %{name}-libs = %{version}-%{release}
 
 %description
@@ -63,7 +66,8 @@
 	--enable-debug \\\
 	--enable-shared \\\
 	--system-libx264 \\\
-	--enable-pic
+	--enable-pic \\\
+	--disable-asm
 
 
 %prep