Merge pull request #55064 from dtzWill/update/libva-2.4.0

libva[,-utils}: 2.3.0 -> 2.4.0
This commit is contained in:
Will Dietz 2019-02-04 22:22:08 -06:00 committed by GitHub
commit b46ff71245
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig { stdenv, fetchFromGitHub, pkgconfig
, libdrm, libva , libdrm, libva, libX11, libXext, libXfixes, wayland, meson, ninja
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,12 +10,18 @@ stdenv.mkDerivation rec {
owner = "01org"; owner = "01org";
repo = "libva-utils"; repo = "libva-utils";
rev = version; rev = version;
sha256 = "0k5v72prcq462x780j9vpqf4ckrpqf536z6say81wpna0l0qbd98"; sha256 = "1yk9bg1wg4nqva3l01s6bghcvc3hb02gp62p1sy5qk0r9mn5kpik";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ meson ninja pkgconfig ];
buildInputs = [ libdrm libva ]; buildInputs = [ libdrm libva libX11 libXext libXfixes wayland ];
mesonFlags = [
"-Ddrm=true"
"-Dx11=true"
"-Dwayland=true"
];
enableParallelBuilding = true; enableParallelBuilding = true;

View File

@ -6,14 +6,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libva-${lib.optionalString minimal "minimal-"}${version}"; name = "libva-${lib.optionalString minimal "minimal-"}${version}";
version = "2.3.0"; version = "2.4.0";
# update libva-utils and vaapiIntel as well # update libva-utils and vaapiIntel as well
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "01org"; owner = "01org";
repo = "libva"; repo = "libva";
rev = version; rev = version;
sha256 = "0zip22b5qwyjygsmrmjq62hdpl9z77d84h5hni8cn6xz5cmbw29z"; sha256 = "1b58n6rjfsfjfw1s5kdfa0jpfiqs83g2w14s7sfp1qkckkz3988l";
}; };
outputs = [ "dev" "out" ]; outputs = [ "dev" "out" ];