From c0c0c08f32b20752bf401e1e5c9736d110768ac7 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 5 Jun 2018 11:46:01 +0200 Subject: [PATCH] soxr: don't create libavutil dependency on ARM When both SIMD/NEON optimized and non-SIMD resamplers are built soxr uses libavutil to do runtime CPU detection to switch between these. Avoid that by enabling only one of them depending on NEON availability. Also explicitly disable AVFFT to avoid picking up a dependency on libavcodec. Signed-off-by: Matthias Reichl --- packages/audio/soxr/package.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/audio/soxr/package.mk b/packages/audio/soxr/package.mk index 130a2c6747..402df75680 100644 --- a/packages/audio/soxr/package.mk +++ b/packages/audio/soxr/package.mk @@ -32,4 +32,13 @@ PKG_BUILD_FLAGS="+pic" PKG_CMAKE_OPTS_TARGET="-DBUILD_EXAMPLES=OFF \ -DBUILD_SHARED_LIBS=OFF \ - -DBUILD_TESTS=OFF" + -DBUILD_TESTS=OFF \ + -DWITH_AVFFT=OFF" + +if [ "$TARGET_ARCH" = "arm" ]; then + if target_has_feature neon; then + PKG_CMAKE_OPTS_TARGET+=" -DWITH_CR32=OFF" + else + PKG_CMAKE_OPTS_TARGET+=" -DWITH_CR32S=OFF" + fi +fi