[vlc-devel] commit: Move Altivec chroma plugin to altivec/ ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jan 10 16:51:34 2010 +0200| [4be112d1c016fb6edfadec092004d2936c78b263] | committer: Rémi Denis-Courmont 

Move Altivec chroma plugin to altivec/

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4be112d1c016fb6edfadec092004d2936c78b263
---

 configure.ac                     |    2 --
 modules/altivec/Modules.am       |    8 ++++++++
 modules/video_chroma/Modules.am  |    5 -----
 modules/video_chroma/i420_yuy2.c |    2 --
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index ee562ec..4e70382 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1566,7 +1566,6 @@ AS_IF([test "${enable_altivec}" = "yes"], [
       VLC_ADD_CFLAGS([libvlccore],[${ac_cv_altivec_inline}])
     ])
     have_altivec="yes"
-    VLC_ADD_PLUGIN([i420_yuy2_altivec])
   ])
 
 dnl The AltiVec C extensions
@@ -1629,7 +1628,6 @@ dnl - Others: test should fail
     VLC_ADD_CFLAGS([idctaltivec motionaltivec],[${ac_cv_c_altivec}])
     VLC_ADD_CFLAGS([i420_yuy2_altivec memcpyaltivec deinterlace],[${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}])
     have_altivec="yes"
-    VLC_ADD_PLUGIN([i420_yuy2_altivec])
   ])
 
   AC_CACHE_CHECK([if linker needs -framework vecLib],
diff --git a/modules/altivec/Modules.am b/modules/altivec/Modules.am
index c7a8d87..52ff67e 100644
--- a/modules/altivec/Modules.am
+++ b/modules/altivec/Modules.am
@@ -3,6 +3,14 @@ libmemcpyaltivec_plugin_la_CFLAGS = $(AM_CFLAGS)
 libmemcpyaltivec_plugin_la_LIBADD = $(AM_LIBADD)
 libmemcpyaltivec_plugin_la_DEPENDENCIES =
 
+libi420_yuy2_altivec_plugin_la_SOURCES = \
+        ../video_chroma/i420_yuy2.c \
+	../video_chroma/i420_yuy2.h
+libi420_yuy2_altivec_plugin_la_CFLAGS = $(AM_CFLAGS)
+libi420_yuy2_altivec_plugin_la_LIBADD = $(AM_LIBADD)
+libi420_yuy2_altivec_plugin_la_DEPENDENCIES =
+
 libvlc_LTLIBRARIES += \
 	libmemcpyaltivec_plugin.la \
+	libi420_yuy2_altivec_plugin.la \
 	$(NULL)
diff --git a/modules/video_chroma/Modules.am b/modules/video_chroma/Modules.am
index 1371ec1..3e01f16 100644
--- a/modules/video_chroma/Modules.am
+++ b/modules/video_chroma/Modules.am
@@ -11,11 +11,6 @@ SOURCES_i420_yuy2 = \
 	i420_yuy2.h \
 	$(NULL)
 
-SOURCES_i420_yuy2_altivec = \
-	i420_yuy2.c \
-	i420_yuy2.h \
-	$(NULL)
-
 SOURCES_i422_yuy2 = \
 	i422_yuy2.c \
 	i422_yuy2.h \
diff --git a/modules/video_chroma/i420_yuy2.c b/modules/video_chroma/i420_yuy2.c
index 86b2800..57a7af6 100644
--- a/modules/video_chroma/i420_yuy2.c
+++ b/modules/video_chroma/i420_yuy2.c
@@ -33,7 +33,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
-#include <vlc_cpu.h>
 
 #if defined (MODULE_NAME_IS_i420_yuy2_altivec) && defined(HAVE_ALTIVEC_H)
 #   include <altivec.h>
@@ -98,7 +97,6 @@ vlc_module_begin ()
     set_description(
             _("AltiVec conversions from " SRC_FOURCC " to " DEST_FOURCC) );
     set_capability( "video filter2", 250 )
-    add_requirement( ALTIVEC )
 #endif
     set_callbacks( Activate, NULL )
 vlc_module_end ()