From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 21995138E20 for ; Fri, 21 Feb 2014 21:04:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14920E0F8E; Fri, 21 Feb 2014 21:04:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7995CE0F8B for ; Fri, 21 Feb 2014 21:04:14 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A72B033EFDC for ; Fri, 21 Feb 2014 21:04:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 5C560188C7 for ; Fri, 21 Feb 2014 21:04:12 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1393016704.10ae99cf9ac9e298a51383f6d74c5c1c01fec4ea.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-dev:musl commit in: media-libs/mesa/, media-libs/mesa/files/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: media-libs/mesa/files/mesa-9.1.6-remove-error_h.patch media-libs/mesa/mesa-9.1.6-r99.ebuild X-VCS-Directories: media-libs/mesa/ media-libs/mesa/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 10ae99cf9ac9e298a51383f6d74c5c1c01fec4ea X-VCS-Branch: musl Date: Fri, 21 Feb 2014 21:04:12 +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: b9480de6-f04f-4f43-8778-e5bda29f9e68 X-Archives-Hash: 24d39bcb93bd37ddb6b8bd27c8f34d37 commit: 10ae99cf9ac9e298a51383f6d74c5c1c01fec4ea Author: Anthony G. Basile gentoo org> AuthorDate: Fri Feb 21 20:32:36 2014 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Fri Feb 21 21:05:04 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=10ae99cf media-libs/mesa: use err.h instead of error.h --- .../mesa/files/mesa-9.1.6-remove-error_h.patch | 33 ++++++++++++++++++++++ media-libs/mesa/mesa-9.1.6-r99.ebuild | 3 ++ 2 files changed, 36 insertions(+) diff --git a/media-libs/mesa/files/mesa-9.1.6-remove-error_h.patch b/media-libs/mesa/files/mesa-9.1.6-remove-error_h.patch new file mode 100644 index 0000000..c12d6fd --- /dev/null +++ b/media-libs/mesa/files/mesa-9.1.6-remove-error_h.patch @@ -0,0 +1,33 @@ +diff -Naur Mesa-9.1.6.orig/src/gallium/state_trackers/xvmc/tests/xvmc_bench.c Mesa-9.1.6/src/gallium/state_trackers/xvmc/tests/xvmc_bench.c +--- Mesa-9.1.6.orig/src/gallium/state_trackers/xvmc/tests/xvmc_bench.c 2013-07-31 22:56:45.000000000 +0000 ++++ Mesa-9.1.6/src/gallium/state_trackers/xvmc/tests/xvmc_bench.c 2014-02-21 20:20:43.470217630 +0000 +@@ -28,7 +28,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "testlib.h" + +@@ -144,9 +144,9 @@ + } + + if (fail) +- error ++ err + ( +- 1, 0, ++ 1, + "Bad argument.\n" + "\n" + "Usage: %s [options]\n" +@@ -214,7 +214,7 @@ + )) + { + XCloseDisplay(display); +- error(1, 0, "Error, unable to find a good port.\n"); ++ err(1, "Error, unable to find a good port.\n"); + } + + if (is_overlay) diff --git a/media-libs/mesa/mesa-9.1.6-r99.ebuild b/media-libs/mesa/mesa-9.1.6-r99.ebuild index 6a70d16..f1c69d3 100644 --- a/media-libs/mesa/mesa-9.1.6-r99.ebuild +++ b/media-libs/mesa/mesa-9.1.6-r99.ebuild @@ -161,6 +161,9 @@ src_prepare() { epatch fi + # musl doesn have error, so we fall back on err. + epatch "${FILESDIR}"/${PN}-9.1.6-remove-error_h.patch + # relax the requirement that r300 must have llvm, bug 380303 epatch "${FILESDIR}"/${PN}-8.1-dont-require-llvm-for-r300.patch