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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát 2017-12-15 22:09:44 +01:00
commit 3b36161935
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
4 changed files with 20 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,29 +0,0 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig
, libdrm, libva
}:
stdenv.mkDerivation rec {
name = "libva-utils-${version}";
inherit (libva) version;
src = fetchFromGitHub {
owner = "01org";
repo = "libva-utils";
rev = version;
sha256 = "02n51cvp8bzzjk4fargwvgh7z71y8spg24hqgaawbp3p3ahh7xxi";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libdrm libva ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "VAAPI tools: Video Acceleration API";
homepage = http://www.freedesktop.org/wiki/Software/vaapi;
license = licenses.mit;
maintainers = with maintainers; [ garbas ];
platforms = platforms.unix;
};
}

35
pkgs/development/libraries/libva/default.nix
View File

@ -1,43 +1,36 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig { stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi
, libXext, libdrm, libXfixes, wayland, libffi, libX11
, mesa_noglu , mesa_noglu
, minimal ? true, libva , minimal ? true, libva
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libva-${lib.optionalString (!minimal) "full-"}${version}"; name = "libva-${version}";
version = "2.0.0"; version = "1.7.3";
src = fetchFromGitHub { src = fetchurl {
owner = "01org"; url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
repo = "libva"; sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12";
rev = version;
sha256 = "1x8rlmv5wfqjz3j87byrxb4d9vp5b4lrrin2fx254nwl3aqy15hy";
}; };
outputs = [ "dev" "out" ]; outputs = [ "bin" "dev" "out" ];
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libdrm ] buildInputs = [ libdrm ]
++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ]; ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ];
# TODO: share libs between minimal and !minimal - perhaps just symlink them # TODO: share libs between minimal and !minimal - perhaps just symlink them
enableParallelBuilding = true; configureFlags =
[ "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" ] ++
lib.optionals (!minimal) [ "--enable-glx" ];
configureFlags = [ installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ];
"--with-drivers-path=${mesa_noglu.driverLink}/lib/dri"
] ++ lib.optionals (!minimal) [ "--enable-glx" ];
installFlags = [
"dummy_drv_video_ladir=$(out)/lib/dri"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "VAAPI library: Video Acceleration API";
homepage = http://www.freedesktop.org/wiki/Software/vaapi; homepage = http://www.freedesktop.org/wiki/Software/vaapi;
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ garbas ]; description = "VAAPI library: Video Acceleration API";
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ garbas ];
}; };
} }

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

@ -1,16 +1,14 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkgconfig, python2 { stdenv, fetchurl, gnum4, pkgconfig, python2
, intel-gpu-tools, libdrm, libva, libX11, mesa_noglu, wayland, libXext , intel-gpu-tools, libdrm, libva, libX11, mesa_noglu, wayland, libXext
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "intel-vaapi-driver-${version}"; name = "intel-vaapi-driver-${version}";
inherit (libva) version; version = "1.8.2";
src = fetchFromGitHub { src = fetchurl {
owner = "01org"; url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2";
repo = "libva-intel-driver"; sha256 = "00mpcvininwr5c4wyhp16s4bddg7vclxxjm2sfq5h7lifjcxyv46";
rev = version;
sha256 = "1832nnva3d33wv52bj59bv62q7a807sdxjqqq0my7l9x7a4qdkzz";
}; };
patchPhase = '' patchPhase = ''
@ -27,12 +25,10 @@ stdenv.mkDerivation rec {
"--enable-wayland" "--enable-wayland"
]; ];
nativeBuildInputs = [ autoreconfHook gnum4 pkgconfig python2 ]; nativeBuildInputs = [ gnum4 pkgconfig python2 ];
buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext mesa_noglu wayland ]; buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext mesa_noglu wayland ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://cgit.freedesktop.org/vaapi/intel-driver/; homepage = http://cgit.freedesktop.org/vaapi/intel-driver/;
license = licenses.mit; license = licenses.mit;

1
pkgs/top-level/all-packages.nix
View File

@ -9835,7 +9835,6 @@ with pkgs;
libva = callPackage ../development/libraries/libva { }; libva = callPackage ../development/libraries/libva { };
libva-full = libva.override { minimal = false; }; libva-full = libva.override { minimal = false; };
libva-utils = callPackage ../development/libraries/libva-utils { };
libvdpau = callPackage ../development/libraries/libvdpau { }; libvdpau = callPackage ../development/libraries/libvdpau { };