From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 47EE91381F2 for ; Mon, 1 Aug 2016 04:34:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22190E0B53; Mon, 1 Aug 2016 04:34:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BC040E0B53 for ; Mon, 1 Aug 2016 04:34:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9215A340BB4 for ; Mon, 1 Aug 2016 04:34:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 11306E62 for ; Mon, 1 Aug 2016 04:34:21 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1470025763.4d2930abce11997e17fe986ae1827f7dd75b3a56.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/files/, media-libs/mesa/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mesa/files/mesa-12.0-sysmacros.patch media-libs/mesa/mesa-12.0.1.ebuild X-VCS-Directories: media-libs/mesa/files/ media-libs/mesa/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 4d2930abce11997e17fe986ae1827f7dd75b3a56 X-VCS-Branch: master Date: Mon, 1 Aug 2016 04:34:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 40196431-3af8-4984-8b67-f66a13091839 X-Archives-Hash: 44f5f72002c06edf404e86ab6a8aab83 commit: 4d2930abce11997e17fe986ae1827f7dd75b3a56 Author: Mike Frysinger gentoo org> AuthorDate: Mon Aug 1 04:29:23 2016 +0000 Commit: Mike Frysinger gentoo 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 ++#ifdef __linux__ ++#include ++#endif + #include + #include + +--- a/src/gbm/main/gbm.c ++++ b/src/gbm/main/gbm.c +@@ -31,6 +31,9 @@ + #include + + #include ++#ifdef __linux__ ++#include ++#endif + #include + #include + #include +--- a/src/loader/loader.c ++++ b/src/loader/loader.c +@@ -80,6 +80,9 @@ + #include "xmlpool.h" + #endif + #endif ++#ifdef __linux__ ++#include ++#endif + #ifdef HAVE_SYSFS + #include + #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() {