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

Merge pull request #49493 from dtzWill/update/libva-and-friends-2.3.0-mostly

Browse Source 
libva{,-utils}: 2.1.0 -> 2.3.0, bump vaapiIntel to 2.2.0 since no 2.3.0
This commit is contained in:
zimbatm 2018-11-15 10:30:35 +01:00 committed by GitHub
commit cb2a3bc577
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/libva-utils/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "01org"; owner = "01org";
repo = "libva-utils"; repo = "libva-utils";
rev = version; rev = version;
sha256 = "113wdmi4r0qligizj9zmd4a8ml1996x9g2zp2i4pmhb8frv9m8j2"; sha256 = "0k5v72prcq462x780j9vpqf4ckrpqf536z6say81wpna0l0qbd98";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];

4
pkgs/development/libraries/libva/default.nix
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.1.0"; version = "2.3.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 = "1a60lrgr65hx9b2qp0gjky1298c4d4zp3ap6vnmmz850sxx5rm8w"; sha256 = "0zip22b5qwyjygsmrmjq62hdpl9z77d84h5hni8cn6xz5cmbw29z";
}; };
outputs = [ "dev" "out" ]; outputs = [ "dev" "out" ];

4
pkgs/development/libraries/vaapi-intel/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "intel-vaapi-driver-${version}"; name = "intel-vaapi-driver-${version}";
inherit (libva) version; version = "2.2.0"; # generally try to match libva version, but not required
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "intel"; owner = "intel";
repo = "intel-vaapi-driver"; repo = "intel-vaapi-driver";
rev = version; rev = version;
sha256 = "15ag4al9h6b8f8sw1zpighyhsmr5qfqp1882q7r3gsh5g4cnj763"; sha256 = "1z8iqnswias2gph61yzyal53456y71ff98f21cs17hw4qjfkwa6k";
}; };
patchPhase = '' patchPhase = ''

4
pkgs/development/tools/misc/intel-gpu-tools/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev
, libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
, procps, utilmacros, gnome2, openssl }: , procps, utilmacros, gnome2, openssl, peg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "intel-gpu-tools-${version}"; name = "intel-gpu-tools-${version}";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig utilmacros ]; nativeBuildInputs = [ pkgconfig utilmacros ];
buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod
libXext libXv libXrandr glib bison libunwind python3 procps libXext libXv libXrandr glib bison libunwind python3 procps
gnome2.gtkdoc openssl ]; gnome2.gtkdoc openssl peg ];
preConfigure = '' preConfigure = ''
./autogen.sh ./autogen.sh