mirror of
https://github.com/jellyfin/jellyfin-ffmpeg.git
synced 2026-09-03 05:09:58 +03:00
ci: prefer macOS native vDSP instead of fftw for better performance
This commit is contained in:
+1
-1
@@ -53,7 +53,7 @@ FF_HOST_CFLAGS="$(xargs <<< "$FF_HOST_CFLAGS")"
|
||||
FF_HOST_LDFLAGS="$(xargs <<< "$FF_HOST_LDFLAGS")"
|
||||
FFBUILD_TARGET_FLAGS="$(xargs <<< "$FFBUILD_TARGET_FLAGS")"
|
||||
|
||||
mkdir build
|
||||
mkdir -p build
|
||||
for macbase in images/macos/*.sh; do
|
||||
cd "$BUILDER_ROOT"/build
|
||||
source "$BUILDER_ROOT"/"$macbase"
|
||||
|
||||
@@ -6,6 +6,8 @@ SCRIPT_COMMIT="cab901fe465324cb46bd4953e18ddc610ade29b9"
|
||||
ffbuild_enabled() {
|
||||
# Dependency of GPL-Only librubberband
|
||||
[[ $VARIANT == lgpl* ]] && return -1
|
||||
# Prefer macOS native vDSP
|
||||
[[ $TARGET == mac* ]] && return -1
|
||||
return 0
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ ffbuild_dockerbuild() {
|
||||
mkdir build && cd build
|
||||
|
||||
if [[ $TARGET == mac* ]]; then
|
||||
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF -DFFT_LIB=fftw3f ..
|
||||
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF -DFFT_LIB=vdsp ..
|
||||
else
|
||||
cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF -DFFT_LIB=fftw3f ..
|
||||
fi
|
||||
@@ -22,7 +22,12 @@ ffbuild_dockerbuild() {
|
||||
make -j$(nproc)
|
||||
make install
|
||||
|
||||
echo "Libs.private: -lfftw3f -lstdc++" >> "$FFBUILD_PREFIX"/lib/pkgconfig/libchromaprint.pc
|
||||
if [[ $TARGET != mac* ]]; then
|
||||
echo "Libs.private: -lfftw3f -lstdc++" >> "$FFBUILD_PREFIX"/lib/pkgconfig/libchromaprint.pc
|
||||
else
|
||||
echo "Libs.private: -framework Accelerate -lstdc++" >> "$FFBUILD_PREFIX"/lib/pkgconfig/libchromaprint.pc
|
||||
fi
|
||||
|
||||
echo "Cflags.private: -DCHROMAPRINT_NODLL" >> "$FFBUILD_PREFIX"/lib/pkgconfig/libchromaprint.pc
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user