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 1RxhVo-000681-4k for garchives@archives.gentoo.org; Wed, 15 Feb 2012 16:15:20 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D43CE0DBA; Wed, 15 Feb 2012 16:15:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DC8A5E0DBA for ; Wed, 15 Feb 2012 16:15:00 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 14BBE1B400F for ; Wed, 15 Feb 2012 16:14:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E4030E5400 for ; Wed, 15 Feb 2012 16:14:54 +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: <1329322484.458bfd5f8c72f6b01697bf9838ba981f50a74d86.chithead@gentoo> 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 X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: chithead X-VCS-Committer-Name: Chi-Thanh Christopher Nguyen X-VCS-Revision: 458bfd5f8c72f6b01697bf9838ba981f50a74d86 X-VCS-Branch: master Date: Wed, 15 Feb 2012 16:14:54 +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: ad1bbc3a-3a82-4269-948b-4e3f54e0d569 X-Archives-Hash: ce72b27342557a03bdb527c514dc5ecb commit: 458bfd5f8c72f6b01697bf9838ba981f50a74d86 Author: Chi-Thanh Christopher Nguyen gentoo org> AuthorDate: Wed Feb 15 16:14:44 2012 +0000 Commit: Chi-Thanh Christopher Nguyen cs tu-berli= n de> CommitDate: Wed Feb 15 16:14:44 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc= ommit;h=3D458bfd5f media-libs/mesa: sync with portage to work around bug 374647 --- media-libs/mesa/mesa-9999.ebuild | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999= .ebuild index fea2d84..6023f73 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -328,6 +328,14 @@ pkg_postinst() { # Switch to the xorg implementation. echo eselect opengl set --use-old ${OPENGL_DIR} + + # switch to xorg-x11 and back if necessary, bug #374647 comment 11 + OLD_IMPLEM=3D"$(eselect opengl show)" + if [[ ${OPENGL_DIR}x !=3D ${OLD_IMPLEM}x ]]; then + eselect opengl set ${OPENGL_DIR} + eselect opengl set ${OLD_IMPLEM} + fi + # Select classic/gallium drivers if use classic || use gallium; then eselect mesa set --auto