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

Revert "upgrade video-intel stack to 2.99.906"

Browse Source 
This reverts commit 89f710f18e.

Reported by others for xorg-server to crash on different kernel
versions.
This commit is contained in:
Domen Kožar 2014-02-19 12:35:52 +01:00
parent c7aedd5805
commit aea043aec0
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes }:
stdenv.mkDerivation rec {
name = "libva-1.2.1";
name = "libva-1.1.1";
src = fetchurl {
url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
sha256 = "0fx8ivaghpq8g099bzwy5dm3bqnkbbhjq3qhgrpk390c4s5hy23h";
sha256 = "0kfdcrzcr82g15l0vvmm6rqr0f0604d4dgrza78gn6bfx7rppby0";
};
buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes ];

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

@ -2,11 +2,11 @@
, intelgen4asm }:
stdenv.mkDerivation rec {
name = "libva-intel-driver-1.2.2";
name = "libva-intel-driver-1.0.20";
src = fetchurl {
url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2";
sha256 = "0i3h9g8flnxf8gmag65xkvz7rib51dvx841ym3am5v3p51w79i0r";
sha256 = "1jfl8909j3a3in6m8b5bx3dn7pzr8a1sw3sk4vzm7h3j2dkgpzhj";
};
buildInputs = [ pkgconfig libdrm libva libX11 ];

10
pkgs/servers/x11/xorg/default.nix
View File

@ -1510,14 +1510,14 @@ let
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) {
name = "xf86-video-intel-2.99.906";
name = "xf86-video-intel-2.21.15";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-intel-2.99.906.tar.bz2;
sha256 = "1miwyv20q8bz5wml9n16l9vbrcnwpy7a3d3cmc92dy2p0b7474rd";
url = mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2;
sha256 = "1z6ncmpszmwqi9xr590c4kp4gjjf7mndcr56r35x2bx7h87i8nkx";
};
buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ];
})) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ;};
buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ];
})) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;};
xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) {
name = "xf86-video-mach64-6.9.4";

2
pkgs/servers/x11/xorg/tarballs-7.7.list
View File

@ -129,7 +129,7 @@ mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2
mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2
mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2
mirror://xorg/individual/driver/xf86-video-intel-2.99.906.tar.bz2
mirror://xorg/individual/driver/xf86-video-intel-2.21.9.tar.bz2
mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2
mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2