diff options
author | xeji <36407913+xeji@users.noreply.github.com> | 2018-05-10 18:21:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-10 18:21:38 +0200 |
commit | 1463480edbf6757140b3764dcec2fa720978add6 (patch) | |
tree | e92eb103ed0722726c6386628fa2d64f4e60743c | |
parent | 1d682d5314e7999a2a347fe66af5dca39166551c (diff) | |
parent | d691c8170ae2a8ef73c40f6187e7181015f8cdca (diff) | |
download | nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar.gz nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar.bz2 nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar.lz nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar.xz nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar.zst nixlib-1463480edbf6757140b3764dcec2fa720978add6.zip |
Merge pull request #40289 from yegortimoshenko/mpv-bump
mpv: 0.27.2 -> 0.28.2
-rw-r--r-- | pkgs/applications/video/mpv/default.nix | 15 | ||||
-rw-r--r-- | pkgs/development/libraries/ffmpeg/4.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 21 insertions, 12 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index aa17cf183e34..58628aa1f8e8 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -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 diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix new file mode 100644 index 000000000000..a6e67052cd03 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -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 ]; +}) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 530639d757de..c5de220eaad4 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -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") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4421b997e43..eb37b8a1744f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |