From 15d3d68a5ea819dd82784a9a44cfe26ed5eb74cd Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 15 Dec 2017 21:52:49 +0100 Subject: [PATCH] Reverting #32599 --- .../libraries/libva-utils/default.nix | 29 --------------- pkgs/development/libraries/libva/default.nix | 35 ++++++++----------- .../libraries/vaapi-intel/default.nix | 16 ++++----- pkgs/top-level/all-packages.nix | 1 - 4 files changed, 20 insertions(+), 61 deletions(-) delete mode 100644 pkgs/development/libraries/libva-utils/default.nix diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix deleted file mode 100644 index fad721059124..000000000000 --- a/pkgs/development/libraries/libva-utils/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index dca548a6f9d0..031ac781651c 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,43 +1,36 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig -, libXext, libdrm, libXfixes, wayland, libffi, libX11 +{ stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi , mesa_noglu , minimal ? true, libva }: stdenv.mkDerivation rec { - name = "libva-${lib.optionalString (!minimal) "full-"}${version}"; - version = "2.0.0"; + name = "libva-${version}"; + version = "1.7.3"; - src = fetchFromGitHub { - owner = "01org"; - repo = "libva"; - rev = version; - sha256 = "1x8rlmv5wfqjz3j87byrxb4d9vp5b4lrrin2fx254nwl3aqy15hy"; + src = fetchurl { + url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; + sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12"; }; - outputs = [ "dev" "out" ]; + outputs = [ "bin" "dev" "out" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libdrm ] ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ]; # 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 = [ - "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" - ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; - - installFlags = [ - "dummy_drv_video_ladir=$(out)/lib/dri" - ]; + installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; meta = with stdenv.lib; { - description = "VAAPI library: Video Acceleration API"; homepage = http://www.freedesktop.org/wiki/Software/vaapi; license = licenses.mit; - maintainers = with maintainers; [ garbas ]; + description = "VAAPI library: Video Acceleration API"; platforms = platforms.unix; + maintainers = with maintainers; [ garbas ]; }; } diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index edb2a8214dde..49f638a7bc56 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -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 }: stdenv.mkDerivation rec { name = "intel-vaapi-driver-${version}"; - inherit (libva) version; + version = "1.8.2"; - src = fetchFromGitHub { - owner = "01org"; - repo = "libva-intel-driver"; - rev = version; - sha256 = "1832nnva3d33wv52bj59bv62q7a807sdxjqqq0my7l9x7a4qdkzz"; + src = fetchurl { + url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; + sha256 = "00mpcvininwr5c4wyhp16s4bddg7vclxxjm2sfq5h7lifjcxyv46"; }; patchPhase = '' @@ -27,12 +25,10 @@ stdenv.mkDerivation rec { "--enable-wayland" ]; - nativeBuildInputs = [ autoreconfHook gnum4 pkgconfig python2 ]; + nativeBuildInputs = [ gnum4 pkgconfig python2 ]; buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext mesa_noglu wayland ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = http://cgit.freedesktop.org/vaapi/intel-driver/; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c84d08be3f7..8812bf05ef01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9784,7 +9784,6 @@ with pkgs; libva = callPackage ../development/libraries/libva { }; libva-full = libva.override { minimal = false; }; - libva-utils = callPackage ../development/libraries/libva-utils { }; libvdpau = callPackage ../development/libraries/libvdpau { };