MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #5150 from AndersonTorres/mpv

Browse source 
MPV: update to 0.7.0
This commit is contained in:
Arseniy Seroka 2014-11-27 14:02:04 +03:00
commit 53d0b4c539
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@
# For screenshots # For screenshots
, libpngSupport ? true, libpng ? null , libpngSupport ? true, libpng ? null
# for Youtube support # for Youtube support
, quviSupport ? false, libquvi ? null , youtubeSupport ? false, youtubeDL ? null
, cacaSupport ? false, libcaca ? null , cacaSupport ? false, libcaca ? null
, vaapiSupport ? false, libva ? null , vaapiSupport ? false, libva ? null
}: }:
@ -41,7 +41,7 @@ assert jackaudioSupport -> jack2 != null;
assert pulseSupport -> pulseaudio != null; assert pulseSupport -> pulseaudio != null;
assert bs2bSupport -> libbs2b != null; assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null; assert libpngSupport -> libpng != null;
assert quviSupport -> libquvi != null; assert youtubeSupport -> youtubeDL != null;
assert cacaSupport -> libcaca != null; assert cacaSupport -> libcaca != null;
# Purity problem: Waf needed to be is downloaded by bootstrap.py # Purity problem: Waf needed to be is downloaded by bootstrap.py
@ -50,19 +50,19 @@ assert cacaSupport -> libcaca != null;
let let
waf = fetchurl { waf = fetchurl {
url = http://ftp.waf.io/pub/release/waf-1.7.16; url = http://ftp.waf.io/pub/release/waf-1.8.1;
sha256 = "b64dc26c882572415fd450b745006107965f3fe17b357e3eb43d6676c9635a61"; sha256 = "ec658116ba0b96629d91fde0b32321849e866e0819f1e835c4c2c7f7ffe1a21d";
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mpv-${version}"; name = "mpv-${version}";
version = "0.6.2"; version = "0.7.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"; url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
sha256 = "1s42i3vf8i86lx62kw00vvimjizvp8zpxdq53mqhdz1p5im2ylr0"; sha256 = "0rz8dp44yag442gamaa2vdmf69h25gqh2bgybx89prkfh8n4hy8x";
}; };
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
++ optional speexSupport speex ++ optional speexSupport speex
++ optional bs2bSupport libbs2b ++ optional bs2bSupport libbs2b
++ optional libpngSupport libpng ++ optional libpngSupport libpng
++ optional quviSupport libquvi ++ optional youtubeSupport youtubeDL
++ optional sdl2Support SDL2 ++ optional sdl2Support SDL2
++ optional cacaSupport libcaca ++ optional cacaSupport libcaca
++ optional vaapiSupport libva ++ optional vaapiSupport libva
@ -126,6 +126,5 @@ stdenv.mkDerivation rec {
} }
# TODO: Wayland support # TODO: Wayland support
# TODO: investigate libquvi problems (related to Youtube support)
# TODO: investigate caca support # TODO: investigate caca support
# TODO: investigate lua5_sockets bug # TODO: investigate lua5_sockets bug

2
pkgs/top-level/all-packages.nix
View file

@ -10228,7 +10228,7 @@ let
lua = lua5_1; lua = lua5_1;
lua5_sockets = lua5_1_sockets; lua5_sockets = lua5_1_sockets;
bs2bSupport = config.mpv.bs2bSupport or true; bs2bSupport = config.mpv.bs2bSupport or true;
quviSupport = config.mpv.quviSupport or false; youtubeSupport = config.mpv.youtubeSupport or true;
cacaSupport = config.mpv.cacaSupport or true; cacaSupport = config.mpv.cacaSupport or true;
vaapiSupport = config.mpv.vaapiSupport or false; vaapiSupport = config.mpv.vaapiSupport or false;
}; };