From 40e58dab0cc2de728c1363b4aa14c252559c93db Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Mon, 12 May 2014 22:28:17 -0700 Subject: [PATCH] powerpc: add BR2_POWERPC_CPU_HAS_ALTIVEC to replace adhoc deps/checks Signed-off-by: Cody P Schafer Signed-off-by: Peter Korsgaard --- arch/Config.in.powerpc | 6 ++++++ package/efl/libevas/libevas.mk | 2 +- package/ffmpeg/ffmpeg.mk | 5 +---- package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk | 5 +---- package/gstreamer1/gst1-libav/gst1-libav.mk | 5 +---- package/mpg123/mpg123.mk | 4 +--- package/vlc/vlc.mk | 3 +-- 7 files changed, 12 insertions(+), 18 deletions(-) diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc index cb8935c9da..847910377b 100644 --- a/arch/Config.in.powerpc +++ b/arch/Config.in.powerpc @@ -1,3 +1,6 @@ +config BR2_POWERPC_CPU_HAS_ALTIVEC + bool + config BR2_POWERPC_CPU_HAS_SPE bool @@ -51,8 +54,10 @@ config BR2_powerpc_740 bool "740" config BR2_powerpc_7400 bool "7400" + select BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_powerpc_7450 bool "7450" + select BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_powerpc_750 bool "750" config BR2_powerpc_821 @@ -63,6 +68,7 @@ config BR2_powerpc_860 bool "860" config BR2_powerpc_970 bool "970" + select BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_powerpc_8540 bool "8540 / e500v1" select BR2_POWERPC_CPU_HAS_SPE diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk index 41ceb49cc9..71f1aeb785 100644 --- a/package/efl/libevas/libevas.mk +++ b/package/efl/libevas/libevas.mk @@ -136,7 +136,7 @@ else LIBEVAS_CONF_OPT += --disable-cpu-sse3 endif -ifeq ($(BR2_powerpc_7400)$(BR2_powerpc_7450)$(BR2_powerpc_970),y) +ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) LIBEVAS_CONF_OPT += --enable-cpu-altivec else LIBEVAS_CONF_OPT += --disable-cpu-altivec diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index a0a15a3cc1..5510b80984 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -299,14 +299,11 @@ FFMPEG_CONF_OPT += \ --disable-mipsdspr2 endif -# Set powerpc altivec appropriately -ifeq ($(BR2_powerpc),y) -ifeq ($(BR2_powerpc_7400)$(BR2_powerpc_7450)$(BR2_powerpc_970),y) +ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) FFMPEG_CONF_OPT += --enable-altivec else FFMPEG_CONF_OPT += --disable-altivec endif -endif ifeq ($(BR2_PREFER_STATIC_LIB),) FFMPEG_CONF_OPT += --enable-pic diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk index f18ab1821e..5c4b7543b8 100644 --- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk +++ b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk @@ -63,14 +63,11 @@ ifeq ($(BR2_ARM_CPU_HAS_NEON),y) GST_FFMPEG_CONF_EXTRA_OPT += --enable-neon endif -# Set powerpc altivec appropriately -ifeq ($(BR2_powerpc),y) -ifeq ($(BR2_powerpc_7400)$(BR2_powerpc_7450)$(BR2_powerpc_970),y) +ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) GST_FFMPEG_CONF_EXTRA_OPT += --enable-altivec else GST_FFMPEG_CONF_EXTRA_OPT += --disable-altivec endif -endif ifeq ($(BR2_PREFER_STATIC_LIB),) GST_FFMPEG_CONF_EXTRA_OPT += --enable-pic diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 7a0182e45c..f84bcb2cc0 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -71,14 +71,11 @@ else GST1_LIBAV_CONF_EXTRA_OPT += --disable-vfp endif -# Set powerpc altivec appropriately -ifeq ($(BR2_powerpc),y) -ifeq ($(BR2_powerpc_7400)$(BR2_powerpc_7450)$(BR2_powerpc_970),y) +ifeq ($(BR2_POWERPC_CPU_HASH_ALTIVEC),y) GST1_LIBAV_CONF_EXTRA_OPT += --enable-altivec else GST1_LIBAV_CONF_EXTRA_OPT += --disable-altivec endif -endif GST1_LIBAV_CONF_OPT = \ --with-libav-extra-configure="$(GST1_LIBAV_CONF_EXTRA_OPT)" diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk index a950813c73..d66592cd70 100644 --- a/package/mpg123/mpg123.mk +++ b/package/mpg123/mpg123.mk @@ -22,14 +22,12 @@ ifeq ($(BR2_i386),y) MPG123_CPU = x86 endif -ifeq ($(BR2_powerpc),y) -ifneq ($(BR2_powerpc_7400)$(BR2_powerpc_7450)$(BR2_powerpc_970),) +ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) MPG123_CPU = altivec endif ifeq ($(BR2_SOFT_FLOAT),y) MPG123_CPU = ppc_nofpu endif -endif ifeq ($(BR2_x86_64),y) MPG123_CPU = x86-64 diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index e14c9c3d4a..6eb7eead9b 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -49,8 +49,7 @@ ifeq ($(BR2_PREFER_STATIC_LIB),) VLC_CONF_OPT += --disable-static endif -# Set powerpc altivec appropriately -ifeq ($(BR2_powerpc_7400)$(BR2_powerpc_7450)$(BR2_powerpc_970),y) +ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) VCL_CONF_OPT += --enable-altivec else VLC_CONF_OPT += --disable-altivec -- 2.30.2