public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/files/, media-libs/mesa/
Date: Mon,  1 Aug 2016 04:34:21 +0000 (UTC)	[thread overview]
Message-ID: <1470025763.4d2930abce11997e17fe986ae1827f7dd75b3a56.vapier@gentoo> (raw)

commit:     4d2930abce11997e17fe986ae1827f7dd75b3a56
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  1 04:29:23 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Aug  1 04:29:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d2930ab

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

 media-libs/mesa/files/mesa-12.0-sysmacros.patch | 43 +++++++++++++++++++++++++
 media-libs/mesa/mesa-12.0.1.ebuild              |  1 +
 2 files changed, 44 insertions(+)

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
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 3d273ed..ff35a80 100644
--- 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() {


             reply	other threads:[~2016-08-01  4:34 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-01  4:34 Mike Frysinger [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-04-27  2:21 [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/files/, media-libs/mesa/ Matt Turner
2024-11-09 16:48 Matt Turner
2024-09-18 17:45 Matt Turner
2024-01-11  4:41 Matt Turner
2023-08-16 22:07 Matt Turner
2023-04-27  6:20 Sam James
2023-04-11 19:04 Sam James
2021-11-18  7:48 Matt Turner
2021-09-22 21:22 Matt Turner
2020-04-13 16:32 Matt Turner
2018-11-29  5:17 Matt Turner
2017-03-20 19:01 Matt Turner
2017-03-16 20:37 Matt Turner
2017-03-03  0:03 Matt Turner
2016-11-15 14:32 Michał Górny
2016-04-21  4:46 Matt Turner
2016-02-22 17:53 Matt Turner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1470025763.4d2930abce11997e17fe986ae1827f7dd75b3a56.vapier@gentoo \
    --to=vapier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox