From 7cfe7edf5b0b92ffbb29afd6939eb1bb01536b74 Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Thu, 23 Jun 2022 19:21:05 +0800
Subject: [PATCH] Switch to single precision fftw, enable neon for arm

---
 debian/rules          | 2 +-
 docker-build-win64.sh | 6 +++---
 docker-build.sh       | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index 5ad88c5a4..e20e2fd72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ PACKAGEVERSION := "$(ORIG_VERSION)-$(VERSION_SUFFIX)"
 
 CONFIG := --prefix=${TARGET_DIR} \
 	--target-os=linux \
-	--extra-libs='-lfftw3' \
+	--extra-libs='-lfftw3f' \
 	--extra-version=Jellyfin \
 	--disable-doc \
 	--disable-ffplay \
diff --git a/docker-build-win64.sh b/docker-build-win64.sh
index b7e060802..cad5124eb 100755
--- a/docker-build-win64.sh
+++ b/docker-build-win64.sh
@@ -133,7 +133,7 @@ pushd fftw-${fftw3_ver}
     --prefix=${FF_DEPS_PREFIX} \
     --host=${FF_TOOLCHAIN} \
     --disable-{shared,doc} \
-    --enable-{static,threads,fortran} \
+    --enable-{static,single,threads,fortran} \
     --enable-{sse2,avx,avx-128-fma,avx2,avx512} \
     --with-our-malloc \
     --with-combined-threads \
@@ -154,11 +154,11 @@ cmake \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=OFF \
     -DBUILD_{TOOLS,TESTS}=OFF \
-    -DFFT_LIB=fftw3 \
+    -DFFT_LIB=fftw3f \
     ..
 make -j$(nproc)
 make install
-FF_EXTRA_LIBS="-lfftw3 -lstdc++${FF_EXTRA_LIBS}"
+FF_EXTRA_LIBS="-lfftw3f -lstdc++${FF_EXTRA_LIBS}"
 FF_EXTRA_CFLAGS="-DCHROMAPRINT_NODLL${FF_EXTRA_CFLAGS}"
 popd
 popd
diff --git a/docker-build.sh b/docker-build.sh
index f7908b24d..dc703c220 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -40,19 +40,19 @@ prepare_extra_common() {
     if [ "${ARCH}" = "amd64" ]; then
         fftw3_optimizations="--enable-sse2 --enable-avx --enable-avx-128-fma --enable-avx2 --enable-avx512"
     else
-        fftw3_optimizations=""
+        fftw3_optimizations="--enable-neon"
     fi
     ./configure \
         ${CROSS_OPT} \
         --prefix=${TARGET_DIR} \
         --disable-{static,doc} \
-        --enable-{shared,threads,fortran} \
+        --enable-{shared,single,threads,fortran} \
         $fftw3_optimizations \
         --with-our-malloc \
         --with-combined-threads \
         --with-incoming-stack-boundary=2
     make -j$(nproc) && make install && make install DESTDIR=${SOURCE_DIR}/fftw3
-    echo "fftw3${TARGET_DIR}/lib/libfftw3.so* usr/lib/jellyfin-ffmpeg/lib" >> ${DPKG_INSTALL_LIST}
+    echo "fftw3${TARGET_DIR}/lib/libfftw3f.so* usr/lib/jellyfin-ffmpeg/lib" >> ${DPKG_INSTALL_LIST}
     popd
     popd
     popd
@@ -69,7 +69,7 @@ prepare_extra_common() {
         -DCMAKE_BUILD_TYPE=Release \
         -DBUILD_SHARED_LIBS=ON \
         -DBUILD_{TOOLS,TESTS}=OFF \
-        -DFFT_LIB=fftw3 \
+        -DFFT_LIB=fftw3f \
         ..
     make -j$(nproc) && make install && make install DESTDIR=${SOURCE_DIR}/chromaprint
     echo "chromaprint${TARGET_DIR}/lib/libchromaprint.so* usr/lib/jellyfin-ffmpeg/lib" >> ${DPKG_INSTALL_LIST}