Skip to content

Commit

Permalink
Patch mpv for the version string
Browse files Browse the repository at this point in the history
  • Loading branch information
uiryuu committed Jun 2, 2024
1 parent 4ab4051 commit 99e878e
Showing 1 changed file with 37 additions and 0 deletions.
37 changes: 37 additions & 0 deletions mpv-iina.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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:]

0 comments on commit 99e878e

Please sign in to comment.