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 1RF5P6-00036A-Na for garchives@archives.gentoo.org; Sat, 15 Oct 2011 14:40:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8BFE521C08D; Sat, 15 Oct 2011 14:39:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3CDEB21C08D for ; Sat, 15 Oct 2011 14:39:53 +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 9B8DF1B4030 for ; Sat, 15 Oct 2011 14:39:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D15F880042 for ; Sat, 15 Oct 2011 14:39:51 +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: <7cd6566fe9f639a760409a2a331d53b5343247ff.Enrico@gentoo> 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.9-r1.ebuild x11-drivers/ati-drivers/ati-drivers-11.9.ebuild x11-drivers/ati-drivers/files/switchlibGL 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: 7cd6566fe9f639a760409a2a331d53b5343247ff Date: Sat, 15 Oct 2011 14:39:51 +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: 4db78427b910ba60ef69095b8943a35d commit: 7cd6566fe9f639a760409a2a331d53b5343247ff Author: Enrico Tagliavini gmail com> AuthorDate: Sat Oct 15 14:39:01 2011 +0000 Commit: Enrico Tagliavini gmail com> CommitDate: Sat Oct 15 14:39:01 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc= ommit;h=3D7cd6566f [ati-drivers] revision bump, fix comment #9 and #10 in bug #366397 --- ...vers-11.9.ebuild =3D> ati-drivers-11.9-r1.ebuild} | 6 +- x11-drivers/ati-drivers/files/switchlibGL | 43 ++++++++++----= ----- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-11.9.ebuild b/x11-driver= s/ati-drivers/ati-drivers-11.9-r1.ebuild similarity index 99% rename from x11-drivers/ati-drivers/ati-drivers-11.9.ebuild rename to x11-drivers/ati-drivers/ati-drivers-11.9-r1.ebuild index ec6093e..fef0878 100644 --- a/x11-drivers/ati-drivers/ati-drivers-11.9.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-11.9-r1.ebuild @@ -474,9 +474,9 @@ src_install() { =20 # PowerXpress stuff exeinto /usr/$(get_libdir)/fglrx - doexe "${FILESDIR}"/switchlibGL || die "newexe switchlibGL failed" - dosym ./switchlibGL /usr/$(get_libdir)/fglrx/switchlibglx || die \ - "dosym switchlibglx failed" + doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed" + cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx + doexe "${T}"/switchlibglx || die "doexe switchlibglx failed" } =20 src_install-libs() { diff --git a/x11-drivers/ati-drivers/files/switchlibGL b/x11-drivers/ati-= drivers/files/switchlibGL index e8fac1e..a6aa4fc 100644 --- a/x11-drivers/ati-drivers/files/switchlibGL +++ b/x11-drivers/ati-drivers/files/switchlibGL @@ -30,28 +30,31 @@ if [ $# -ne 1 ]; then exit $E_ERR fi =20 - +current=3D$(eselect opengl show) # Switch to right mode case "$1" in - "amd" ) - eselect opengl set ati - ;; - "intel" ) - eselect opengl set xorg-x11 - ;; - "query" ) - current=3D`eselect opengl show` - case "$current" in - "ati" ) - echo "amd" - ;; - "xorg-x11" ) - echo "intel" - ;; - esac - ;; - * ) echo "Usage: `basename $0` amd|intel|query" 1>&2; exit $E_ERR;; - # other than amd|intel|query parameter report an error + "amd" ) + if [ $current !=3D ati ] ; then + eselect opengl set ati || return 1 + fi + ;; + "intel" ) + if [ $current !=3D xorg-x11 ] ; then + eselect opengl set xorg-x11 || return 1 + fi + ;; + "query" ) + case "$current" in + "ati" ) + echo "amd" + ;; + "xorg-x11" ) + echo "intel" + ;; + esac + ;; + * ) echo "Usage: `basename $0` amd|intel|query" 1>&2; exit $E_ERR;; + # other than amd|intel|query parameter report an error esac =20 # A zero return value from the script upon exit indicates success.