3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

123 commits

Author SHA1 Message Date
Matías Lang a6dfaad922 mpv: fix lua path
mpv uses lua without directly executing the "lua" binary, so prefixing
$PATH wasn't enough. Without this change, lua scripts were unable to
import luasocket.
2020-05-19 00:50:24 -03:00
Doron Behar b0ac6a009b mpvScripts.mpris: use patch sent upstream for make DESTDIR=
Make sure mpris.so is stripped.
mpv-with-scripts: use a standard location for scripts in $out.
mpvScripts.convert: install to the new location of mpv scripts.
Replaced gobject-introspection dependency with glib.
2020-05-06 10:30:20 +03:00
Doron Behar f388ca8ac8 mpvScripts.mpris: set platforms to Linux 2020-05-04 10:12:53 +03:00
Doron Behar a60552ad94 mpvScripts.mpris: 0.4 -> 0.5 2020-05-03 21:18:46 +03:00
adisbladis 44c30f46f1
mpv: Enable archive support by default 2020-04-14 09:06:09 +01:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Jörg Thalheim b114def89c
Merge pull request #79751 from doronbehar/update-mpv-mpris
mpvScripts.mpris: 0.3 -> 0.4
2020-03-31 11:53:53 +01:00
Mario Rodas 9fa6557a71
mpv: fix cocoa backend 2020-03-26 04:20:00 -05:00
Doron Behar fe560588a5 mpvScripts.mpris: 0.3 -> 0.4
Quote URL as well.
2020-02-10 19:55:23 +02:00
Daiderd Jordan 408f36923d
mpv: call with frameworks
Referencing darwin.* directly makes overriding dependencies very
awkward.
2020-02-07 22:09:23 +01:00
Daiderd Jordan 3987ea9a9d
mpv: add flag for swift on darwin
While we currently don't have a pure swift build on macOS it's possible
to build mpv using the swift compiler from CLT. eg.

    self: super:
    let
      CommandLineTools = "/Library/Developer/CommandLineTools";
    in
    {
      swift = super.stdenv.mkDerivation {
        name = "swift-CommandLineTools-0.0.0";
        phases = [ "installPhase" "fixupPhase" ];

        propagatedBuildInputs = [ self.darwin.DarwinTools ];

        installPhase = ''
            mkdir -p $out/bin $out/lib
            ln -s ${CommandLineTools}/usr/bin/swift $out/bin
            ln -s ${CommandLineTools}/usr/lib/swift $out/lib
            ln -s ${CommandLineTools}/SDKs $out
        '';

        setupHook = builtins.toFile "hook" ''
            addCommandLineTools() {
                echo >&2
                echo "WARNING: this is impure and unreliable, make sure the CommandLineTools are installed!" >&2
                echo "  $ xcode-select --install" >&2
                echo >&2
                [ -d ${CommandLineTools} ]
                export NIX_LDFLAGS+=" -L@out@/lib/swift/macosx"
                export SWIFT=swift
                export SWIFT_LIB_DYNAMIC=@out@/lib/swift/macosx
                export MACOS_SDK_VERSION=$(sw_vers -productVersion | awk -F. '{print $1 "." $2}')
                export MACOS_SDK=@out@/SDKs/MacOSX$MACOS_SDK_VERSION.sdk
            }

            prePhases+=" addCommandLineTools"
        '';

        __impureHostDeps = [ CommandLineTools ];
      };

      mpv = super.mpv.override { swiftSupport = true; };
    }
2020-02-06 14:15:35 +01:00
Benjamin Hipple 542d758956 mpv: use waf from distribution and wafHook helper
This cleans up our dependency footprint by ensuring a consistent version, and
also avoids duplicating the logic for how to build a waf package by deferring to
the `wafHook` helper for the `configurePhase`, `buildPhase`, and `installPhase`.
2020-02-02 14:11:49 -05:00
Maximilian Bosch 499af6321f
mpv: 0.31.0 -> 0.32.0
https://github.com/mpv-player/mpv/releases/tag/v0.32.0
2020-01-26 22:32:13 +01:00
Ivan Kozik 76ab11518d treewide: Remove myself from maintainers on some packages (#78027) 2020-01-19 12:18:34 -05:00
Doron Behar b763746404 mpvScripts.mpris: 0.2 -> 0.3 2019-12-31 15:08:05 +02:00
Tadeo Kondrak 85783b9eac
mpv: 0.30.0 -> 0.31.0 2019-12-28 09:10:30 -07:00
Maximilian Bosch 9842c4b107
treewide: update which packages I'm currently maintaining
Idea shamelessly stolen from 4e60b0efae.

I realized that I don't really know anymore where I'm listed as maintainer and what
I'm actually (co)-maintaining which means that I can't proactively take
care of packages I officially maintain.

As I don't have the time, energy and motivation to take care of stuff I
was interested in 1 or 2 years ago (or packaged for someone else in the
past), I decided that I make this explicit by removing myself from several
packages and adding myself in some other stuff I'm now interested in.

I've seen it several times now that people remove themselves from a
package without removing the package if it's unmaintained after that
which is why I figured that it's fine in my case as the affected pkgs
are rather low-prio and were pretty easy to maintain.
2019-12-26 15:27:47 +01:00
Mateusz Kowalczyk 1451a52a38 Remove myself (fuuzetsu) from maintainer lists
I haven't been doing any maintenance for a long time now and not only
do I get notified, it also creates a fake impression that all these
packages had at least one maintainer when in practice they had none.
2019-12-05 16:29:48 +09:00
adisbladis c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
Mario Rodas 3510e233dc
mpv: disable samba support on darwin 2019-11-13 22:57:29 -05:00
Jan Malakhovski 4d680f3f3d mpv: enable openal support by default
See the previous commit.
2019-10-29 17:38:07 +01:00
Tadeo Kondrak b2256035a5
mpv: 0.29.1 -> 0.30.0 2019-10-25 09:54:46 -06:00
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