cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

mesa: 20.1.6 -> 20.1.7

Browse source
This commit is contained in:
Michael Weiss 2020-09-04 13:43:22 +00:00 committed by Frederik Rietdijk
parent 60258be0f4
commit 5f29a2b2ee
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/mesa/default.nix
View file

@ -31,7 +31,7 @@ with stdenv.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 = "20.1.6"; version = "20.1.7";
branch = versions.major version; branch = versions.major version;
in in
@ -46,7 +46,7 @@ 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 = "0g59gxbgr884a9xvg0fls10zkllyhz675zjvr50dcfmh2h0x9gi3"; sha256 = "1252mgwiy05nz8mm4gjkzmnjfvdz5yv1shnsr837cdnan86dvsad";
}; };
prePatch = "patchShebangs ."; prePatch = "patchShebangs .";

17
pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch
View file

@ -1,4 +1,4 @@
From 00f3c6d1b771c11ecc08c3d8bd793a51d6e64166 Mon Sep 17 00:00:00 2001 From b49bcb6eece322b70fc2e8b0c8498f5a38ea7b82 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com> From: David McFarland <corngood@gmail.com>
Date: Sun, 26 Jul 2020 17:29:49 -0300 Date: Sun, 26 Jul 2020 17:29:49 -0300
Subject: [PATCH] link radv with ld_args_build_id Subject: [PATCH] link radv with ld_args_build_id
@ -9,18 +9,17 @@ This is needed for radv_device_get_cache_uuid to work correctly.
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
index efcf2dd6c89..590f286b8cb 100644 index eec026e8f60..a07a0821938 100644
--- a/src/amd/vulkan/meson.build --- a/src/amd/vulkan/meson.build
+++ b/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build
@@ -173,7 +173,7 @@ libvulkan_radeon = shared_library( @@ -183,7 +183,7 @@ libvulkan_radeon = shared_library(
], ],
c_args : [c_vis_args, no_override_init_args, radv_flags], c_args : [c_vis_args, no_override_init_args, radv_flags],
cpp_args : [cpp_vis_args, radv_flags], cpp_args : [cpp_vis_args, radv_flags],
- link_args : [ld_args_bsymbolic, ld_args_gc_sections], - link_args : [ld_args_bsymbolic, ld_args_gc_sections, libvulkan_radeon_ld_args],
+ link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections], + link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections, libvulkan_radeon_ld_args],
link_depends : [libvulkan_radeon_link_depends,],
install : true, install : true,
) )
--
-- 2.28.0
2.27.0