- updated to svn rev. 55 (2011-08-21)

- added asm patch, enable asm on x86/x86_64

diff --git a/xavs-asm.patch b/xavs-asm.patch
new file mode 100644 (file)
index 0000000..db0f1f7
--- /dev/null
+++ b/xavs-asm.patch
@@ -0,0 +1,71 @@
+--- xavs/configure.orig        2017-07-20 17:37:44.000000000 +0200
++++ xavs/configure     2017-07-20 18:41:11.919527165 +0200
+@@ -87,7 +87,7 @@
+             ;;
+         --enable-asm)
+             asm="yes"
+-            CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE -DHAVE_SSE2"
++            CFLAGS="$CFLAGS -DHAVE_MMX -DHAVE_MMXEXT -DHAVE_SSE -DHAVE_SSE2"
+             ;;
+         --disable-asm)
+             asm="no"
+--- xavs/common/cpu.c.orig     2017-07-20 17:37:44.000000000 +0200
++++ xavs/common/cpu.c  2017-07-20 20:11:52.406131711 +0200
+@@ -199,6 +199,16 @@
+   return cpu;
+ }
+ 
++void
++xavs_cpu_restore (uint32_t cpu)
++{
++  return;
++}
++
++void
++xavs_cpu_mask_misalign_sse (void)
++{
++}
+ #elif defined( ARCH_PPC )
+ 
+ #if defined(SYS_MACOSX) || defined(SYS_OPENBSD)
+@@ -264,6 +274,12 @@
+ 
+   return XAVS_CPU_ALTIVEC;
+ }
++
++void
++xavs_cpu_restore (uint32_t cpu)
++{
++  return;
++}
+ #endif
+ 
+ #else
+--- xavs/common/dct.c.orig     2017-07-20 17:37:44.000000000 +0200
++++ xavs/common/dct.c  2017-07-20 18:58:37.049515231 +0200
+@@ -429,6 +429,7 @@
+       {
+         pf->scan_8x8 = zigzag_scan_8x8_frame;
+         pf->sub_8x8 = zigzag_sub_8x8_frame;
++#if 0 /* functions not defined */
+ #ifdef HAVE_MMX
+         if (cpu & XAVS_CPU_MMXEXT)
+           pf->scan_8x8 = xavs_zigzag_scan_8x8_frame_mmxext;
+@@ -441,6 +442,7 @@
+         }
+ #endif /*HAVE_SSE3*/        
+ #endif
++#endif
+       }
+ }
+ 
+--- xavs/Makefile.orig 2017-07-20 18:58:56.609515009 +0200
++++ xavs/Makefile      2017-07-20 19:16:58.359502654 +0200
+@@ -18,7 +18,6 @@
+ X86SRC = common/i386/cpu-a.asm \
+          common/i386/dct-sse2.asm \
+          common/i386/deblock.asm \
+-         common/i386/deblock_inter.asm \
+          common/i386/deblock_intra.asm \
+          common/i386/mc-a01.asm \
+          common/i386/mc-a.asm \

diff --git a/xavs.spec b/xavs.spec
index 357a0c8c0619c22e305e72b87b3221177a6838e4..75c7c9dc6600ca3ebc732f48c21b45e00691ec8e 100644 (file)
--- a/xavs.spec
+++ b/xavs.spec
@@ -1,22 +1,31 @@
+#
+# Conditional build:
+%bcond_without asm     # MMX/SSE* x86 assembler optimizations
+
+%ifnarch %{ix86} %{x8664}
+%undefine      with_asm
+%endif
 Summary:       Audio Video Standard of China library
 Summary(pl.UTF-8):     Biblioteka kodeka AVS (Audio Video Standard of China)
 Name:          xavs
 Version:       0
-%define        svnver  51
+%define        svnver  55
 Release:       0.svn%{svnver}.2
 License:       GPL v2+
 Group:         Libraries
 # svn co https://xavs.svn.sourceforge.net/svnroot/xavs/trunk xavs
 Source0:       %{name}-r%{svnver}.tar.xz
-# Source0-md5: c96ff5e330dd18760bc2024435a95a01
+# Source0-md5: c4f73561424d850a5c59ef202d85f0d7
 Patch0:                %{name}-dynamic-xavs.patch
+Patch1:                %{name}-asm.patch
+URL:           http://xavs.sourceforge.net/
 BuildRequires: tar >= 1:1.22
 # for svnversion
 BuildRequires: subversion
 BuildRequires: xz
-%ifarch %{ix86} %{x8664}
-#BuildRequires:        binutils >= 2.17
-#BuildRequires:        yasm >= 0.6.1
+%if %{with asm}
+BuildRequires: binutils >= 2:2.17
+BuildRequires: yasm >= 0.6.1
 %endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -56,19 +65,17 @@ Statyczna biblioteka AVS.
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
 
 %build
 # not autoconf script
 ./configure \
        --prefix=%{_prefix} \
        --libdir=%{_libdir} \
+       --enable-asm%{!?with_asm:=no} \
        --enable-shared \
        --extra-cflags="%{rpmcflags} %{rpmcppflags} -fno-strict-aliasing" \
        --extra-ldflags="%{rpmldflags}"
-# currently broken
-#%ifarch %{ix86} %{x8664} \
-#      --enable-asm \
-#%endif
 
 # linking hack
 ln -sf libxavs.so.1 libxavs.so