From 6248955e6a2c5ad1b97a9db7ba2ab282ddce5e22 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 21 Sep 2018 11:06:09 -0500 Subject: [PATCH 1/4] mesa: 18.1.8 -> 18.2.1 (cherry picked from commit eb2b89a0a1901d4c89dcc6c0a36e1cabd1fcd002) --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index c8eee42a252..152dcc8de85 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -67,7 +67,7 @@ let in let - version = "18.1.8"; + version = "18.2.1"; branch = head (splitString "." version); in @@ -81,7 +81,7 @@ let self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "bd1be67fe9c73b517765264ac28911c84144682d28dbff140e1c2deb2f44c21b"; + sha256 = "0mhhr1id11s1fbdxbvr4a81xjh1nsznpra9dl36bv2hq7mpxqdln"; }; prePatch = "patchShebangs ."; From c1743dd12dcf1b992946c3c051c5700f41c9770a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 21 Sep 2018 12:45:06 -0500 Subject: [PATCH 2/4] mesa: drop non-applying hunk, hopefully include no longer needed (cherry picked from commit b673b8987872adfd97fdb8821198450ff229118d) --- pkgs/development/libraries/mesa/missing-includes.patch | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch index feb6ffe428c..18e7d5437b1 100644 --- a/pkgs/development/libraries/mesa/missing-includes.patch +++ b/pkgs/development/libraries/mesa/missing-includes.patch @@ -32,16 +32,6 @@ #include #include #else ---- ./src/mesa/drivers/dri/i965/brw_bufmgr.h -+++ ./src/mesa/drivers/dri/i965/brw_bufmgr.h -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - #include "util/u_atomic.h" - #include "util/list.h" - --- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h @@ -28,6 +28,8 @@ From a94ac965c82fe8a1554a4ef85f4ead4a31c06c7e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 21 Sep 2018 12:58:06 -0500 Subject: [PATCH 3/4] libxcb: 1.12 -> 1.13 (proto too) (cherry picked from commit 5853e62637eb2aaa1f2ccbcbf62c2a4f232a4257) --- pkgs/servers/x11/xorg/default.nix | 12 ++++++------ pkgs/servers/x11/xorg/extra.list | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c9e8dd04c47..561f8ba94d9 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1136,11 +1136,11 @@ let }) // {inherit ;}; libxcb = (mkDerivation "libxcb" { - name = "libxcb-1.12"; + name = "libxcb-1.13"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2; - sha256 = "0nvv0la91cf8p5qqlb3r5xnmg1jn2wphn4fb5jfbr6byqsvv3psa"; + url = http://xcb.freedesktop.org/dist/libxcb-1.13.tar.bz2; + sha256 = "1ahxhmdqp4bhb90zmc275rmf5wixqra4bnw9pqnzyl1w3598g30q"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; @@ -1448,11 +1448,11 @@ let }) // {inherit ;}; xcbproto = (mkDerivation "xcbproto" { - name = "xcb-proto-1.12"; + name = "xcb-proto-1.13"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2; - sha256 = "01j91946q8f34l1mbvmmgvyc393sm28ym4lxlacpiav4qsjan8jr"; + url = http://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2; + sha256 = "1qdxw9syhbvswiqj5dvj278lrmfhs81apzmvx6205s4vcqg7563v"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python ]; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 28b698bdc81..222a9f65426 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,6 +1,6 @@ http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 -http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2 +http://xcb.freedesktop.org/dist/libxcb-1.13.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2 From 0d91e3b5509bada40a1c83f5a503d294cad81749 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 21 Sep 2018 13:25:12 -0500 Subject: [PATCH 4/4] mesa: add new required dep on libXrandr --- pkgs/development/libraries/mesa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 152dcc8de85..aca9a237b0c 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -144,7 +144,7 @@ let self = stdenv.mkDerivation { buildInputs = with xorg; [ expat llvmPackages.llvm libglvnd glproto dri2proto dri3proto presentproto - libX11 libXext libxcb libXt libXfixes libxshmfence + libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr libffi libvdpau libelf libXvMC libpthreadstubs openssl/*or another sha1 provider*/ valgrind-light python2 python2.pkgs.Mako