Commit Graph

210 Commits

Author SHA1 Message Date
Emily
8d9ac2131d mpv: restore non‐obsolete Swift library path hack
Turns out that it’s not obsolete; it avoids a runtime dependency
on the Swift wrapper because of some weird stuff we do. This should
probably be fixed in the Swift packaging, but let’s fix the closure
size again for now and add a comment for that.

This reverts commit 84d64ade98.

Fixes: #356861
2024-11-18 09:40:41 +00:00
Emily
12ce8fdbc6 mpv: use wrapped bundle executable on Darwin
On macOS, many things won’t work properly unless mpv is executed from
the app bundle, such as spatial audio with `--ao=avfoundation`. This
ensures that those features work reliably and also avoids duplicating
the entire `mpv` binary.
2024-10-23 11:09:16 +01:00
Emily
bd2b925756 mpv: remove redundant Meson flag
Since we’re doing auto‐detection anyway, this is unnecessary.
2024-10-23 11:09:16 +01:00
Emily
8db2730152 mpv: enable {pipewire,pulse,wayland,x11}Support on non‐Darwin
No reason for FreeBSD to miss out on the fun.
2024-10-23 10:59:50 +01:00
Emily
41bdd31772 mpv: remove xvSupport flag
This prints out a big warning about how you shouldn’t be using
it. Upstream CI builds and Arch don’t enable it. There are other
backends of questionable worth that we don’t expose options for,
so let’s ditch this one.
2024-10-23 10:59:50 +01:00
Emily
7691ab6b73 mpv: disable sdl2Support by default
Upstream’s Meson defaults, upstream’s CI binaries, and Arch
don’t enable this.
2024-10-23 10:59:50 +01:00
Emily
61f229078d mpv: enable dvdnavSupport on non‐Linux
It builds fine on macOS.
2024-10-23 10:59:50 +01:00
Emily
5c59345ef6 mpv: disable vaapiSupport on Darwin 2024-10-23 10:59:50 +01:00
Emily
93222c08a5 mpv: remove unused libGLU dependency 2024-10-23 10:59:50 +01:00
Emily
0ef8ba26e1 mpv: remove unused libXxf86vm dependency 2024-10-23 10:59:50 +01:00
Emily
fefef477f9 mpv: remove xineramaSupport flag
Removed upstream:
<200992f90c>.
2024-10-23 10:59:50 +01:00
Emily
01f798521f mpv: remove screenSaverSupport flag
This is required as part of X11 support since the Meson transition.
2024-10-23 10:59:50 +01:00
Emily
45d592fbbe mpv: remove libpngSupport flag
Does nothing, removed upstream in 2012(!):
<6a26b4a665>.
2024-10-23 10:59:50 +01:00
Emily
cc7d201a92 mpv: remove theoraSupport flag
Does nothing, removed upstream in 2012(!):
<1fde09db6f>.
2024-10-23 10:59:50 +01:00
Emily
0e11e05d5e mpv: remove speexSupport flag
Does nothing, removed upstream in 2012(!):
<1fde09db6f>.
2024-10-23 10:59:50 +01:00
Emily
84d64ade98 mpv: remove obsolete Swift library path hack
This is now detected correctly as part of the SDK, as it should be.
2024-10-23 10:59:50 +01:00
Emily
2226998074 mpv: enable Vulkan on Darwin
Using `--vo=gpu` or `--vo=gpu-next` with MoltenVK is now supported
and has replaced the previous `cocoa-cb` as the default.
2024-10-23 10:56:04 +01:00
Emily
c7a1d6097d mpv: remove swiftSupport flag
mpv currently doesn’t even build successfully on macOS without Swift,
and there’s no use of Swift outside of the platform.
2024-10-23 10:56:03 +01:00
Emily
f2280510e3 mpv: remove legacy Darwin SDK pattern detritus
Oh, this is satisfying.

