From 3f08c6ad22ab3e6eb82c89c52a3a4d34cc9f285a Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sat, 13 May 2017 07:30:38 +0100
Subject: [PATCH 1/2] ffmpeg: enable neon by default for aarch64

---
 packages/multimedia/ffmpeg/package.mk | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk
index b169d807ac..7ad63c51d0 100644
--- a/packages/multimedia/ffmpeg/package.mk
+++ b/packages/multimedia/ffmpeg/package.mk
@@ -68,14 +68,11 @@ case "$TARGET_ARCH" in
     ;;
 esac
 
-case "$TARGET_FPU" in
-  neon*)
-    FFMPEG_FPU="--enable-neon"
-    ;;
-  *)
-    FFMPEG_FPU="--disable-neon"
-    ;;
-esac
+if echo "$TARGET_FPU" | grep -q '^neon' || [[ "$TARGET_ARCH" = "aarch64" ]]; then
+  FFMPEG_FPU="--enable-neon"
+else
+  FFMPEG_FPU="--disable-neon"
+fi
 
 if [ "$DISPLAYSERVER" = "x11" ]; then
   FFMPEG_X11GRAB="--enable-indev=x11grab_xcb"

From c2dc3afb0bbf2d8967fbf5d3c6dde80fad8343ec Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sat, 13 May 2017 07:30:38 +0100
Subject: [PATCH 2/2] pulseaudio: enable neon by default for aarch64

---
 packages/audio/pulseaudio/package.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/audio/pulseaudio/package.mk b/packages/audio/pulseaudio/package.mk
index cd25ab836f..4f8437d33c 100644
--- a/packages/audio/pulseaudio/package.mk
+++ b/packages/audio/pulseaudio/package.mk
@@ -46,7 +46,8 @@ else
   PULSEAUDIO_AVAHI="--disable-avahi"
 fi
 
-if [ "$TARGET_FPU" = "neon" -o "$TARGET_FPU" = "neon-fp16" -o "$TARGET_FPU" = "neon-vfpv4" ]; then
+# 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
   PULSEAUDIO_NEON="--enable-neon-opt"
 else
   PULSEAUDIO_NEON="--disable-neon-opt"