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

mesa: 17.3.7 -> 17.3.8

Browse Source 
https://www.mesa3d.org/relnotes/17.3.8.html

Remove upstreamed portion of musl patch,
always add remaining fix (missing include).
This commit is contained in:
Will Dietz 2018-04-05 11:39:51 -05:00
parent b4a517841b
commit bf44cf71b7
3 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,7 @@ let
in in
let let
version = "17.3.7"; version = "17.3.8";
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 = "07mcfyksspr4xp7fhhdgjhxm0182jhyav11shpzahrdsix591585"; sha256 = "1cd6a4ll5arla3kncxnw9196ak1v4rvnb098aa7lm3n4h7r9p7cg";
}; };
prePatch = "patchShebangs ."; prePatch = "patchShebangs .";
@ -92,7 +92,8 @@ let self = stdenv.mkDerivation {
patches = [ patches = [
./glx_ro_text_segm.patch # fix for grsecurity/PaX ./glx_ro_text_segm.patch # fix for grsecurity/PaX
./symlink-drivers.patch ./symlink-drivers.patch
] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl-fixes.patch; ./missing-include.patch # dev_t needs sys/stat.h, fixes build w/musl
];
outputs = [ "out" "dev" "drivers" "osmesa" ]; outputs = [ "out" "dev" "drivers" "osmesa" ];

11
pkgs/development/libraries/mesa/missing-include.patch Normal file
View File

@ -0,0 +1,11 @@
--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig
+++ ./src/gallium/winsys/svga/drm/vmw_screen.h
@@ -34,7 +34,7 @@
#ifndef VMW_SCREEN_H_
#define VMW_SCREEN_H_
-
+#include <sys/stat.h>
#include "pipe/p_compiler.h"
#include "pipe/p_state.h"

22
pkgs/development/libraries/mesa/musl-fixes.patch
View File

@ -1,22 +0,0 @@
--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig
+++ ./src/gallium/winsys/svga/drm/vmw_screen.h
@@ -34,7 +34,7 @@
#ifndef VMW_SCREEN_H_
#define VMW_SCREEN_H_
-
+#include <sys/stat.h>
#include "pipe/p_compiler.h"
#include "pipe/p_state.h"
--- a/src/util/u_endian.h.orig 2016-11-04 12:16:00.480356454 +0100
+++ b/src/util/u_endian.h 2016-11-04 12:16:11.984347944 +0100
@@ -27,7 +27,7 @@
#ifndef U_ENDIAN_H
#define U_ENDIAN_H
-#if defined(__GLIBC__) || defined(ANDROID) || defined(__CYGWIN__)
+#if defined(__linux__) || defined(ANDROID) || defined(__CYGWIN__)
#include <endian.h>
#if __BYTE_ORDER == __LITTLE_ENDIAN