altivec: merge back into video_chroma (refs #9367)

It is a bit odd that both inline and external flags are mixed together.
This might be an old silent bug.

diff --git a/configure.ac b/configure.ac
index 6be27448cbdf7fb95affa0ee3e5a43e307d97460..835cae514eb130c0ba2069a0126ede38db62a99e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1378,6 +1378,7 @@ AC_ARG_ENABLE(altivec,
         [enable_altivec=yes], [enable_altivec=no])
 ])
 have_altivec="no"
+ALTIVEC_CFLAGS=""
 AS_IF([test "${enable_altivec}" = "yes"], [
   ARCH="${ARCH} altivec";
   VLC_SAVE_FLAGS
@@ -1395,8 +1396,8 @@ AS_IF([test "${enable_altivec}" = "yes"], [
     AC_DEFINE(CAN_COMPILE_ALTIVEC, 1,
               [Define to 1 if AltiVec inline assembly is available.])
     AS_IF([test "${ac_cv_altivec_inline}" != "yes"], [
+      ALTIVEC_CFLAGS="${ac_cv_altivec_inline}"
       VLC_ADD_CFLAGS([memcpyaltivec],[${ac_cv_altivec_inline}])
-      VLC_ADD_CFLAGS([i420_yuy2_altivec],[${ac_cv_altivec_inline}])
       VLC_ADD_CFLAGS([libvlccore],[${ac_cv_altivec_inline}])
     ])
     have_altivec="yes"
@@ -1454,7 +1455,8 @@ dnl - Others: test should fail
     CPPFLAGS="${CPPFLAGS} ${ac_cv_c_altivec}"
     AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, [Define to 1 if C AltiVec extensions are available.])
     VLC_ADD_CFLAGS([libvlccore],[${ac_cv_c_altivec}])
-    VLC_ADD_CFLAGS([i420_yuy2_altivec memcpyaltivec deinterlace],[${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}])
+    ALTIVEC_CFLAGS="$ALTIVEC_FLAGS ${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}"
+    VLC_ADD_CFLAGS([memcpyaltivec deinterlace],[${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}])
     have_altivec="yes"
   ])
   AC_CHECK_HEADERS(altivec.h)
@@ -1469,6 +1471,7 @@ dnl - Others: test should fail
     VLC_ADD_LIBS([libvlccore memcpyaltivec],[-Wl,-framework,vecLib])
   ])
 ])
+AC_SUBST(ALTIVEC_CFLAGS)
 AM_CONDITIONAL([HAVE_ALTIVEC], [test "$have_altivec" = "yes"])
 
 dnl
@@ -4277,7 +4280,6 @@ AC_CONFIG_FILES([
   modules/video_output/Makefile
   modules/video_splitter/Makefile
   modules/visualization/Makefile
-  modules/altivec/Makefile
   modules/arm_neon/Makefile
   modules/hw/vdpau/Makefile
 ])

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 8cb564f5c4abc99987f3eed861f9faca50f00108..d5008d9c338f8d01d2412e61cf0db9354eb2518b 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -24,7 +24,6 @@ EXTRA_SUBDIRS = \
        access_output \
        mux \
        stream_out \
-       altivec \
        arm_neon \
        hw/vdpau \
        lua
@@ -34,9 +33,6 @@ DIST_SUBDIRS = . $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
 if ENABLE_SOUT
 SUBDIRS += access_output mux stream_out
 endif
-if HAVE_ALTIVEC
-SUBDIRS += altivec
-endif
 if HAVE_NEON
 SUBDIRS += arm_neon
 endif

diff --git a/modules/altivec/Makefile.am b/modules/altivec/Makefile.am
deleted file mode 100644 (file)
index a552ec9..0000000
--- a/modules/altivec/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-AUTOMAKE_OPTIONS = subdir-objects
-basedir = altivec
-include $(top_srcdir)/modules/common.am
-
-libi420_yuy2_altivec_plugin_la_SOURCES = \
-        ../video_chroma/i420_yuy2.c \
-       ../video_chroma/i420_yuy2.h
-libi420_yuy2_altivec_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_i420_yuy2_altivec)
-libi420_yuy2_altivec_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_i420_yuy2_altivec)
-
-libvlc_LTLIBRARIES = \
-       libi420_yuy2_altivec_plugin.la

diff --git a/modules/video_chroma/Makefile.am b/modules/video_chroma/Makefile.am
index e2fb3c287c8c4731de8fd9a58f80dabad7dc3fb5..1eed8720c171933cb76158ecaf4ad32d004844e5 100644 (file)
--- a/modules/video_chroma/Makefile.am
+++ b/modules/video_chroma/Makefile.am
@@ -54,6 +54,15 @@ libvlc_LTLIBRARIES = \
 
 EXTRA_LTLIBRARIES = libswscale_plugin.la libchroma_omx_plugin.la
 
+# AltiVec
+libi420_yuy2_altivec_plugin_la_SOURCES = i420_yuy2.c i420_yuy2.h
+libi420_yuy2_altivec_plugin_la_CFLAGS = $(AM_CFLAGS) $(ALTIVEC_CFLAGS)
+
+if HAVE_ALTIVEC
+libvlc_LTLIBRARIES += \
+       libi420_yuy2_altivec_plugin.la
+endif
+
 # MMX
 libi420_rgb_mmx_plugin_la_SOURCES = i420_rgb.c i420_rgb.h \
        i420_rgb16.c i420_rgb_mmx.h