mpv: 0.38.0 -> 0.39.0 (#344452)

This commit is contained in:
Franz Pletz 2024-09-26 15:32:07 +02:00 committed by GitHub
commit 416309cca4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 39 deletions

View File

@ -1,29 +0,0 @@
--- a/osdep/mac/input_helper.swift
+++ b/osdep/mac/input_helper.swift
@@ -18,6 +18,14 @@
import Cocoa
import Carbon.HIToolbox
+extension NSCondition {
+ fileprivate func withLock<T>(_ body: () throws -> T) rethrows -> T {
+ self.lock()
+ defer { self.unlock() }
+ return try body()
+ }
+}
+
class InputHelper: NSObject {
var option: OptionHelper?
var lock = NSCondition()
--- a/audio/out/ao_avfoundation.m
+++ b/audio/out/ao_avfoundation.m
@@ -312,7 +312,8 @@
+ #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 120000
p->observer = [[AVObserver alloc] initWithAO:ao];
NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
[center addObserver:p->observer selector:@selector(handleRestartNotification:) name:AVSampleBufferAudioRendererOutputConfigurationDidChangeNotification object:p->renderer];
[center addObserver:p->observer selector:@selector(handleRestartNotification:) name:AVSampleBufferAudioRendererWasFlushedAutomaticallyNotification object:p->renderer];
-
+ #endif
return CONTROL_OK;

View File

@ -135,7 +135,7 @@ let
in
stdenv'.mkDerivation (finalAttrs: {
pname = "mpv";
version = "0.38.0";
version = "0.39.0";
outputs = [
"out"
@ -148,14 +148,9 @@ stdenv'.mkDerivation (finalAttrs: {
owner = "mpv-player";
repo = "mpv";
rev = "v${finalAttrs.version}";
hash = "sha256-dFajnCpGlNqUv33A8eFEn8kjtzIPkcBY5j0gNVlaiIY=";
hash = "sha256-BOGh+QBTO7hrHohh+RqjSF8eHQH8jVBPjG/k4eyFaaM=";
};
patches = [
# Fix build with Darwin SDK 11
./0001-fix-darwin-build.patch
];
postPatch = lib.concatStringsSep "\n" [
# Don't reference compile time dependencies or create a build outputs cycle
# between out and dev
@ -315,9 +310,6 @@ stdenv'.mkDerivation (finalAttrs: {
popd
pushd $out/share/applications
# patch out smb protocol reference, since our ffmpeg can't handle it
substituteInPlace mpv.desktop --replace-fail "smb," ""
sed -e '/Icon=/ ! s|mpv|umpv|g; s|^Exec=.*|Exec=umpv %U|' \
mpv.desktop > umpv.desktop
printf "NoDisplay=true\n" >> umpv.desktop