Commit graph

101 commits

Author SHA1 Message Date
Ivan Kozik 46cbb8453a mpv, ffmpeg: use addOpenGLRunpath to fix CUDA-accelerated playback
This fixes #67780.

Currently, using `mpv --hwdec=nvdec --msg-level=vd=debug` on NVIDIA results in:

```
[vd] Opening decoder hevc
[vd] Looking at hwdec hevc-nvdec...
Cannot load libcuda.so.1
[vd] Could not create device.
[vd] No hardware decoding available for this codec.
```

With just mpv patched, ffmpeg cannot load libnvcuvid.so.1:

```
[vd] Opening decoder hevc
[vd] Looking at hwdec hevc-nvdec...
[vd] Trying hardware decoding via hevc-nvdec.
[vd] Selected codec: hevc (HEVC (High Efficiency Video Coding))
[vd] Pixel formats supported by decoder: vaapi_vld cuda yuv420p10le
[vd] Codec profile: Main 10 (0x2)
[vd] Requesting pixfmt 'cuda' from decoder.
[ffmpeg/video] hevc: Cannot load libnvcuvid.so.1
[ffmpeg/video] hevc: Failed loading nvcuvid.
[ffmpeg/video] hevc: Failed setup for format cuda: hwaccel initialisation returned error.
```

With both mpv and ffmpeg patched, it works:

