Changes - j0ke.net Open Build Service

Changes of Revision 12

[-] [+]	Changed	x264.spec
@@ -24,7 +24,7 @@ Source3: ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svncompc}-2245.tar.bz2 BuildRoot: %{_tmppath}/build-root-%{name} Requires: %{realname}-%{soname} = %{version}-%{release} -##BuildRequires: nasm +BuildRequires: nasm BuildRequires: yasm >= 0.7.1 %description @@ -145,7 +145,11 @@ #no mmx or sse on the i586 package, therefore use i686 package, should run on every i586 cpu %configure --enable-shared --enable-pic --disable-asm %else -%configure --enable-shared --enable-pic +%configure --enable-shared \ +%if 0%{?sles_version} == 10 + --disable-asm \ +%endif + --enable-pic %endif %__make %{?jobs:-j%{jobs}} @@ -154,7 +158,11 @@ #no mmx or sse on the i586 package, therefore use i686 package, should run on every i586 cpu %configure --enable-shared --enable-pic --disable-asm %else -%configure --enable-shared --enable-pic +%configure --enable-shared \ +%if 0%{?sles_version} == 10 + --disable-asm \ +%endif + --enable-pic %endif %__make %{?jobs:-j%{jobs}} @@ -163,7 +171,11 @@ #no mmx or sse on the i586 package, therefore use i686 package, should run on every i586 cpu %configure --enable-shared --enable-pic --disable-asm %else -%configure --enable-shared --enable-pic +%configure --enable-shared \ +%if 0%{?sles_version} == 10 + --disable-asm \ +%endif + --enable-pic %endif %__make %{?jobs:-j%{jobs}} @@ -172,7 +184,11 @@ #no mmx or sse on the i586 package, therefore use i686 package, should run on every i586 cpu %configure --enable-shared --enable-pic --disable-asm %else -%configure --enable-shared --enable-pic +%configure --enable-shared \ +%if 0%{?sles_version} == 10 + --disable-asm \ +%endif + --enable-pic %endif %__make %{?jobs:-j%{jobs}} x 1 @@ -24,7 +24,7 @@ 2 Source3: ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svncompc}-2245.tar.bz2 3 BuildRoot: %{_tmppath}/build-root-%{name} 4 Requires: %{realname}-%{soname} = %{version}-%{release} 5 -##BuildRequires: nasm 6 +BuildRequires: nasm 7 BuildRequires: yasm >= 0.7.1 8 9 %description 10 @@ -145,7 +145,11 @@ 11 #no mmx or sse on the i586 package, therefore use i686 package, should run on every i586 cpu 12 %configure --enable-shared --enable-pic --disable-asm 13 %else 14 -%configure --enable-shared --enable-pic 15 +%configure --enable-shared \ 16 +%if 0%{?sles_version} == 10 17 + --disable-asm \ 18 +%endif 19 + --enable-pic 20 %endif 21 %__make %{?jobs:-j%{jobs}} 22 23 @@ -154,7 +158,11 @@ 24 #no mmx or sse on the i586 package, therefore use i686 package, should run on every i586 cpu 25 %configure --enable-shared --enable-pic --disable-asm 26 %else 27 -%configure --enable-shared --enable-pic 28 +%configure --enable-shared \ 29 +%if 0%{?sles_version} == 10 30 + --disable-asm \ 31 +%endif 32 + --enable-pic 33 %endif 34 %__make %{?jobs:-j%{jobs}} 35 36 @@ -163,7 +171,11 @@ 37 #no mmx or sse on the i586 package, therefore use i686 package, should run on every i586 cpu 38 %configure --enable-shared --enable-pic --disable-asm 39 %else 40 -%configure --enable-shared --enable-pic 41 +%configure --enable-shared \ 42 +%if 0%{?sles_version} == 10 43 + --disable-asm \ 44 +%endif 45 + --enable-pic 46 %endif 47 %__make %{?jobs:-j%{jobs}} 48 49 @@ -172,7 +184,11 @@ 50 #no mmx or sse on the i586 package, therefore use i686 package, should run on every i586 cpu 51 %configure --enable-shared --enable-pic --disable-asm 52 %else 53 -%configure --enable-shared --enable-pic 54 +%configure --enable-shared \ 55 +%if 0%{?sles_version} == 10 56 + --disable-asm \ 57 +%endif 58 + --enable-pic 59 %endif 60 %__make %{?jobs:-j%{jobs}} 61 62