Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/files/, media-libs/mesa/
Date: Mon, 01 Aug 2016 04:34:27
Message-Id: 1470025763.4d2930abce11997e17fe986ae1827f7dd75b3a56.vapier@gentoo
1 commit: 4d2930abce11997e17fe986ae1827f7dd75b3a56
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 1 04:29:23 2016 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 1 04:29:23 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d2930ab
7
8 media-libs/mesa: fix build w/newer glibc #580392
9
10 media-libs/mesa/files/mesa-12.0-sysmacros.patch | 43 +++++++++++++++++++++++++
11 media-libs/mesa/mesa-12.0.1.ebuild | 1 +
12 2 files changed, 44 insertions(+)
13
14 diff --git a/media-libs/mesa/files/mesa-12.0-sysmacros.patch b/media-libs/mesa/files/mesa-12.0-sysmacros.patch
15 new file mode 100644
16 index 0000000..d4b0679
17 --- /dev/null
18 +++ b/media-libs/mesa/files/mesa-12.0-sysmacros.patch
19 @@ -0,0 +1,43 @@
20 +https://bugs.gentoo.org/580392
21 +
22 +fixed in upstream here:
23 + https://cgit.freedesktop.org/mesa/mesa/commit/?id=20553e4a2d952f6dc37f40f63d2c86b0718c58f9
24 +
25 +this is a hack for the 12.0 branch
26 +
27 +--- a/src/gallium/winsys/svga/drm/vmw_screen.c
28 ++++ b/src/gallium/winsys/svga/drm/vmw_screen.c
29 +@@ -31,6 +31,9 @@
30 + #include "pipe/p_compiler.h"
31 + #include "util/u_hash_table.h"
32 + #include <sys/types.h>
33 ++#ifdef __linux__
34 ++#include <sys/sysmacros.h>
35 ++#endif
36 + #include <sys/stat.h>
37 + #include <unistd.h>
38 +
39 +--- a/src/gbm/main/gbm.c
40 ++++ b/src/gbm/main/gbm.c
41 +@@ -31,6 +31,9 @@
42 + #include <stdint.h>
43 +
44 + #include <sys/types.h>
45 ++#ifdef __linux__
46 ++#include <sys/sysmacros.h>
47 ++#endif
48 + #include <sys/stat.h>
49 + #include <unistd.h>
50 + #include <errno.h>
51 +--- a/src/loader/loader.c
52 ++++ b/src/loader/loader.c
53 +@@ -80,6 +80,9 @@
54 + #include "xmlpool.h"
55 + #endif
56 + #endif
57 ++#ifdef __linux__
58 ++#include <sys/sysmacros.h>
59 ++#endif
60 + #ifdef HAVE_SYSFS
61 + #include <sys/types.h>
62 + #endif
63
64 diff --git a/media-libs/mesa/mesa-12.0.1.ebuild b/media-libs/mesa/mesa-12.0.1.ebuild
65 index 3d273ed..ff35a80 100644
66 --- a/media-libs/mesa/mesa-12.0.1.ebuild
67 +++ b/media-libs/mesa/mesa-12.0.1.ebuild
68 @@ -186,6 +186,7 @@ pkg_setup() {
69
70 src_prepare() {
71 [[ ${PV} == 9999 ]] && eautoreconf
72 + epatch "${FILESDIR}"/${PN}-12.0-sysmacros.patch #580392
73 }
74
75 multilib_src_configure() {