Merge branch 'master' into spiced

Author: udmada

.env

@@ -6,7 +6,8 @@ STOWDIR="${PREFIX}/stow"
 PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
 CMAKE_GENERATOR="Ninja"
 MACOSX_DEPLOYMENT_TARGET="$(sw_vers -productVersion 2>/dev/null || echo "15.4")"
-CMAKE_POLICY_VERSION_MINIMUM="4.0"
+
+CMAKE_POLICY_VERSION_MINIMUM="4.1"
 MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-26.0}"
 CFLAGS="-mcpu=native"
 CXXFLAGS="${CFLAGS}"

README.md

@@ -72,15 +72,6 @@ mkdir /opt/local/stow
 
 :arrow_right: Add `/opt/local/bin` (or `$PREFIX/bin`) to your `$PATH`.
 
-### Recommended settings
-
-```cfg
-# ~/.config/mpv/mpv.conf
-vo=gpu-next
-hwdec=videotoolbox
-macos-render-timer=feedback
-```
-
 ### Environment variables
 
 - `MVK_CONFIG_LOG_LEVEL=<value>` - sets MoltenVK log level:

build-ffmpeg

@@ -1,7 +1,7 @@
 #!/bin/bash -e
 #
 # FFmpeg
-# https://git.ffmpeg.org/ffmpeg.git
+# https://code.ffmpeg.org/FFmpeg/FFmpeg.git
 #
 cd "$(dirname "$0")"
 set -a; . .env; set +a

build-moltenvk

@@ -18,9 +18,9 @@ echo "*** $0: started"
 cd "${srcdir}"
 
 sed -i '' 's/xcodebuild "$@"/'"${xcodebuild}"' "$@"/g' fetchDependencies
-sed -i '' 's/XCODEBUILD := .*/XCODEBUILD := '"${xcodebuild}"'/' Makefile
+sed -Ei '' 's/(XCODEBUILD := ).*/\1'"${xcodebuild}"'/' Makefile
 ./fetchDependencies --macos --v-headers-root "${PREFIX}"
-make macos MVK_CONFIG_LOG_LEVEL=1 "$@"
+make macos MVK_CONFIG_LOG_LEVEL=1 MVK_USE_METAL_PRIVATE_API=1 "$@"
 
 sed -i '' 's;\./;../../../lib/;' "${builddir}"/MoltenVK_icd.json
 echo

build-shaderc

@@ -18,7 +18,7 @@ rm -rf "${builddir}"
 
 cd "${srcdir}"
 sed -i '' 's/${SHADERC_SKIP_INSTALL}/ON/g' third_party/CMakeLists.txt
-sed -i '' '/^.*GLSLANG_ENABLE_INSTALL.*$/d' third_party/CMakeLists.txt
+sed -Ei '' 's/(GLSLANG_ENABLE_INSTALL ).*\)/\1OFF)/g' third_party/CMakeLists.txt
 ./utils/git-sync-deps
 cd -
 

build-svt-av1

@@ -31,6 +31,7 @@ cmake --build "${builddir}"
 rm -rf "${pkgdir}"
 
 cmake --install "${builddir}"
+rm -rf "${pkgdir}"/lib/cmake
 stow -Rd "${STOWDIR}" "${pkgname}"
 
 rm -rf "${builddir}"

build-whisper

@@ -30,7 +30,6 @@ cmake -B "${builddir}" -S "${srcdir}" \
   -DGGML_NATIVE="${GGML_NATIVE}" \
   -DGGML_LTO=ON \
   -DGGML_METAL=ON \
-  -DGGML_METAL_USE_BF16=ON \
   -DGGML_METAL_NDEBUG=ON \
   -DGGML_CCACHE=OFF \
   -DGGML_OPENMP=OFF \

fetch

@@ -107,7 +107,6 @@ fetch_libplacebo() {
   local url="https://code.videolan.org/videolan/libplacebo.git"
   rm -rf src/libplacebo
   git -C src clone --depth 1 --recurse-submodules=3rdparty/{fast_float,jinja,markupsafe} "${url}"
-  git -C src/libplacebo apply --apply --stat "$(realpath patches/libplacebo-disable-host-copy.diff)"
 }
 
 fetch_libpng() {