From 99e878e6f42c4af89178338d698cb1e2f292ecd2 Mon Sep 17 00:00:00 2001 From: Yuze Jiang Date: Sun, 2 Jun 2024 13:00:24 +0900 Subject: [PATCH] Patch mpv for the version string --- mpv-iina.rb | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/mpv-iina.rb b/mpv-iina.rb index e4594c2..369a40c 100644 --- a/mpv-iina.rb +++ b/mpv-iina.rb @@ -36,6 +36,8 @@ class MpvIina < Formula depends_on "yt-dlp" stable do + patch :DATA + patch do url "https://raw.githubusercontent.com/iina/homebrew-mpv-iina/master/other/13348.patch" sha256 "f73b5e68ea31d69beb3163b2a19801e9aeb730196483f002622a8184df53eaa9" @@ -98,3 +100,38 @@ def install end end +__END__ +diff --git a/version.sh b/version.sh +index 2cfc384b5c..6a2c049bfe 100755 +--- a/version.sh ++++ b/version.sh +@@ -34,7 +34,7 @@ fi + # or from "git describe" output + git_revision=$(cat snapshot_version 2> /dev/null) + test "$git_revision" || test ! -e .git || git_revision="$(git describe \ +- --match "v[0-9]*" --always --tags --dirty | sed 's/^v//')" ++ --match "v[0-9]*" --always --tags | sed 's/^v//')" + version="$git_revision" + + # other tarballs extract the version number from the VERSION file +diff --git a/waftools/detections/compiler_swift.py b/waftools/detections/compiler_swift.py +index cf55149291..9efef4c4d9 100644 +--- a/waftools/detections/compiler_swift.py ++++ b/waftools/detections/compiler_swift.py +@@ -24,13 +24,13 @@ def __add_swift_flags(ctx): + def __add_swift_library_linking_flags(ctx, swift_library): + ctx.env.append_value('LINKFLAGS', [ + '-L%s' % swift_library, +- '-Xlinker', '-force_load_swift_libs', '-lc++', ++ '-lc++', + ]) + + def __find_swift_library(ctx): + swift_library_paths = [ +- 'Toolchains/XcodeDefault.xctoolchain/usr/lib/swift_static/macosx', +- 'usr/lib/swift_static/macosx' ++ 'Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx', ++ 'usr/lib/swift/macosx' + ] + dev_path = __run(['xcode-select', '-p'])[1:] +