[vlc-devel] commit: Move Altivec memcpy to altivec directory ( Rémi Denis-Courmont )
git version control
git at videolan.org
Sun Jan 10 12:06:21 CET 2010
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jan 10 13:05:53 2010 +0200| [483030a0ef7cac5d8e4d62e3fa31d3110cecdfbe] | committer: Rémi Denis-Courmont
Move Altivec memcpy to altivec directory
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=483030a0ef7cac5d8e4d62e3fa31d3110cecdfbe
---
configure.ac | 8 +++++---
modules/Makefile.am | 3 +++
modules/altivec/.gitignore | 1 +
modules/altivec/Modules.am | 8 ++++++++
.../memcpy/memcpyaltivec.c => altivec/memcpy.c} | 3 +--
modules/misc/Modules.am | 2 +-
modules/misc/memcpy/Modules.am | 3 ---
po/POTFILES.in | 2 +-
8 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6713ead..ab8f249 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1546,6 +1546,7 @@ AC_ARG_ENABLE(altivec,
AS_IF([test "${host_cpu}" = "powerpc"],
[enable_altivec=yes], [enable_altivec=no])
])
+have_altivec="no"
AS_IF([test "${enable_altivec}" = "yes"], [
ARCH="${ARCH} altivec";
AC_CACHE_CHECK([if $CC groks AltiVec inline assembly],
@@ -1568,7 +1569,7 @@ AS_IF([test "${enable_altivec}" = "yes"], [
VLC_ADD_CFLAGS([i420_yuy2_altivec],[${ac_cv_altivec_inline}])
VLC_ADD_CFLAGS([libvlccore],[${ac_cv_altivec_inline}])
])
- VLC_ADD_PLUGIN([memcpyaltivec])
+ have_altivec="yes"
VLC_ADD_PLUGIN([i420_yuy2_altivec])
])
@@ -1631,7 +1632,7 @@ dnl - Others: test should fail
VLC_ADD_CFLAGS([libvlccore],[${ac_cv_c_altivec}])
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}])
- VLC_ADD_PLUGIN([memcpyaltivec])
+ have_altivec="yes"
VLC_ADD_PLUGIN([i420_yuy2_altivec])
])
@@ -1645,6 +1646,7 @@ dnl - Others: test should fail
VLC_ADD_LDFLAGS([libvlccore idctaltivec motionaltivec memcpyaltivec],[-Wl,-framework,vecLib])
])
])
+AM_CONDITIONAL([HAVE_ALTIVEC], [test "$have_altivec" = "yes"])
dnl
dnl Special arch tuning
@@ -5179,7 +5181,6 @@ AC_CONFIG_FILES([
modules/misc/Makefile
modules/misc/dummy/Makefile
modules/misc/lua/Makefile
- modules/misc/memcpy/Makefile
modules/misc/notify/Makefile
modules/misc/testsuite/Makefile
modules/misc/playlist/Makefile
@@ -5203,6 +5204,7 @@ AC_CONFIG_FILES([
modules/mmx/Makefile
modules/mmxext/Makefile
modules/3dnow/Makefile
+ modules/altivec/Makefile
])
dnl Generate makefiles
diff --git a/modules/Makefile.am b/modules/Makefile.am
index bdc946a..4227439 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -40,6 +40,9 @@ endif
if HAVE_3DNOW
SUBDIRS += 3dnow
endif
+if HAVE_ALTIVEC
+SUBDIRS += altivec
+endif
dist_noinst_SCRIPTS = genmf list.sh
dist_noinst_DATA = LIST
diff --git a/modules/altivec/.gitignore b/modules/altivec/.gitignore
new file mode 100644
index 0000000..08a6d72
--- /dev/null
+++ b/modules/altivec/.gitignore
@@ -0,0 +1 @@
+Makefile.am
diff --git a/modules/altivec/Modules.am b/modules/altivec/Modules.am
new file mode 100644
index 0000000..c7a8d87
--- /dev/null
+++ b/modules/altivec/Modules.am
@@ -0,0 +1,8 @@
+libmemcpyaltivec_plugin_la_SOURCES = memcpy.c
+libmemcpyaltivec_plugin_la_CFLAGS = $(AM_CFLAGS)
+libmemcpyaltivec_plugin_la_LIBADD = $(AM_LIBADD)
+libmemcpyaltivec_plugin_la_DEPENDENCIES =
+
+libvlc_LTLIBRARIES += \
+ libmemcpyaltivec_plugin.la \
+ $(NULL)
diff --git a/modules/misc/memcpy/memcpyaltivec.c b/modules/altivec/memcpy.c
similarity index 99%
rename from modules/misc/memcpy/memcpyaltivec.c
rename to modules/altivec/memcpy.c
index 2678fd4..2d91ea2 100644
--- a/modules/misc/memcpy/memcpyaltivec.c
+++ b/modules/altivec/memcpy.c
@@ -1,5 +1,5 @@
/*****************************************************************************
- * memcpyaltivec.c : AltiVec memcpy module
+ * memcpy.c : AltiVec memcpy module
*****************************************************************************
* Copyright (C) 2001 the VideoLAN team
* $Id$
@@ -61,7 +61,6 @@ vlc_module_begin ()
set_description( N_("AltiVec memcpy") )
set_category( CAT_ADVANCED )
set_subcategory( SUBCAT_ADVANCED_MISC )
- add_requirement( ALTIVEC )
set_capability( "memcpy", 100 )
set_callbacks( Activate, NULL )
add_shortcut( "altivec" )
diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am
index c63b4bd..364160e 100644
--- a/modules/misc/Modules.am
+++ b/modules/misc/Modules.am
@@ -1,4 +1,4 @@
-BASE_SUBDIRS = dummy memcpy notify testsuite playlist stats osd xml
+BASE_SUBDIRS = dummy notify testsuite playlist stats osd xml
EXTRA_SUBDIRS = lua
SUBDIRS = $(BASE_SUBDIRS)
diff --git a/modules/misc/memcpy/Modules.am b/modules/misc/memcpy/Modules.am
deleted file mode 100644
index 5240b2a..0000000
--- a/modules/misc/memcpy/Modules.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES_memcpyaltivec = \
- memcpyaltivec.c \
- $(NULL)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3b34867..e58d8b2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -310,6 +310,7 @@ modules/access_output/http.c
modules/access_output/rtmp.c
modules/access_output/shout.c
modules/access_output/udp.c
+modules/altivec/memcpy.c
modules/audio_filter/channel_mixer/dolby.c
modules/audio_filter/channel_mixer/headphone.c
modules/audio_filter/channel_mixer/mono.c
@@ -976,7 +977,6 @@ modules/misc/lua/libs/volume.c
modules/misc/lua/meta.c
modules/misc/lua/vlc.c
modules/misc/lua/vlc.h
-modules/misc/memcpy/memcpyaltivec.c
modules/misc/notify/growl.m
modules/misc/notify/growl_udp.c
modules/misc/notify/msn.c
More information about the vlc-devel
mailing list