Merge pull request #1624 from MilhouseVH/fix_neon_aarch64

aarch64/neon: update neon checks in ffmpeg and pulseaudio
This commit is contained in:
Lukas Rusak 2017-05-13 00:06:21 -07:00 committed by GitHub
commit 7551fb57f5
2 changed files with 7 additions and 9 deletions

View File

@ -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"

View File

@ -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"