Skip to content

Commit

Permalink
Disable macos features for mpv
Browse files Browse the repository at this point in the history
  • Loading branch information
uiryuu committed Jun 17, 2024
1 parent 94ea752 commit e2bca9b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 37 deletions.
40 changes: 4 additions & 36 deletions mpv-iina.rb
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ def install

-Dmanpage-build=disabled

-Dmacos-touchbar=disabled
-Dmacos-media-player=disabled
-Dmacos-cocoa-cb=disabled

--sysconfdir=#{pkgetc}
--datadir=#{pkgshare}
]
Expand All @@ -83,39 +87,3 @@ def install
system "pkg-config", "mpv"
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:]

2 changes: 1 addition & 1 deletion other/homebrew_arm.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ index 6be9069013..55ca7c6bf4 100644
super
send(compiler)

+ self["MACOSX_DEPLOYMENT_TARGET"] = "11.0"
+ self["MACOSX_DEPLOYMENT_TARGET"] = "12.0"
self["HOMEBREW_ENV"] = "super"
self["MAKEFLAGS"] ||= "-j#{determine_make_jobs}"
self["RUSTFLAGS"] = Hardware.rustflags_target_cpu

0 comments on commit e2bca9b

Please sign in to comment.