Merge branch 'frawhide' into gil/feat/xavs

Signed-off-by: Gilver <rockgrub@disroot.org>

anda/lib/xavs/xavs.spec

@@ -1,6 +1,9 @@
+%global commit r55
+%global date 20110821
+
 Name:           xavs
-Version:        0.1.55
-Release:        1%{?dist}
+Version:        0.1.55^%{date}svn%{commit}
+Release:        2%{?dist}
 Summary:        AVS1 (First-generation AVS Standards) library
 License:        GPLv2
 URL:            https://xavs.sourceforge.net/
@@ -10,7 +13,7 @@ BuildRequires:  automake
 BuildRequires:  gcc
 BuildRequires:  libtool
 BuildRequires:  subversion
-#BuildRequires:  yasm
+BuildRequires:  yasm
 
 %description
 AVS is a complete standard system including system, video, audio, and digital
@@ -35,16 +38,21 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-svn co https://svn.code.sf.net/p/xavs/code/trunk %{name}
+svn co -r %{commit} https://svn.code.sf.net/p/xavs/code/trunk %{name}
 %setup -T -D -n %{name}
 %autopatch -p1
 
 %build
 %configure \
+%ifarch x86_64
+    --enable-asm \
+    --extra-cflags="-Wno-int-conversion -Wno-declaration-missing-parameter-type -Wno-implicit-function-declaration -Wno-incompatible-pointer-types -Xlinker -z -Xlinker multidefs" \
+%else
     --disable-asm \
+    --extra-cflags="-Wno-int-conversion -Wno-declaration-missing-parameter-type" \
+%endif
     --enable-pic \
-    --enable-shared \
-    --extra-cflags="-Wno-int-conversion -Wno-declaration-missing-parameter-type"
+    --enable-shared 
 %make_build
 
 %install