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 <gentoo-commits+bounces-420970-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1RqQmq-0006dV-IK
	for garchives@archives.gentoo.org; Thu, 26 Jan 2012 14:58:52 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 80B69E084D;
	Thu, 26 Jan 2012 14:58:45 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 42691E08A4
	for <gentoo-commits@lists.gentoo.org>; Thu, 26 Jan 2012 14:58:45 +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 998BE1B4035
	for <gentoo-commits@lists.gentoo.org>; Thu, 26 Jan 2012 14:58:44 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id 193A58004C
	for <gentoo-commits@lists.gentoo.org>; Thu, 26 Jan 2012 14:58:44 +0000 (UTC)
From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" <nirbheek@gentoo.org>
Message-ID: <0b84b406c244035e106e474ba85da5aa71777aec.nirbheek@gentoo>
Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/
X-VCS-Repository: proj/mozilla
X-VCS-Files: www-client/firefox/Manifest www-client/firefox/firefox-10.0_beta6.ebuild
X-VCS-Directories: www-client/firefox/
X-VCS-Committer: nirbheek
X-VCS-Committer-Name: Nirbheek Chauhan
X-VCS-Revision: 0b84b406c244035e106e474ba85da5aa71777aec
Date: Thu, 26 Jan 2012 14:58:44 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 0d4c14c7-c232-482a-9775-0a444a1f0028
X-Archives-Hash: d0cfccca7b38e61d7cbf8f6a54cdf109

commit:     0b84b406c244035e106e474ba85da5aa71777aec
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 11:08:03 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 11:12:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a=
=3Dcommit;h=3D0b84b406

www-client/firefox: import access violation changes from tree

---
 www-client/firefox/Manifest                  |    2 +-
 www-client/firefox/firefox-10.0_beta6.ebuild |   18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index a634172..e497335 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -2,4 +2,4 @@ AUX gentoo-default-prefs.js-1 821 RMD160 13a7be3a165b7059=
e51fab2cc7fc8d31a82260e
 AUX icon/firefox.desktop 276 RMD160 92a5671cd09e399b3330c4be31b7ac758374=
7031 SHA1 b757763670a00982f3cb38b8d41d7faa6eee3818 SHA256 06565ade11b6e4b=
448cf10339696c43f31e73cb6824491094bb6e0ab902c7cf5
 DIST firefox-10.0b6.source.tar.bz2 75442266 RMD160 c841efc74a23f6c3317bf=
75bbc22940a1adf8d9c SHA1 90d207968ac4224d22406ce59b823612638d9791 SHA256 =
3fc5d2d598acbfec7eab1411bdd9b1442514b33e0b32f66c1e58370c99496693
 DIST firefox-9.0-patches-0.5.tar.xz 18580 RMD160 66870e2e194454cda309458=
d3793bfbe659d0598 SHA1 9f1f60e68330462e24eb81b27f2e3348689321ef SHA256 dc=
88f027f73bc6352da0dc873bc5ed63e72ea4d7db0aebfc44834f0b967ecd4f
-EBUILD firefox-10.0_beta6.ebuild 9528 RMD160 1f17946a57e46ed692382698c84=
16d2d50a68a6c SHA1 89cb49ec9a255a7902bbbdee296f990ef494acd7 SHA256 7c4c7c=
1c27c8a4b14f1f5615155dfebf096a9acaae9226cff48d267761c8b552
+EBUILD firefox-10.0_beta6.ebuild 9861 RMD160 31b605e77847a03dad901bf33b2=
4b42afd98226a SHA1 79da62dac880fdf067c442ebd96448f5ff5475a0 SHA256 095dfd=
ab8272ff5a2e00bd5231537087c1d7772e1558fdd41ba9ed838104e428

diff --git a/www-client/firefox/firefox-10.0_beta6.ebuild b/www-client/fi=
refox/firefox-10.0_beta6.ebuild
index 320ce45..1b9ca21 100644
--- a/www-client/firefox/firefox-10.0_beta6.ebuild
+++ b/www-client/firefox/firefox-10.0_beta6.ebuild
@@ -214,11 +214,23 @@ src_compile() {
 	if use pgo; then
 		addpredict /root
 		addpredict /etc/gconf
-		# Firefox tries to dri stuff when it's run, see bug 380283
+
+		# Firefox tries to use dri stuff when it's run, see bug 380283
 		shopt -s nullglob
-		local cards=3D$(echo -n /dev/{dri,ati}/card* /dev/nvidiactl* | sed 's/=
 /:/g')
+		cards=3D$(echo -n /dev/dri/card* | sed 's/ /:/g')
+		if test -n "${cards}"; then
+			# FOSS drivers are fine
+			addpredict "${cards}"
+		else
+			cards=3D$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
+			if test -n "${cards}"; then
+				# Binary drivers seem to cause access violations anyway, so
+				# let's use indirect rendering so that the device files aren't
+				# touched at all. See bug 394715.
+				export LIBGL_ALWAYS_INDIRECT=3D1
+			fi
+		fi
 		shopt -u nullglob
-		test -n "${cards}" && addpredict "${cards}"
=20
 		CC=3D"$(tc-getCC)" CXX=3D"$(tc-getCXX)" LD=3D"$(tc-getLD)" \
 		MOZ_MAKE_FLAGS=3D"${MAKEOPTS}" \