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

Merge pull request #108155 from primeos/libplacebo

Browse Source 
libplacebo: 2.72.2 -> 3.104.0
This commit is contained in:
Michael Weiss 2021-01-09 18:32:28 +01:00 committed by GitHub
commit 85b23ec5e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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/
'';

8
pkgs/development/libraries/libplacebo/default.nix
View File

@ -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 = [