diff --git a/xorg/mesa/build b/xorg/mesa/build index 3f97151e..d94a6008 100755 --- a/xorg/mesa/build +++ b/xorg/mesa/build @@ -1,5 +1,7 @@ #!/bin/sh -e +patch -p1 < musl.patch + # Use autotools to build mesa. # Meson has no ability to disable 'gettext'. ./configure \ diff --git a/xorg/mesa/patches/musl.patch b/xorg/mesa/patches/musl.patch new file mode 100644 index 00000000..dc71d18c --- /dev/null +++ b/xorg/mesa/patches/musl.patch @@ -0,0 +1,83 @@ +--- src/gallium/winsys/svga/drm/vmw_screen.h.orig 2015-05-07 14:02:28.033079796 +0200 ++++ src/gallium/winsys/svga/drm/vmw_screen.h 2015-05-07 14:02:48.832054666 +0200 +@@ -35,6 +35,8 @@ + #define VMW_SCREEN_H_ + + ++#include /* dev_t */ ++ + #include "pipe/p_compiler.h" + #include "pipe/p_state.h" + +--- src/gallium/state_trackers/nine/threadpool.h.orig 2015-05-07 14:10:53.443337212 +0200 ++++ src/gallium/state_trackers/nine/threadpool.h 2015-05-07 14:11:04.210307653 +0200 +@@ -24,6 +24,8 @@ + #ifndef _THREADPOOL_H_ + #define _THREADPOOL_H_ + ++#include ++ + #define MAXTHREADS 1 + + struct threadpool { +--- src/util/rand_xor.c.orig 2017-06-20 00:38:57.199474067 +0200 ++++ src/util/rand_xor.c 2017-06-20 00:40:31.351279557 +0200 +@@ -23,7 +23,9 @@ + */ + + #if defined(__linux__) ++#include + #include ++#include + #include + #include + #else +--- src/gallium/state_trackers/nine/nine_debug.c ++++ src/gallium/state_trackers/nine/nine_debug.c +@@ -73,8 +73,8 @@ + } + + #if defined(HAVE_PTHREAD) +-# if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \ +- (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12)) ++# if defined(__linux__) && !(defined(__GLIBC__) || \ ++ (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12))) + if (dbg_flags & DBG_TID) + tid = pthread_self(); + # endif +--- src/util/u_thread.h ++++ src/util/u_thread.h +@@ -61,9 +61,8 @@ + static inline void u_thread_setname( const char *name ) + { + #if defined(HAVE_PTHREAD) +-# if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \ +- (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12)) && \ +- defined(__linux__) ++# if defined(__linux__) && !(defined(__GLIBC__) || \ ++ (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12))) + pthread_setname_np(pthread_self(), name); + # endif + #endif +@@ -93,8 +92,8 @@ + static inline bool u_thread_is_self(thrd_t thread) + { + #if defined(HAVE_PTHREAD) +-# if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \ +- (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12)) ++# if defined(__linux__) && !(defined(__GLIBC__) || \ ++ (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12))) + return pthread_equal(pthread_self(), thread); + # endif + #endif +--- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h ++++ src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +@@ -28,6 +28,8 @@ + #ifndef RADV_AMDGPU_WINSYS_H + #define RADV_AMDGPU_WINSYS_H + ++#include ++ + #include "radv_radeon_winsys.h" + #include "ac_gpu_info.h" + #include "addrlib/addrinterface.h" diff --git a/xorg/mesa/sources b/xorg/mesa/sources index 8b5cf68d..137447b9 100644 --- a/xorg/mesa/sources +++ b/xorg/mesa/sources @@ -1 +1,2 @@ https://mesa.freedesktop.org/archive/mesa-19.0.2.tar.xz +patches/musl.patch