Fix access violations due to proprietary drivers + pgo (AGAIN). See bug 394715 .

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 38 insertions, 15 deletions

diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index 576537cd5c7d..624197b7de30 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/firefox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.119 2012/01/25 17:34:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.120 2012/01/26 11:08:13 nirbheek Exp $
+
+  26 Jan 2012; Nirbheek Chauhan <nirbheek@gentoo.org> firefox-9.0.ebuild:
+  Fix access violations due to proprietary drivers + pgo (AGAIN). See bug
+  394715 .
 
   25 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> firefox-9.0.ebuild:
   Restore ~ppc64 keywording with USE crashreporter masked in
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 9312fee45596..988bfe43f87d 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -330,18 +330,24 @@ DIST firefox-9.0.source.tar.bz2 74197197 RMD160 4631b103aa80ae2ae22b61453f4e02c8
 EBUILD firefox-3.6.20.ebuild 9443 RMD160 598a4b875d7ec39367750882dc8df9c77adf02f1 SHA1 2987918c26454a1dbd0b8b5a830f1440f68b14dd SHA256 c44ece9c3512785a7fb8b272b7690b13bbfb5e75e544cc8cc23f00f3197bb978
 EBUILD firefox-3.6.22.ebuild 9453 RMD160 0b3b6fdd5acd5c42813cd2451298f7066da72e5f SHA1 6e88d16611c5a18979fa7e446f6ec5243b13d316 SHA256 b44194eea13d067b5cc2cee77c4c887cb3231c9c6dcda4d186a003fd78ddad36
 EBUILD firefox-8.0.ebuild 11217 RMD160 d407fc1331705f160343ba961c28aaeaf0e16c90 SHA1 0812e1c536a16ce239efcf8e5e6cb3dfb7da7807 SHA256 6137ab67286c41786dda111c7072d1018699e76f09b0cb40a81d2142cc66aa50
-EBUILD firefox-9.0.ebuild 11351 RMD160 03ddb70adc789e318a52e13e000fe1015767520f SHA1 bc70ef11c093f7183824f8aecfe52040dbb93958 SHA256 abdb18114e9d1a34483504b1caae990640f91be5a6862df9079429f95ed00ade
-MISC ChangeLog 26280 RMD160 0712ade4a4f810bb4239443fab9db171dd1e900c SHA1 8c3e08e9c462ea68cc021c527f61aaf9f1a1d38f SHA256 1d7cb1f72a679ca50c160d188201c15ba683e9f7b69698b27599dcc5fb3bf1dd
+EBUILD firefox-9.0.ebuild 11696 RMD160 9c891fbbfeba60478a1d8eb0046e5b3cbb62cec3 SHA1 219fd2de43ea92b1eef8f28052f1ea13f0f41499 SHA256 fd0b3c1e145e99fbb97cdb3d5a44746bfd596e6a6c771d01b860d188321e20ea
+MISC ChangeLog 26439 RMD160 f66a8ba23a151ad654f28b5fad532720f4ef17f5 SHA1 ca6e272a88aed5434736c5c6719c94c932ef334a SHA256 9e3b074d2c56c127dbc0e10ab8ba61d39dc78cc0ba55fd6a3a4b8e966e1ee1f3
 MISC ChangeLog-2009 109736 RMD160 ae12e8bd2f6f9869d3aeb0e2b172016a16a8e38b SHA1 eed236ab9ea02cf4f3e234887f36935375a7fc6f SHA256 6a3f47a190cb2146174953971b193f7d75f408ea2cd1ad7d029fb848dd66f3c8
 MISC metadata.xml 937 RMD160 f372fe74ecc3ce2a64e8178e15dd2d1149c0cea1 SHA1 e59c357183b3980d403817a4ca7b34df963b00b3 SHA256 4c67b5290d23ad1812c96782de252ffc929b0a11ac42793ef23bfb537b01408f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPIDyKAAoJEEdUh39IaPFN7I8IAJry2kzqcde2ZDfo+OadpTwU
