public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #104716 from Ma27/bump-mpv 

mpv: 0.32.0 -> 0.33.0
This commit is contained in:
Anderson Torres 2020-11-24 12:59:30 -03:00 committed by GitHub
parent 84fd68150b d1487097ef
commit f30a8774d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/video/mpv/default.nix
View File

@ -39,13 +39,8 @@
, libpngSupport ? true, libpng ? null , libpngSupport ? true, libpng ? null
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
, rubberbandSupport ? stdenv.isLinux, rubberband ? null , rubberbandSupport ? stdenv.isLinux, rubberband ? null
# NOTE: samba support should be removed on the next mpv release, see also:
# https://github.com/NixOS/nixpkgs/pull/89145#issuecomment-636424362
# Please remove this line on the next mpv release.
, sambaSupport ? false, samba ? null
, screenSaverSupport ? true, libXScrnSaver ? null , screenSaverSupport ? true, libXScrnSaver ? null
, sdl2Support ? true, SDL2 ? null , sdl2Support ? true, SDL2 ? null
, sndioSupport ? true, sndio ? null
, speexSupport ? true, speex ? null , speexSupport ? true, speex ? null
, swiftSupport ? false, swift ? null , swiftSupport ? false, swift ? null
, theoraSupport ? true, libtheora ? null , theoraSupport ? true, libtheora ? null
@ -80,9 +75,7 @@ assert openalSupport -> available openalSoft;
assert pulseSupport -> available libpulseaudio; assert pulseSupport -> available libpulseaudio;
assert rubberbandSupport -> available rubberband; assert rubberbandSupport -> available rubberband;
assert screenSaverSupport -> available libXScrnSaver; assert screenSaverSupport -> available libXScrnSaver;
assert sambaSupport -> available samba;
assert sdl2Support -> available SDL2; assert sdl2Support -> available SDL2;
assert sndioSupport -> available sndio;
assert speexSupport -> available speex; assert speexSupport -> available speex;
assert theoraSupport -> available libtheora; assert theoraSupport -> available libtheora;
assert vaapiSupport -> available libva; assert vaapiSupport -> available libva;
@ -100,13 +93,13 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "mpv"; pname = "mpv";
version = "0.32.0"; version = "0.33.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mpv-player"; owner = "mpv-player";
repo = "mpv"; repo = "mpv";
rev = "v${version}"; rev = "v${version}";
sha256 = "0kmy1q0hp87vq4rpv7py04x8bpg1wmlzaibavmkf713jqp6qy596"; sha256 = "sha256-3l32qQBpvWVjbLp5CZtO039oDQeH7C/cNAKtJxrzlRk=";
}; };
postPatch = '' postPatch = ''
@ -140,9 +133,7 @@ in stdenv.mkDerivation rec {
(enableFeature cddaSupport "cdda") (enableFeature cddaSupport "cdda")
(enableFeature dvdnavSupport "dvdnav") (enableFeature dvdnavSupport "dvdnav")
(enableFeature openalSupport "openal") (enableFeature openalSupport "openal")
(enableFeature sambaSupport "libsmbclient")
(enableFeature sdl2Support "sdl2") (enableFeature sdl2Support "sdl2")
(enableFeature sndioSupport "sndio")
(enableFeature vaapiSupport "vaapi") (enableFeature vaapiSupport "vaapi")
(enableFeature waylandSupport "wayland") (enableFeature waylandSupport "wayland")
(enableFeature stdenv.isLinux "dvbin") (enableFeature stdenv.isLinux "dvbin")
@ -168,10 +159,8 @@ in stdenv.mkDerivation rec {
++ optional openalSupport openalSoft ++ optional openalSupport openalSoft
++ optional pulseSupport libpulseaudio ++ optional pulseSupport libpulseaudio
++ optional rubberbandSupport rubberband ++ optional rubberbandSupport rubberband
++ optional sambaSupport samba
++ optional screenSaverSupport libXScrnSaver ++ optional screenSaverSupport libXScrnSaver
++ optional sdl2Support SDL2 ++ optional sdl2Support SDL2
++ optional sndioSupport sndio
++ optional speexSupport speex ++ optional speexSupport speex
++ optional theoraSupport libtheora ++ optional theoraSupport libtheora
++ optional vaapiSupport libva ++ optional vaapiSupport libva