Skip to content

Commit

Permalink
Merge pull request NixOS#304349 from atorres1985-contrib/mpv
Browse files Browse the repository at this point in the history
mpv: 0.37.0 -> 0.38.0
  • Loading branch information
marsam authored Jun 8, 2024
2 parents 16cb1f3 + 6ee4b2d commit c95c1a5
Show file tree
Hide file tree
Showing 6 changed files with 345 additions and 239 deletions.
29 changes: 29 additions & 0 deletions pkgs/applications/video/mpv/0001-fix-darwin-build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
--- 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;
13 changes: 0 additions & 13 deletions pkgs/applications/video/mpv/darwin-sigtool-no-deep.patch

This file was deleted.

Loading

0 comments on commit c95c1a5

Please sign in to comment.