-XdEDZXYhf4a3kvMO2LkcX9eYeDhaa4SY9V2xXh4NezDucAJPiDYkJxJhsabzgolZ
-GokMMcy/4Aokn6TKS7qlXFyx30LigaoFUOexUQn2Ir9vLl6SL/KEi/A7aAXhStAD
-MwvkIdimFH2dTlcdJ4GiJ+chr93OP6k0D7QPufzXNuXUPI7gxbFiaoJMTvZsYR6n
-KwcT65hb+kc7xiAHMuBHQyBb7PjOoV07alN2QpU5qfsKilvJiGYXC+LPHUIMY92X
-gVwHXQ9dDvUqwAqX9SCkYlNiTlj91jv7ZtWOAwoOulb6FkVFtoMhuflLClEfF0k=
-=0DIZ
+iQIcBAEBAgAGBQJPITQlAAoJEO/kOhxWD91kFBQP/iVjpz3z5joo2gOJeN4ouUHn
+a3YU6GA13v4yEG1pP/6+7FQqtDDfaEisDDIK9rwD/cA1SFCSQdq2akpenzu2nGye
+HpnjRNtEcpubthj6oXoNHvi0fTYw+RkcOzPjC0Zmcq8weqiYmmV1TyjdRW+WJyQ1
+8NaPZ3+j32rdN9dCQMwcjindsQJyPsBwnd2u5JJDdSLOzgaWQ2S45K65cJNjYndz
+O4FT2qVayZ5LiUEeTEoHRLwcUGEY3EOWX4wbYKIhxYAaj4pLChgcST/1ihFhOaxD
+9tvtm0vEdPyngRaZLEX1rBF1JLyV/0UBZt7IVHIUHXmhw33RKT4kD7Xf2LbKe/jk
+bGLwhm0i7Vy1fhM5UVsJXAR0vV7owAtnLVRVPDZG5itxgqL5GRHnnRv5X34MXppN
+q8UnhtZrHycj3rb75aqXF6tk0imRAB/wIgLYxWkFX/ZSwM1gcq4nBN4gh08EspzJ
+OKglvNDXb7uLCA3zvhSwInQJUyXVZN3orIIsifUQi+RScyJ0sID9F1sxJPbpVHZ6
+bgmTHILffzNBTiG+WrHt1RcMOQZVBU++TRSYWlAkwdOndI7PieuKGVTEXfTCrjaH
+yAOW1dR55QGUenaF0J/mKoYlv37ahzH9wvyrI+tEoTGIUnHbrqhHMw7cifneBcmi
+PqMIsJP9HGMnyaZLyruk
+=acsv
 -----END PGP SIGNATURE-----
diff --git a/www-client/firefox/firefox-9.0.ebuild b/www-client/firefox/firefox-9.0.ebuild
index 039fdb8cba31..83530d136d59 100644
--- a/www-client/firefox/firefox-9.0.ebuild
+++ b/www-client/firefox/firefox-9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-9.0.ebuild,v 1.7 2012/01/25 17:34:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-9.0.ebuild,v 1.8 2012/01/26 11:08:13 nirbheek Exp $
 
 EAPI="3"
 VIRTUALX_REQUIRED="pgo"
@@ -258,14 +258,27 @@ src_configure() {
 }
 
 src_compile() {
+	local cards
 	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=$(echo -n /dev/{dri,ati}/card* /dev/nvidiactl* | sed 's/ /:/g')
+		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+		if test -n "${cards}"; then
+			# FOSS drivers are fine
+			addpredict "${cards}"
+		else
+			cards=$(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=1
+			fi
+		fi
 		shopt -u nullglob
-		test -n "${cards}" && addpredict "${cards}"
 
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
 		MOZ_MAKE_FLAGS="${MAKEOPTS}" \