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

Merge #130786: mesa: 21.0.1 -> 21.1.4 (into staging-21.05)

This commit is contained in:
Vladimír Čunát 2021-07-25 07:50:04 +02:00
parent af428afe37 c6f1d6bf1e
commit 719e9f31c2
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/mesa/default.nix
View File

@ -4,8 +4,7 @@
, expat, libdrm, xorg, wayland, wayland-protocols, openssl , expat, libdrm, xorg, wayland, wayland-protocols, openssl
, llvmPackages, libffi, libomxil-bellagio, libva-minimal , llvmPackages, libffi, libomxil-bellagio, libva-minimal
, libelf, libvdpau , libelf, libvdpau
, libglvnd , libglvnd, libunwind
, enableRadv ? true
, galliumDrivers ? ["auto"] , galliumDrivers ? ["auto"]
, driDrivers ? ["auto"] , driDrivers ? ["auto"]
, vulkanDrivers ? ["auto"] , vulkanDrivers ? ["auto"]
@ -32,7 +31,7 @@ with lib;
let let
# Release calendar: https://www.mesa3d.org/release-calendar.html # Release calendar: https://www.mesa3d.org/release-calendar.html
# Release frequency: https://www.mesa3d.org/releasing.html#schedule # Release frequency: https://www.mesa3d.org/releasing.html#schedule
version = "21.0.1"; version = "21.1.4";
branch = versions.major version; branch = versions.major version;
self = stdenv.mkDerivation { self = stdenv.mkDerivation {
@ -46,7 +45,7 @@ self = stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
"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"
]; ];
sha256 = "1fqj2xhhd1ary0pfg31jq6fqcnd6qgyrw1445nmz554k8n2ck7rp"; sha256 = "02z9g6zpkg1p1sm8f84xdi7v2n7x534x9pn565bvcr411527y5qz";
}; };
prePatch = "patchShebangs ."; prePatch = "patchShebangs .";
@ -65,6 +64,12 @@ self = stdenv.mkDerivation {
url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch";
sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q";
}) })
# For RISC-V support:
(fetchpatch {
name = "add-riscv-default-selections.patch";
url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/9908da1b7a5eaf0156d458e0e24b694c070ba345.patch";
sha256 = "036gv95m5gzzs6qpgkydf5fwgdlm7kpbdfalg8vmayghd260rw1w";
})
] ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ ] ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [
# Fix aarch64-darwin build, remove when upstreaam supports it out of the box. # Fix aarch64-darwin build, remove when upstreaam supports it out of the box.
# See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1020 # See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1020
@ -128,6 +133,7 @@ self = stdenv.mkDerivation {
libpthreadstubs openssl /*or another sha1 provider*/ libpthreadstubs openssl /*or another sha1 provider*/
] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ]
++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ]
++ lib.optionals stdenv.isDarwin [ libunwind ]
++ lib.optional withValgrind valgrind-light; ++ lib.optional withValgrind valgrind-light;
depsBuildBuild = [ pkg-config ]; depsBuildBuild = [ pkg-config ];

12
pkgs/development/libraries/mesa/missing-includes.patch
View File

@ -9,14 +9,14 @@
#include "pipe/p_compiler.h" #include "pipe/p_compiler.h"
#include "pipe/p_state.h" #include "pipe/p_state.h"
--- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
+++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
@@ -28,6 +28,8 @@ @@ -28,6 +28,8 @@
#ifndef RADV_AMDGPU_WINSYS_H #ifndef RADV_AMDGPU_WINSYS_H
#define RADV_AMDGPU_WINSYS_H #define RADV_AMDGPU_WINSYS_H
+#include <sys/types.h> +#include <sys/types.h>
+ +
#include "radv_radeon_winsys.h" #include <amdgpu.h>
#include "ac_gpu_info.h" #include <pthread.h>
#include "addrlib/addrinterface.h"<Paste> #include "util/list.h"