* configure.ac:

    + Check for vec_ld instead of vec_mtvscr in the C AltiVec detection.
    + Include <altivec.h> in the C AltiVec detection.
  * modules/misc/memcpy/memcpyaltivec.c modules/video_chroma/i420_yuy2.c:
    + Include <altivec.h> in the C AltiVec versions.

diff --git a/configure.ac b/configure.ac
index 1dc6df51bde6a7e080910179ea8d96bc365360d4..73d62f2fce84514168428fd58d8ee71e98746701 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1002,17 +1002,21 @@ AC_CACHE_CHECK([if \$CC groks AltiVec C extensions],
     [# Darwin test
      CFLAGS="${CFLAGS_save} -faltivec"
      AC_TRY_COMPILE([],
-       [vec_mtvscr((vector unsigned int)(0));],
+       [vec_ld(0, (unsigned char *)0);],
        [ac_cv_c_altivec="-faltivec"],
        [# Linux/PPC test
         CFLAGS="${CFLAGS_save} ${CFLAGS_idctaltivec} -maltivec -mabi=altivec"
-        AC_TRY_COMPILE([],
-          [vec_mtvscr((vector unsigned int)(0));],
+        AC_TRY_COMPILE([#ifdef HAVE_ALTIVEC_H
+                        #include <altivec.h>
+                        #endif],
+          [vec_ld(0, (unsigned char *)0);],
           [ac_cv_c_altivec="-maltivec -mabi=altivec"],
           [# Linux/PPC test (old GCC versions)
            CFLAGS="${CFLAGS_save} ${CFLAGS_idctaltivec} -fvec"
-           AC_TRY_COMPILE([#include <altivec.h>],
-             [vec_mtvscr((vector unsigned int)(0));],
+           AC_TRY_COMPILE([#ifdef HAVE_ALTIVEC_H
+                           #include <altivec.h>
+                           #endif],
+             [vec_ld(0, (unsigned char *)0);],
              [ac_cv_c_altivec="-fvec"],
              [ac_cv_c_altivec=no])
            ])

diff --git a/modules/misc/memcpy/memcpyaltivec.c b/modules/misc/memcpy/memcpyaltivec.c
index bb7af7093410689ac8edd4a99c6efe255f818a90..0023a91aaccb528fe6cfc53af2369a18ad834a0f 100644 (file)
--- a/modules/misc/memcpy/memcpyaltivec.c
+++ b/modules/misc/memcpy/memcpyaltivec.c
@@ -2,7 +2,7 @@
  * memcpyaltivec.c : AltiVec memcpy module
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: memcpyaltivec.c,v 1.4 2003/12/22 14:32:56 sam Exp $
+ * $Id$
  *
  * Author: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -31,6 +31,10 @@
 
 #include <vlc/vlc.h>
 
+#ifdef HAVE_ALTIVEC_H
+#   include <altivec.h>
+#endif
+
 /*****************************************************************************
  * Local prototypes.
  *****************************************************************************/

diff --git a/modules/video_chroma/i420_yuy2.c b/modules/video_chroma/i420_yuy2.c
index b35fb25fb5e784cd563ee6cf3cf3dce437e7c03c..e42e0cace24b617879608b90d46eb84e8870d572 100644 (file)
--- a/modules/video_chroma/i420_yuy2.c
+++ b/modules/video_chroma/i420_yuy2.c
@@ -30,6 +30,10 @@
 #include <vlc/vlc.h>
 #include <vlc/vout.h>
 
+#ifdef HAVE_ALTIVEC_H
+#   include <altivec.h>
+#endif
+
 #include "i420_yuy2.h"
 
 #define SRC_FOURCC  "I420,IYUV,YV12"