[Mplayer-cvslog] CVS: main/libmpeg2 Makefile, 1.13, 1.14 cpu_accel.c, 1.4, 1.5 motion_comp.c, 1.7, 1.8

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/libmpeg2
In directory mail:/var2/tmp/cvs-serv14743/libmpeg2

Modified Files:
	Makefile cpu_accel.c motion_comp.c 
Log Message:
Improved SPARC CPU detection and SPARC compilation fixes.
patch by jb13 at gomerbud.com


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile	2 Aug 2004 11:20:38 -0000	1.13
+++ Makefile	14 Aug 2004 15:17:39 -0000	1.14
@@ -13,6 +13,10 @@
 SRCS += motion_comp_altivec.c idct_altivec.c
 endif
 
+ifeq ($(TARGET_VIS),yes)
+SRCS += motion_comp_vis.c
+endif
+
 .SUFFIXES: .c .o
 
 # .PHONY: all clean

Index: cpu_accel.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/cpu_accel.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cpu_accel.c	2 Aug 2004 11:20:38 -0000	1.4
+++ cpu_accel.c	14 Aug 2004 15:17:39 -0000	1.5
@@ -108,7 +108,7 @@
 }
 #endif /* ARCH_X86 */
 
-#if defined(ARCH_PPC) || defined(ARCH_SPARC)
+#if defined(ARCH_PPC) || (defined(ARCH_SPARC) && defined(HAVE_VIS))
 #include <signal.h>
 #include <setjmp.h>
 

Index: motion_comp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/motion_comp.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- motion_comp.c	2 Aug 2004 11:20:38 -0000	1.7
+++ motion_comp.c	14 Aug 2004 15:17:39 -0000	1.8
@@ -55,10 +55,12 @@
     else
 #endif
 #ifdef ARCH_SPARC
+#ifdef HAVE_VIS
     if (accel & MPEG2_ACCEL_SPARC_VIS)
 	mpeg2_mc = mpeg2_mc_vis;
     else
 #endif
+#endif
 	mpeg2_mc = mpeg2_mc_c;
 }