diff --git a/compile.sh b/compile.sh index 1e5c3dd..b662660 100755 --- a/compile.sh +++ b/compile.sh @@ -1,8 +1,8 @@ #!/bin/sh -e LIBRARIES="libuchardet libfribidi libfreetype libharfbuzz libass ffmpeg libmpv libssl" -IOS_SDK_VERSION="15.5" -TVOS_SDK_VERSION="15.4" +IOS_SDK_VERSION=$(xcrun -sdk iphoneos --show-sdk-version) +TVOS_SDK_VERSION=$(xcrun -sdk appletvos --show-sdk-version) DEPLOYMENT_TARGET="11.0" export PKG_CONFIG_PATH diff --git a/download.sh b/download.sh index c25a702..dbaae6b 100755 --- a/download.sh +++ b/download.sh @@ -1,8 +1,8 @@ #!/bin/sh -e # Change to preferred versions -MPV_VERSION="0.34.1" -FFMPEG_VERSION="5.0" +MPV_VERSION="0.36.0" +FFMPEG_VERSION="6.0" LIBASS_VERSION="0.14.0" FREETYPE_VERSION="2.10.0" HARFBUZZ_VERSION="2.9.0" diff --git a/patch.diff b/patch.diff index 51d4207..a740043 100644 --- a/patch.diff +++ b/patch.diff @@ -1,20 +1,20 @@ ---- src/mpv-0.34.1/bootstrap.py -+++ src/mpv-0.34.1/bootstrap.py +--- src/mpv-0.36.0/bootstrap.py ++++ src/mpv-0.36.0/bootstrap.py @@ -5,10 +5,10 @@ import os, sys, stat, hashlib, subprocess from urllib.request import urlopen, URLError - --WAFRELEASE = "waf-2.0.20" + +-WAFRELEASE = "waf-2.0.25" +WAFRELEASE = "waf-2.0.9" WAFURLS = ["https://waf.io/" + WAFRELEASE, - "http://www.freehackers.org/~tnagy/release/" + WAFRELEASE] --SHA256HASH = "bf971e98edc2414968a262c6aa6b88541a26c3cd248689c89f4c57370955ee7f" + "https://www.freehackers.org/~tnagy/release/" + WAFRELEASE] +-SHA256HASH = "21199cd220ccf60434133e1fd2ab8c8e5217c3799199c82722543970dc8e38d5" +SHA256HASH = "2a8e0816f023995e557f79ea8940d322bec18f286917c8f9a6fa2dc3875dfa48" - + if os.path.exists("waf"): wafver = subprocess.check_output([sys.executable, './waf', '--version']).decode() ---- src/mpv-0.34.1/wscript -+++ src/mpv-0.34.1/wscript +--- src/mpv-0.36.0/wscript ++++ src/mpv-0.36.0/wscript @@ -245,6 +245,12 @@ iconv support use --disable-iconv.", 'desc': 'w32/dos paths', 'deps': 'os-win32 || os-cygwin', @@ -28,8 +28,8 @@ }, { 'name': 'glob-posix', 'desc': 'glob() POSIX support', ---- src/mpv-0.34.1/wscript_build.py -+++ src/mpv-0.34.1/wscript_build.py +--- src/mpv-0.36.0/wscript_build.py ++++ src/mpv-0.36.0/wscript_build.py @@ -209,7 +209,7 @@ def build(ctx): ]) @@ -39,8 +39,8 @@ ( "osdep/subprocess-win.c", "win32-desktop" ), ( "osdep/subprocess-dummy.c" ), ]) ---- src/ffmpeg-5.0/libavfilter/metal/utils.m -+++ src/ffmpeg-5.0/libavfilter/metal/utils.m +--- src/ffmpeg-6.0/libavfilter/metal/utils.m ++++ src/ffmpeg-6.0/libavfilter/metal/utils.m @@ -31,7 +31,7 @@ void ff_metal_compute_encoder_dispatch(id device, BOOL fallback = YES; // MAC_OS_X_VERSION_10_15 is only defined on SDKs new enough to include its functionality (including iOS, tvOS, etc) diff --git a/scripts/ffmpeg-build b/scripts/ffmpeg-build index 383caba..c6476b5 100755 --- a/scripts/ffmpeg-build +++ b/scripts/ffmpeg-build @@ -20,8 +20,12 @@ if [[ "$ARCH" = "x86_64" ]]; then fi if [[ ! `which gas-preprocessor.pl` ]]; then - curl -L https://github.com/libav/gas-preprocessor/raw/master/gas-preprocessor.pl -o /usr/local/bin/gas-preprocessor.pl \ - && chmod +x /usr/local/bin/gas-preprocessor.pl + PREFIX="/usr/local" + if [[ $(sysctl -n machdep.cpu.brand_string) =~ "Apple" ]]; then + PREFIX="/opt/homebrew" + fi + curl -L https://github.com/libav/gas-preprocessor/raw/master/gas-preprocessor.pl -o $PREFIX/bin/gas-preprocessor.pl \ + && chmod +x $PREFIX/bin/gas-preprocessor.pl fi if [[ "$ARCH" = "arm64" ]]; then