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

Merge pull request #47147 from dtzWill/update/mesa-18.2

Browse Source 
mesa: 18.1.8 -> 18.2.1
This commit is contained in:
Will Dietz
2018-09-23 13:23:29 -05:00
committed by GitHub
parent 33ae1a1a78 0d91e3b550
commit 193d248569
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/mesa/default.nix
+3 -3
View File
@@ -67,7 +67,7 @@ let
in in
let let
version = "18.1.8"; version = "18.2.1";
branch = head (splitString "." version); branch = head (splitString "." version);
in in
@@ -81,7 +81,7 @@ let self = stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
]; ];
sha256 = "bd1be67fe9c73b517765264ac28911c84144682d28dbff140e1c2deb2f44c21b"; sha256 = "0mhhr1id11s1fbdxbvr4a81xjh1nsznpra9dl36bv2hq7mpxqdln";
}; };
prePatch = "patchShebangs ."; prePatch = "patchShebangs .";
@@ -144,7 +144,7 @@ let self = stdenv.mkDerivation {
buildInputs = with xorg; [ buildInputs = with xorg; [
expat llvmPackages.llvm libglvnd expat llvmPackages.llvm libglvnd
glproto dri2proto dri3proto presentproto glproto dri2proto dri3proto presentproto
libX11 libXext libxcb libXt libXfixes libxshmfence libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr
libffi libvdpau libelf libXvMC libffi libvdpau libelf libXvMC
libpthreadstubs openssl/*or another sha1 provider*/ libpthreadstubs openssl/*or another sha1 provider*/
valgrind-light python2 python2.pkgs.Mako valgrind-light python2 python2.pkgs.Mako
pkgs/development/libraries/mesa/missing-includes.patch
-10
View File
@@ -32,16 +32,6 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#else #else
--- ./src/mesa/drivers/dri/i965/brw_bufmgr.h
+++ ./src/mesa/drivers/dri/i965/brw_bufmgr.h
@@ -37,6 +37,7 @@
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
+#include <time.h>
#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
+++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
@@ -28,6 +28,8 @@ @@ -28,6 +28,8 @@
pkgs/servers/x11/xorg/extra.list
+2 -2
View File
@@ -1,6 +1,6 @@
http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 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/libxcb-1.13.tar.bz2
http://xcb.freedesktop.org/dist/xcb-proto-1.12.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-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-cursor-0.1.3.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2