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 1QffQ5-0002ry-JT for garchives@archives.gentoo.org; Sat, 09 Jul 2011 21:50:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9364721C0DD; Sat, 9 Jul 2011 21:50:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4C74B21C0DD for ; Sat, 9 Jul 2011 21:50:28 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4935A1B4060 for ; Sat, 9 Jul 2011 21:50:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 571368003D for ; Sat, 9 Jul 2011 21:50:27 +0000 (UTC) From: "Chi-Thanh Christopher Nguyen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Chi-Thanh Christopher Nguyen" Message-ID: Subject: [gentoo-commits] proj/x11:master commit in: media-libs/mesa/ X-VCS-Repository: proj/x11 X-VCS-Files: media-libs/mesa/mesa-9999.ebuild media-libs/mesa/metadata.xml X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: chithead X-VCS-Committer-Name: Chi-Thanh Christopher Nguyen X-VCS-Revision: ef2fa7f74c6df342180c34fb7690b0166614ea8a Date: Sat, 9 Jul 2011 21:50:27 +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: X-Archives-Hash: fc04c5c83219af0a3f353f28e3b3fcc2 commit: ef2fa7f74c6df342180c34fb7690b0166614ea8a Author: Chi-Thanh Christopher Nguyen gentoo org> AuthorDate: Sat Jul 9 21:50:25 2011 +0000 Commit: Chi-Thanh Christopher Nguyen cs tu-berli= n de> CommitDate: Sat Jul 9 21:50:25 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc= ommit;h=3Def2fa7f7 media-libs/mesa: sync with portage --- media-libs/mesa/mesa-9999.ebuild | 17 ++++++++++++++--- media-libs/mesa/metadata.xml | 4 +++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999= .ebuild index b77d967..14db3c8 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -61,7 +61,7 @@ RDEPEND=3D"${EXTERNAL_DEPEND} !<=3Dx11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) - >=3Dapp-admin/eselect-opengl-1.1.1-r2 + >=3Dapp-admin/eselect-opengl-1.2.2 dev-libs/expat dev-libs/libxml2[python] x11-libs/libICE @@ -130,12 +130,16 @@ src_unpack() { =20 src_prepare() { # apply patches - if [[ -n ${SRC_PATCHES} ]]; then + if [[ ${PV} !=3D 9999* && -n ${SRC_PATCHES} ]]; then EPATCH_FORCE=3D"yes" \ EPATCH_SOURCE=3D"${WORKDIR}/patches" \ EPATCH_SUFFIX=3D"patch" \ epatch fi + + # fix for hardened, bug 240956 + [[ ${PV} !=3D 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch + # FreeBSD 6.* doesn't have posix_memalign(). if [[ ${CHOST} =3D=3D *-freebsd6.* ]]; then sed -i \ @@ -250,6 +254,13 @@ src_configure() { fi fi =20 + # x86 hardened needs glx-rts, bug 240956 + if use hardened; then + myconf+=3D" + $(use_enable x86 glx-rts) + " + fi + # --with-driver=3Ddri|xlib|osmesa || do we need osmesa? econf \ --disable-option-checking \ @@ -296,7 +307,7 @@ src_install() { ebegin "Moving libGL and friends for dynamic switching" dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include} local x - for x in "${ED}"/usr/$(get_libdir)/libGL.{la,a,so*}; do + for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL,OpenVG}.{la,a,so*}; do if [ -f ${x} -o -L ${x} ]; then mv -f "${x}" "${ED}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \ || die "Failed to move ${x}" diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml index bfe1b8a..d66c89e 100644 --- a/media-libs/mesa/metadata.xml +++ b/media-libs/mesa/metadata.xml @@ -5,11 +5,13 @@ Build drivers based on the classic architecture.= Enable DirectX 10/10.1/11 backend for Gallium3D. + Enable EGL support for Gallium3D. Build drivers based on Gallium3D, the new archit= ecture for 3D graphics drivers. Enable GLES support for Gallium3D. Enable LLVM backend for Gallium3D. + Enable the OpenVG 2D acceleration API disable optimized assembly code that is not PIC frie= ndly Enable sharing of common code for classic= DRI drivers. - Enable support for floating point textures= . + Enable sharing of common code for the OpenG= L API.