diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-01-01 19:46:25 +0100 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2021-01-09 17:56:35 +0100 |
| commit | 7d8351f4d736a1e42b82e32ef97acdfe8b41fb22 (patch) | |
| tree | df531e9d43bf63c1a721f010f2faa998c54ed040 | |
| parent | 288fb1f2ba2d7385c8574fe3ff5523612c5f8656 (diff) | |
libplacebo: 2.72.2 -> 3.104.0
| -rw-r--r-- | pkgs/applications/video/mpv/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/libplacebo/default.nix | 8 |
2 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 2b9605aa3c265..02135fe52ed1f 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchFromGitHub +{ config, stdenv, fetchFromGitHub, fetchpatch , addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which , ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs , nv-codec-headers, lua, libuchardet, libiconv ? null @@ -104,6 +104,14 @@ in stdenv.mkDerivation rec { sha256 = "sha256-3l32qQBpvWVjbLp5CZtO039oDQeH7C/cNAKtJxrzlRk="; }; + patches = [ + # To make mpv build with libplacebo 3.104.0: + (fetchpatch { # vo_gpu: placebo: update for upstream API changes + url = "https://github.com/mpv-player/mpv/commit/7c4465cefb27d4e0d07535d368febdf77b579566.patch"; + sha256 = "1yfc6220ak5kc5kf7zklmsa944nr9q0qaa27l507pgrmvcyiyzrx"; + }) + ]; + postPatch = '' patchShebangs ./TOOLS/ ''; diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index 7d120f604d8d9..4aa92921898dc 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -11,11 +11,13 @@ , glslang , lcms2 , epoxy +, libGL +, xorg }: stdenv.mkDerivation rec { pname = "libplacebo"; - version = "2.72.2"; + version = "3.104.0"; patches = [ ./glsl-import.patch @@ -26,7 +28,7 @@ stdenv.mkDerivation rec { owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "1ijqpx1pagc6qg63ynqrinvckwc8aaw1i0lx48gg5szwk8afib4i"; + sha256 = "0p5mx8ch7cp7b54yrkl4fs8bcvqma1h461gx6ps4kagn4dsx8asb"; }; nativeBuildInputs = [ @@ -43,6 +45,8 @@ stdenv.mkDerivation rec { glslang lcms2 epoxy + libGL + xorg.libX11 ]; mesonFlags = [ |