Swift already propagates its corresponding SDK, so we don’t need
the patch.
2024-10-23 09:58:27 +01:00
Emily
472f5217cc mpv: fix typo 2024-10-23 09:58:27 +01:00
Winter
c5b0b6d29c mpv: fix build on darwin 2024-09-30 17:48:38 -04:00
Franz Pletz
5606fe89b8
mpv: 0.38.0 -> 0.39.0 2024-09-25 17:13:32 +02:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Martin Weinelt
e7b1ee45cf
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
- pkgs/tools/misc/watchlog/default.nix
2024-07-06 01:52:35 +02:00
Tadeo Kondrak
7239208ca6 treewide: remove maintainer tadeokondrak 2024-07-04 15:04:04 -06:00
Sefa Eyeoglu
416ba8804b
treewide: use addDriverRunpath
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2024-06-30 15:01:01 -04:00
XYenon
f1f5d46e64 mpv-unwrapped: format with nixfmt rfc style 2024-06-13 11:39:36 +08:00
XYenon
51d66a42c5 mpv-unwrapped: fix build on x86_64-darwin 2024-06-13 11:38:52 +08:00
1sixth
54072d588d
mpv: allow ofborg to execute the test
Co-authored-by: Mario Rodas <marsam@users.noreply.github.com>
2024-06-10 09:37:33 +08:00
Anderson Torres
6ee4b2de1a mpv: fix build on Darwin (patch by marsam) 2024-06-08 13:33:40 -03:00
Anderson Torres
c14b678b5a mpv: nixfmt 2024-06-08 01:24:01 -03:00
Anderson Torres
0a3717ab41 mpv: break it on Darwin 2024-06-08 01:24:00 -03:00
Anderson Torres
411126e125 mpvScripts: move it under mpv 2024-06-08 01:24:00 -03:00
Anderson Torres
cc419c0148 mpv: move wrapper under mpv-unwrapped.passthru
And refactor to fit.

wrapper
2024-06-08 01:24:00 -03:00
Anderson Torres
bb5d71826c mpv: 0.37.0 -> 0.38.0 2024-06-08 01:24:00 -03:00
Sigmanificient
0058552891 pkgs/applications: remove uneeded fetchpatch arguments 2024-05-21 03:12:20 +02:00
K900
06885ad43c mpv: don't advertise smb protocol support that we don't have 2024-02-19 22:13:23 +03:00
Anderson Torres
390daad68a mpv: remove env.NIX_LDFLAGS setting 2024-02-09 21:29:47 -03:00
Anderson Torres
a88842e107 mpv: split dev output via patching
Co-authored-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
2024-02-09 21:29:01 -03:00
Anderson Torres
7e96adf643 mpv: use rcodesign instead of darwin.codesign
Co-authored-by: Randy Eckenrode <randy@largeandhighquality.com>
2024-02-09 21:28:46 -03:00
David Knaack
ce6ca5eb06 mpv: fix app-bundling 2024-02-09 21:28:46 -03:00
Anderson Torres
3d1ef6d39a mpv: extra dependencies for Darwin
Namely, libplacebo (since it is now unconditional) and VideoToolbox.

Co-authored-by: Franz Pletz <fpletz@fnordicwalking.de>
Co-authored-by: David Knaack <davidkna@users.noreply.github.com>
2024-02-09 21:28:46 -03:00
Anderson Torres
af97e98efd mpv: 0.36.0 -> 0.37.0
And some refactors:
- Remove dev output (cycle detected in build of <mpv> in the references of
  output 'dev' from output 'out')
- Env vars inside env
- Remove nested with
2024-02-09 21:28:45 -03:00
Jeff Huffman
435076cc1c
mpv: use correct nv-codec-headers version
Otherwise, mpv falls back to nvdec-copy, using significantly more cpu.
2023-12-10 05:54:00 -05:00
Colin
90cd52a559 mpv-unwrapped: fix shebangs for cross-compiled builds
previously umpv had the build python and mpv_identify.sh had the build
bash, even though both of these are intended to run on the host.
2023-11-27 08:28:15 -03:00
nicoo
620d5c14da mpv: Set meta.mainProgram 2023-11-12 01:13:29 +00:00
David Stritzl
acd80bbf00 mpv: sign darwin bundle executable
This fixes the application exiting immediately after launch via application bundle on macOS 14 (#261072).
2023-11-10 11:03:01 -03:00
1sixth
214da37b5c
mpv: unpin ffmpeg (#265069) 2023-11-03 00:30:37 +01:00
Mario Rodas
ac4fd1a109 Revert "Fix mujs dylib on Darwin"
mujs already fixes its dylib.

This reverts commit a1abee0758.
2023-09-11 15:53:54 +00:00
John Hamelink
a1abee0758
Fix mujs dylib on Darwin 2023-09-09 15:09:26 +01:00