Reinsert ifdefs around SPARC assembler code in pgx64. Enable building pgx64 on Solaris/IA32 again. Change xine to use -mcpu=ultrasparc on sun4u platform.

CVS patchset: 3158
CVS date: 2002/11/02 22:30:20

2 files changed, 19 insertions, 21 deletions

diff --git a/configure.ac b/configure.ac
index d80bd1b9a..c3852b2be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,9 +209,9 @@ AC_ARG_ENABLE(altivec,
 		enable_altivec=yes)
 
 AC_ARG_ENABLE(vis, 
-	[  --enable-vis            use assembly codes for Sun UltraSPARC cpus],
-         	enable_vis=yes,
-		enable_vis=no)
+	[  --disable-vis            use assembly codes for Sun UltraSPARC cpus],
+         	enable_vis=no,
+		enable_vis=yes)
 
 if test x$enable_mlib = x; then
 AC_ARG_ENABLE(mlib,
@@ -399,13 +399,9 @@ AM_PATH_AALIB(1.4,, AC_MSG_RESULT([*** All of AALIB dependent parts will be disa
 AM_CONDITIONAL(HAVE_AA, test x$no_aalib != "xyes")
 
 dnl ---------------------------------------------
-dnl Check solaris framebuffer device support (only on Solaris SPARC)
+dnl Check solaris framebuffer device support
 dnl ---------------------------------------------
 AC_CHECK_HEADER(sys/fbio.h, ac_have_sunfb=yes,)
-case $host in
-sparc*) ;;
-*)	ac_have_sunfb=no ;;
-esac
 AM_CONDITIONAL(HAVE_SUNFB, [test x"$ac_have_sunfb" = "xyes"])
 
 dnl ---------------------------------------------
@@ -852,13 +848,13 @@ case "$host_or_hostalias" in
   sparc*-*-linux*)
     case $host_alias in
     sparc-*)    cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;;
-    sparc64-*)  cpu_cflags="-mcpu=supersparc -mtune=ultrasparc" ;;
-    esac
-
-    if test x$enable_vis = xyes; then
+    sparc64-*)
+      cpu_cflags="-mcpu=ultrasparc -mtune=ultrasparc"
+      if test x$enable_vis = xyes; then
         AC_DEFINE_UNQUOTED(ENABLE_VIS,,[Define this if you have Sun UltraSPARC CPU])
-        cpu_cflags="-mcpu=ultrasparc"
-    fi
+      fi
+    ;;
+    esac
 
     CFLAGS="$CFLAGS -O3 $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
     DEBUG_CFLAGS="$DEBUG_CFLAGS -O $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
@@ -871,15 +867,15 @@ case "$host_or_hostalias" in
 	case `uname -m` in
 	sun4c) cpu_cflags="-mcpu=v7 -mtune=supersparc" ;;
 	sun4m) cpu_cflags="-mcpu=v8 -mtune=supersparc" ;;
-	sun4u) cpu_cflags="-mcpu=supersparc -mtune=ultrasparc" ;;
+	sun4u)
+          cpu_cflags="-mcpu=ultrasparc -mtune=ultrasparc"
+          if test x$enable_vis = xyes; then
+	    AC_DEFINE_UNQUOTED(ENABLE_VIS,,[Define this if you have Sun UltraSPARC CPU])
+          fi
+          ;;
 	*)     cpu_cflags= ;;
 	esac
 
-        if test x$enable_vis = xyes; then
-	    AC_DEFINE_UNQUOTED(ENABLE_VIS,,[Define this if you have Sun UltraSPARC CPU])
-            cpu_cflags="-mcpu=ultrasparc"
-        fi
-
 	cc_optimize_cflags="-O3 $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
 	cc_debug_cflags="-O $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
         AC_DEFINE_UNQUOTED(FPM_SPARC,,[Define to select libmad fixed point arithmetic implementation])		dnl uses gnu c asm extensions
diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c
index 7d3fc2d4d..a39896573 100644
--- a/src/video_out/video_out_pgx64.c
+++ b/src/video_out/video_out_pgx64.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *
- * $Id: video_out_pgx64.c,v 1.12 2002/11/02 04:31:06 komadori Exp $
+ * $Id: video_out_pgx64.c,v 1.13 2002/11/02 22:30:21 komadori Exp $
  *
  * video_out_pgx64.c, Sun PGX64/PGX24 output plugin for xine
  *
@@ -370,6 +370,7 @@ static void pgx64_display_frame(pgx64_driver_t *this, pgx64_frame_t *frame)
       }
       break;
 
+#ifdef ENABLE_VIS
       case DEINTERLACE_LINEARBLEND_VIS: {
         register uint32_t *first = (uint32_t *)(frame->vo_frame.base[0]);
         register uint32_t *second = (uint32_t *)(frame->vo_frame.base[0]+frame->width);
@@ -402,6 +403,7 @@ static void pgx64_display_frame(pgx64_driver_t *this, pgx64_frame_t *frame)
         memcpy(dest, second, frame->width);
       }
       break;
+#endif
 
       default: {
         memcpy(this->fbbase+frame->buf_y, frame->vo_frame.base[0], frame->lengths[0]);