media-libs/mesa: fix build w/newer glibc #580392

diff --git a/media-libs/mesa/files/mesa-12.0-sysmacros.patch b/media-libs/mesa/files/mesa-12.0-sysmacros.patch
new file mode 100644 (file)
index 0000000..d4b0679
--- /dev/null
+++ b/media-libs/mesa/files/mesa-12.0-sysmacros.patch
@@ -0,0 +1,43 @@
+https://bugs.gentoo.org/580392
+
+fixed in upstream here:
+       https://cgit.freedesktop.org/mesa/mesa/commit/?id=20553e4a2d952f6dc37f40f63d2c86b0718c58f9
+
+this is a hack for the 12.0 branch
+
+--- a/src/gallium/winsys/svga/drm/vmw_screen.c
++++ b/src/gallium/winsys/svga/drm/vmw_screen.c
+@@ -31,6 +31,9 @@
+ #include "pipe/p_compiler.h"
+ #include "util/u_hash_table.h"
+ #include <sys/types.h>
++#ifdef __linux__
++#include <sys/sysmacros.h>
++#endif
+ #include <sys/stat.h>
+ #include <unistd.h>
+ 
+--- a/src/gbm/main/gbm.c
++++ b/src/gbm/main/gbm.c
+@@ -31,6 +31,9 @@
+ #include <stdint.h>
+ 
+ #include <sys/types.h>
++#ifdef __linux__
++#include <sys/sysmacros.h>
++#endif
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <errno.h>
+--- a/src/loader/loader.c
++++ b/src/loader/loader.c
+@@ -80,6 +80,9 @@
+ #include "xmlpool.h"
+ #endif
+ #endif
++#ifdef __linux__
++#include <sys/sysmacros.h>
++#endif
+ #ifdef HAVE_SYSFS
+ #include <sys/types.h>
+ #endif

diff --git a/media-libs/mesa/mesa-12.0.1.ebuild b/media-libs/mesa/mesa-12.0.1.ebuild
index 3d273ed85a3046e0860bfce74fd8e39621d89e67..ff35a8085349262d3e25185f6cc32c07a0f3c4e6 100644 (file)
--- a/media-libs/mesa/mesa-12.0.1.ebuild
+++ b/media-libs/mesa/mesa-12.0.1.ebuild
@@ -186,6 +186,7 @@ pkg_setup() {
 
 src_prepare() {
        [[ ${PV} == 9999 ]] && eautoreconf
+       epatch "${FILESDIR}"/${PN}-12.0-sysmacros.patch #580392
 }
 
 multilib_src_configure() {