packages: libvpx/libvpx.spec - no asm mode

arekm arekm at pld-linux.org
Thu May 20 19:15:51 CEST 2010


Author: arekm                        Date: Thu May 20 17:15:51 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- no asm mode

---- Files affected:
packages/libvpx:
   libvpx.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/libvpx/libvpx.spec
diff -u packages/libvpx/libvpx.spec:1.4 packages/libvpx/libvpx.spec:1.5
--- packages/libvpx/libvpx.spec:1.4	Thu May 20 19:05:46 2010
+++ packages/libvpx/libvpx.spec	Thu May 20 19:15:45 2010
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+%bcond_without	asm
 Summary:	VP8, a high-quality video codec
 Name:		libvpx
 Version:	0.9.0
@@ -12,7 +13,7 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	doxygen
-BuildRequires:	yasm
+%{?with_asm:BuildRequires:	yasm}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -43,12 +44,16 @@
 cd build
 # not autoconf configure
 ../configure \
+%if %{with asm}
 %ifarch %{x8664}
 	--target=x86_64-linux-gcc \
 %endif
 %ifarch %{ix86}
 	--target=x86-linux-gcc \
 %endif
+%else
+	--target=generic-gnu \
+%endif
 	--enable-pic \
 	--disable-optimizations \
 	--enable-vp8 \
@@ -56,9 +61,8 @@
 	--enable-runtime-cpu-detect
 
 # Hack our optflags in.
-sed -i "s|\"vpx_config.h\"|\"vpx_config.h\" %{rpmcflags} %{rpmcppflags} -fPIC|g" libs-*.mk
-sed -i "s|\"vpx_config.h\"|\"vpx_config.h\" %{rpmcflags} %{rpmcppflags} -fPIC|g" examples-*.mk
-sed -i "s|\"vpx_config.h\"|\"vpx_config.h\" %{rpmcflags} %{rpmcppflags} -fPIC|g" docs-*.mk
+sed -i "s|\"vpx_config.h\"|\"vpx_config.h\" %{rpmcflags} %{rpmcppflags} -fPIC|g" {libs,examples,docs}-*.mk
+sed -i "s|STRIP=.*|STRIP=|g" {libs,examples,docs}-*.mk
 
 %{__make} verbose=true target=libs \
 	CC="%{__cc}"
@@ -66,7 +70,10 @@
 %{__cc} %{rpmldflags} -fPIC -o libvpx.so.0.0.0 -shared -Wl,-soname,libvpx.so.0 vpx_codec/src/*.o vpx_mem/*.o \
 	vpx_scale/generic/*.o vp8/common/*.o vp8/common/generic/*.o vp8/*.o vp8/encoder/*.o \
 	vp8/encoder/generic/*.o vp8/decoder/*.o vp8/decoder/generic/*.o vpx_config.c.o \
-	vp8/common/x*/*.o vp8/encoder/x*/*.o vp8/decoder/x*/*.o vpx_ports/*.o -lm -lpthread
+%if %{with asm}
+	vp8/common/x*/*.o vp8/encoder/x*/*.o vp8/decoder/x*/*.o vpx_ports/*.o \
+%endif
+	-lm -lpthread
 
 # Temporarily dance the static libs out of the way
 mv libvpx.a libNOTvpx.a
@@ -132,6 +139,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/05/20 17:15:45  arekm
+- no asm mode
+
 Revision 1.4  2010/05/20 17:05:46  arekm
 - include files in vpx subdir
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libvpx/libvpx.spec?r1=1.4&r2=1.5&f=u



More information about the pld-cvs-commit mailing list