From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rgdzz-0003Gi-53 for garchives@archives.gentoo.org; Fri, 30 Dec 2011 15:04:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6739821C0F8; Fri, 30 Dec 2011 15:03:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 21F0B21C0F8 for ; Fri, 30 Dec 2011 15:03:51 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 589881B40CE for ; Fri, 30 Dec 2011 15:03:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BB8D780043 for ; Fri, 30 Dec 2011 15:03:50 +0000 (UTC) From: "Enrico Tagliavini" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Enrico Tagliavini" Message-ID: Subject: [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/, x11-drivers/ati-drivers/files/ X-VCS-Repository: proj/x11 X-VCS-Files: x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild x11-drivers/ati-drivers/ati-drivers-11.12-r2.ebuild x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch X-VCS-Directories: x11-drivers/ati-drivers/ x11-drivers/ati-drivers/files/ X-VCS-Committer: Enrico X-VCS-Committer-Name: Enrico Tagliavini X-VCS-Revision: f9b3e92c2fd7512eecee3f259193912a83e00db1 Date: Fri, 30 Dec 2011 15:03:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 9b80885a-3cd3-4822-9469-5b6b8f636b1b X-Archives-Hash: be9e436d33ff1cbf3b83f9786fbbab71 commit: f9b3e92c2fd7512eecee3f259193912a83e00db1 Author: Enrico Tagliavini gmail com> AuthorDate: Fri Dec 30 15:03:32 2011 +0000 Commit: Enrico Tagliavini gmail com> CommitDate: Fri Dec 30 15:03:32 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc= ommit;h=3Df9b3e92c x11-drivers/ati-drivers: hardened fixups This commit add a patch needed for hardened to compile It just rename the WARN enum entry in kcl_debug.h to avoid a name collision with the kernel WARN macro Many thanks to Zhang Hongjiu gmail.com> for the solution. --- ...11.12-r1.ebuild =3D> ati-drivers-11.12-r2.ebuild} | 7 +++- .../files/ati-drivers-redefine-WARN.patch | 39 ++++++++++++++= ++++++ 2 files changed, 45 insertions(+), 1 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild b/x11-dr= ivers/ati-drivers/ati-drivers-11.12-r2.ebuild similarity index 98% rename from x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild rename to x11-drivers/ati-drivers/ati-drivers-11.12-r2.ebuild index a397629..73b44b5 100644 --- a/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-11.12-r2.ebuild @@ -320,7 +320,12 @@ src_prepare() { || die "Replacing 'finger' with 'who' failed." # Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and # add function to detect default state. - epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die "Failed to e= patch powermode-opt-path-2.patch" + epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die \ + "Failed to epatch powermode-opt-path-2.patch" + + # fix needed for at least hardened-sources, see bug #392753 + epatch "${FILESDIR}"/ati-drivers-redefine-WARN.patch || die \ + "Failed to epatch ati-drivers-redefine-WARN.patch" =20 cd "${MODULE_DIR}" =20 diff --git a/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patc= h b/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch new file mode 100644 index 0000000..fe5ed2f --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch @@ -0,0 +1,39 @@ +--- common/lib/modules/fglrx/build_mod/kcl_debug.h.orig 2011-12-30 14:32= :00.271391437 +0100 ++++ common/lib/modules/fglrx/build_mod/kcl_debug.h 2011-12-30 15:48:21.6= 47473696 +0100 +@@ -85,8 +85,8 @@ + #ifdef ERROR + #undef ERROR + #endif +-#ifdef WARN +-#undef WARN ++#ifdef AMD_WARN ++#undef AMD_WARN + #endif + #ifdef INFO + #undef INFO +@@ -122,7 +122,7 @@ + { + SPECIAL =3D 0, + ERROR , +- WARN , ++ AMD_WARN , + INFO , + INFOEX, + TRACE, +@@ -163,14 +163,14 @@ + { + {SPECIAL , 'S'}, + {ERROR , 'E'}, +- {WARN , 'W'}, ++ {AMD_WARN , 'W'}, + {INFO , 'I'}, + {INFOEX , 'X'}, + {TRACE , 'T'}, + {PERFORMANCE , 'P'}, + {DUMP , 'D'}, + }; +-#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(= ERROR) |___BIT(WARN) | ___BIT(TRACE)| ___BIT(SPECIAL) )) ++#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(= ERROR) |___BIT(AMD_WARN) | ___BIT(TRACE)| ___BIT(SPECIAL) )) + #define INFO_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX))) + static module_map module_type_map[LOG_M_MAX] =3D + {