```
[vd] Opening decoder hevc
[vd] Looking at hwdec hevc-nvdec...
[vd] Trying hardware decoding via hevc-nvdec.
[vd] Selected codec: hevc (HEVC (High Efficiency Video Coding))
[vd] Pixel formats supported by decoder: vaapi_vld cuda yuv420p10le
[vd] Codec profile: Main 10 (0x2)
[vd] Requesting pixfmt 'cuda' from decoder.
Using hardware decoding (nvdec).
[vd] Decoder format: 3840x2160 cuda[p010] bt.2020-ncl/bt.2020/pq/limited/auto SP=10.000000 CL=unknown (auto 0.000000/0.000000/0.000000)
```
2019-09-06 23:18:26 +00:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Robin Gloster 4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Mario Rodas 20eda8246c
mpv: fix darwin build 2019-05-06 23:57:10 -05:00
Silvan Mosberger a8e19088da
Merge pull request #54392 from ivan/nv-codec
ffmpeg, mpv: enable hardware-accelerated decoding with CUDA
2019-03-29 19:57:13 +01:00
Ivan Kozik de8f760fbd ffmpeg, mpv: enable hardware-accelerated decoding with CUDA
NVIDIA users can now use `mpv --hwdec=nvdec` to play videos that the
software decoders cannot keep up with.
2019-02-11 00:32:43 +00:00
Matthieu Coudron aaeaa6d1c6 Add checkPhase for neovim (disabled by default) (#55266)
* neovim-unwrapped: now use lua environments

* mpv: use lua environments

* luaPackages.inspect: init at 3.1.1-0

* luaPackages.lgi: mark as a lua module

* luaPackages.vicious: mark as a lua module
2019-02-05 15:00:19 +00:00
Jan Malakhovski 763dff1e20 mpv: move defaults to package file 2019-02-03 15:33:13 +00:00
adisbladis 5cc392c5bb
mpv: Enable javascript support through mujs 2019-01-19 12:56:02 +00:00
adisbladis dfe2453ce5
mpv: Add vulkan support 2019-01-19 00:53:49 +00:00
Jan Tojnar a51a99c690
gobject-introspection: rename package
camelCase package name was a huge inconsistency in GNOME package set.
2018-12-02 12:42:29 +01:00
Vladyslav M 889c72032f mpv: 0.29.0 -> 0.29.1 (#47689) 2018-10-03 00:34:16 +02:00
geistesk 14837a8277 mpv: add cddaSupport-flag to play Audio CDs
Introduced `cddaSupport` for `mpv` which defaults to false. By enabling
it, `mpv` will be compiled with cdda support (`libcdio{,-paranoia}`) to
play audio CDs.
2018-09-04 18:46:31 +02:00
geistesk 7cdb44e793 mpv: resorted support options alphabetically 2018-09-04 18:44:01 +02:00
Johannes Frankenau 750dc39116 mpvScripts.mpris: 0.1 -> 0.2 2018-08-10 21:29:37 +02:00
Michael Hoang f8fb13e64c mpv: build and install macOS App Bundle 2018-08-04 13:17:19 +10:00
Michael Hoang 69ed31a57b mpv: Fix mpv 0.29.0 on macOS and disable OpenAL 2018-08-03 09:20:55 +10:00
d3rped 4afacff73d Added optional lcms2 support to mpv. 2018-07-30 21:01:48 +02:00
Vladyslav Mykhailichenko 21ab38976d mpv: 0.28.2 -> 0.29.0 2018-07-22 22:25:33 +03:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Johannes Frankenau 402ee4e9ea mpv: use wrapper for scripts and add mpris script 2018-07-19 09:50:32 +02:00
Michael Hoang 152f6087b3 mpv: add Cocoa support for macOS
Only enable X11 Support on Linux by default. Add CoreFoundation first in
the list of buildInputs to ensure that it is loaded before CF-osx
allowing it to provide <CoreFoundation/CFAttributedString.h>.
2018-07-16 03:58:15 +00:00
aszlig 7a19228215
mpv: Fix X11 support by adding libXrandr
This is a follow-up to 6b404b944a, which
fixed the build after SDL no longer leaks through X libraries.

However the commit didn't actually pass all the required dependencies to
mpv, because the configure phase of mpv still disabled X support:

  Checking for X11
  err: Package xrandr was not found in the pkg-config search path.
  Perhaps you should add the directory containing `xrandr.pc'
  to the PKG_CONFIG_PATH environment variable
  No package 'xrandr' found

So by adding libXrandr, we finally have support for X again.

Trivia: While I'm usually very pesky about line lengths this is one of
the very rare occasions where I didn't break the lines after 79
characters because it would have messed up the overall style of the
file.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @AndersonTorres, @fuuzetsu, @fpletz, @orivej
2018-07-05 00:44:26 +02:00
Orivej Desh 6b404b944a mpv: fix build with wayland after #41902 2018-07-03 12:32:41 +00:00
xeji 1463480edb
Merge pull request #40289 from yegortimoshenko/mpv-bump
mpv: 0.27.2 -> 0.28.2
2018-05-10 18:21:38 +02:00
Yegor Timoshenko d691c8170a
mpv: 0.27.2 -> 0.28.2 2018-05-10 17:45:05 +03:00
Ryan Mulligan 038a0c9a60 treewide: http to https 2018-04-30 21:39:20 -07:00
Svein Ove Aas c9ea1ff523 mpv: Add openal support 2018-03-26 13:24:17 +01:00
Bart Brouns 893b69a54c mpv: 0.27.0 -> 0.27.2 2018-03-15 13:05:29 +01:00
Vladimír Čunát 565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
rnhmjoj 0d9224bdc5 mpv: use mkvtoolnix-cli 2018-03-01 14:38:59 +01:00
rnhmjoj ab59f0df8d
mpv: add luasocket path 2018-02-27 17:29:05 +01:00
rnhmjoj 41c1a62113
mpv: clean up options 2018-02-27 17:27:46 +01:00
Alexander V. Nikolaev 0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Profpatsch 53e790e7a8 maintainers: capitalize the Profpatsch attribute (vanity)
Since I’m already at it, this has been bothering me for a while.
2018-02-12 07:24:50 +01:00
Andreas Rammhold 95f4d6ba1c
mpv: fix CVE-2018-6460
Upstream has fixed this in a series of commits ontop of 0.28.0. Debian
has backported the fixes to 0.27.0.

Upstream issue: https://github.com/mpv-player/mpv/issues/5456
Debian bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888654#8
2018-02-07 10:01:16 +01:00
rnhmjoj e5aae0f2d6
mpv: fix PYTHONPATH 2018-01-13 03:30:25 +01:00
Orivej Desh 745be0cb61 mpv: fix build with libva 2 2017-12-18 16:43:24 +00:00
Heitham Omar dc60c1e3d0 mpv: enable dvb on Linux 2017-10-15 21:26:00 +01:00
dywedir 15002fbf7e mpv: 0.26.0 -> 0.27.0 2017-09-13 12:23:04 +02:00
Profpatsch b35972b3fa mpvScripts.convert: fix for mpv >0.26.0
See https://gist.github.com/Zehkul/25ea7ae77b30af959be0#gistcomment-2189556
2017-08-31 01:23:11 +02:00
Franz Pletz 07106fb508
mpv: bump waf version to 1.9.8
The bootstrap.py file from mpv downloads this exact version.
2017-08-04 04:09:19 +02:00
Silvan Mosberger f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Johannes Frankenau 7e62e8d036 mpv: 0.25.0 -> 0.26.0
Add option for archive support and fix dvdread and dvdnav support.
2017-07-23 11:00:00 +02:00
Cray Elliott c49a454210 mpv, xpra: depend on ffmpeg instead of ffmpeg_3_2
effectively updates them to depend on ffmpeg_3_3
2017-04-30 16:52:49 -07:00
Peter Hoeg 229e3383f4 mpv: 0.24.0 -> 0.25.0 2017-04-24 15:42:55 +08:00
Franz Pletz 78d3a11384
mpv: 0.23.0 -> 0.24.0 2017-02-26 10:26:12 +01:00
Daiderd Jordan bbc9b1ab2c
mpv: disable drmSupport on darwin 2017-02-25 21:34:54 +01:00
Stefan Götz 9280174493 mpv: 0.22.0 -> 0.23.0 2017-01-10 22:42:29 +01:00