Merge pull request #40289 from yegortimoshenko/mpv-bump
mpv: 0.27.2 -> 0.28.2
This commit is contained in:
commit
1463480edb
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper
|
||||
, docutils, perl, pkgconfig, python3, which, ffmpeg
|
||||
, docutils, perl, pkgconfig, python3, which, ffmpeg_4
|
||||
, freefont_ttf, freetype, libass, libpthreadstubs
|
||||
, lua, luasocket, libuchardet, libiconv ? null, darwin
|
||||
|
||||
@ -83,22 +83,15 @@ let
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "mpv-${version}";
|
||||
version = "0.27.2";
|
||||
version = "0.28.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mpv-player";
|
||||
repo = "mpv";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ivyyqajkxq5c1zxp0dm7pljvianhgvwl3dbghgpzyrch59k5wnr";
|
||||
sha256 = "0bldxhqjz7z9fgvx4k40l49awpay17fscp8ypswb459yicy8npmg";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f.patch";
|
||||
sha256 = "1sr0770rvhsgz8d7ysr9qqp4g9gwdhgj8g3rgnz90wl49lgrykhb";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./TOOLS/
|
||||
'';
|
||||
@ -131,7 +124,7 @@ in stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ffmpeg freetype libass libpthreadstubs
|
||||
ffmpeg_4 freetype libass libpthreadstubs
|
||||
lua luasocket libuchardet
|
||||
] ++ optional alsaSupport alsaLib
|
||||
++ optional xvSupport libXv
|
||||
|
12
pkgs/development/libraries/ffmpeg/4.nix
Normal file
12
pkgs/development/libraries/ffmpeg/4.nix
Normal file
@ -0,0 +1,12 @@
|
||||
{ stdenv, callPackage, fetchpatch
|
||||
# Darwin frameworks
|
||||
, Cocoa, CoreMedia
|
||||
, ...
|
||||
}@args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "${branch}";
|
||||
branch = "4.0";
|
||||
sha256 = "1f3k8nz5ag6szsfhlrz66qm8s1yxk1vphqvcfr4ps4690vckk2ii";
|
||||
darwinFrameworks = [ Cocoa CoreMedia ];
|
||||
})
|
@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
|
||||
"--enable-ffmpeg"
|
||||
"--disable-ffplay"
|
||||
(ifMinVer "0.6" "--enable-ffprobe")
|
||||
"--disable-ffserver"
|
||||
(if reqMin "4" then null else "--disable-ffserver")
|
||||
# Libraries
|
||||
(ifMinVer "0.6" "--enable-avcodec")
|
||||
(ifMinVer "0.6" "--enable-avdevice")
|
||||
|
@ -8870,6 +8870,10 @@ with pkgs;
|
||||
ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
|
||||
};
|
||||
ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
|
||||
};
|
||||
|
||||
# Aliases
|
||||
ffmpeg_0 = ffmpeg_0_10;
|
||||
ffmpeg_1 = ffmpeg_1_2;
|
||||
|
Loading…
Reference in New Issue
Block a user