From c863ecc017a06f314af5d21c95059f45d91b1d28 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Tue, 17 Oct 2017 22:56:34 +0100
Subject: [PATCH] packages: use target_has_feature

---
 packages/addons/addon-depends/libdvbcsa/package.mk        | 8 +++-----
 packages/audio/flac/package.mk                            | 2 +-
 packages/audio/pulseaudio/package.mk                      | 2 +-
 packages/emulation/libretro-dinothawr/package.mk          | 2 +-
 .../game.libretro.pcsx-rearmed/package.mk                 | 4 ++--
 packages/mediacenter/kodi/package.mk                      | 2 +-
 packages/multimedia/ffmpeg/package.mk                     | 2 +-
 7 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/packages/addons/addon-depends/libdvbcsa/package.mk b/packages/addons/addon-depends/libdvbcsa/package.mk
index 43a18f4e66..8fb48e0ba2 100644
--- a/packages/addons/addon-depends/libdvbcsa/package.mk
+++ b/packages/addons/addon-depends/libdvbcsa/package.mk
@@ -32,14 +32,12 @@ PKG_AUTORECONF="yes"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static --with-sysroot=$SYSROOT_PREFIX"
 
-if echo "$TARGET_FPU" | grep -q '^neon'; then
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-neon"
-elif [ "$TARGET_ARCH" = aarch64 ]; then
+if target_has_feature neon; then
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-neon"
 elif [ "$TARGET_ARCH" = x86_64  ]; then
-  if echo "$PROJECT_CFLAGS" | grep -q '\-mssse3'; then
+  if target_has_feature ssse3; then
     PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-ssse3"
-  elif echo "$PROJECT_CFLAGS" | grep -q '\-msse2'; then
+  elif target_has_feature sse2; then
     PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-sse2"
   else
     PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-uint64"
diff --git a/packages/audio/flac/package.mk b/packages/audio/flac/package.mk
index 00d25e014c..510fd4664f 100644
--- a/packages/audio/flac/package.mk
+++ b/packages/audio/flac/package.mk
@@ -42,7 +42,7 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --with-ogg=$SYSROOT_PREFIX/usr \
                            --with-gnu-ld"
 
-if [ $TARGET_ARCH = "x86_64" ]; then
+if target_has_feature sse; then
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-sse"
 else
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-sse"
diff --git a/packages/audio/pulseaudio/package.mk b/packages/audio/pulseaudio/package.mk
index 3620edc308..efbfbba9ab 100644
--- a/packages/audio/pulseaudio/package.mk
+++ b/packages/audio/pulseaudio/package.mk
@@ -44,7 +44,7 @@ else
 fi
 
 # PulseAudio fails to build on aarch64 when NEON is enabled, so don't enable NEON for aarch64 until upstream supports it
-if echo "$TARGET_FPU" | grep -q '^neon'; then
+if [ "$TARGET_ARCH" = "arm" ] && target_has_feature neon; then
   PULSEAUDIO_NEON="--enable-neon-opt"
 else
   PULSEAUDIO_NEON="--disable-neon-opt"
diff --git a/packages/emulation/libretro-dinothawr/package.mk b/packages/emulation/libretro-dinothawr/package.mk
index da3415bf4a..93efecf1f9 100644
--- a/packages/emulation/libretro-dinothawr/package.mk
+++ b/packages/emulation/libretro-dinothawr/package.mk
@@ -36,7 +36,7 @@ PKG_LIBPATH="$PKG_LIBNAME"
 PKG_LIBVAR="DINOTHAWR_LIB"
 
 pre_make_target() {
-  if echo "$TARGET_FPU" | grep -q '^neon'; then
+  if target_has_feature neon; then
     export HAVE_NEON=1
   fi
 }
diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.pcsx-rearmed/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.pcsx-rearmed/package.mk
index f54b690210..5d4ada7bb8 100644
--- a/packages/mediacenter/kodi-binary-addons/game.libretro.pcsx-rearmed/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/game.libretro.pcsx-rearmed/package.mk
@@ -34,7 +34,7 @@ PKG_AUTORECONF="no"
 PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="kodi.gameclient"
 
-if [ "$DEVICE" == "RPi" ]; then
-  echo "RPi doesn't support neon"
+if ! target_has_feature neon; then
+  echo "${DEVICE:-${PROJECT}} doesn't support neon"
   exit 0
 fi
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index 7e5dd8f8bb..7f885b9719 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -154,7 +154,7 @@ else
   KODI_SSH="-DENABLE_SSH=OFF"
 fi
 
-if echo "$TARGET_FPU" | grep -q '^neon' || [[ "$TARGET_ARCH" = "aarch64" ]]; then
+if target_has_feature neon; then
   KODI_NEON="-DENABLE_NEON=ON"
 else
   KODI_NEON="-DENABLE_NEON=OFF"
diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk
index cc9d44383f..c820036cad 100644
--- a/packages/multimedia/ffmpeg/package.mk
+++ b/packages/multimedia/ffmpeg/package.mk
@@ -67,7 +67,7 @@ case "$TARGET_ARCH" in
     ;;
 esac
 
-if echo "$TARGET_FPU" | grep -q '^neon' || [[ "$TARGET_ARCH" = "aarch64" ]]; then
+if target_has_feature neon; then
   FFMPEG_FPU="--enable-neon"
 else
   FFMPEG_FPU="--disable-neon"