Commit 43b465fe authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

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.
parent 4c7fcb01
......@@ -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
])
......
......@@ -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
......
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
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment