Attachment #195546 for bug #274981




-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

AUX 6.5.2-i965-wine-fix.patch 2888 RMD160 e899ac128933eb1a65e5c79de97408679beb2a50 SHA1 741221fba69b3891665e16da5baf6e66be62449d SHA256 bc19f4b5ce44a90c6b2aeab2c1148200539791ff9d0c60c5ffc2d4d8fe5fee78
AUX 7.4-fix-parallel-make.patch 552 RMD160 06fdc748ef5ffa9ced1fd0b13d24299ad3522f97 SHA1 72801ed7e6951506811637675947aa9a869365f6 SHA256 4df0f41cffa5a0472f934da8ca1adf6c2b051a068943392a7ceeea3ae9c1b30a
AUX lib/libGL.la 755 RMD160 a60984e0d56d559c2c15bd4693e01404a7e0a408 SHA1 d6e231ffaccd1b13c3628744031cc761ffaf76d8 SHA256 b32ffd7f3f866da7dbae80ba78b1dc5b4924b33ab133b13397af9cda0a274f91
AUX lib/libGLU.la 752 RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 SHA1 12c57ac5e7e8a94d4d41b0f37b0fb3f470791c39 SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5
AUX nullptr.patch 681 RMD160 470a1c8b16343273c65a7f3d8b79114705ce76fe SHA1 8c30971c55c785b4fb9759734881ae82829fc90c SHA256 79ff6824ea5ee2b7f21392957cced092d90cf0bbb1e90029ccbadf2920c037fd
DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 SHA1 ba860bb6ee57c02202342dfd5927464a068ea18f SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
DIST MesaLib-7.0.3.tar.bz2 3389327 RMD160 1672be9d235f19c779c42ea4f443995b1844c836 SHA1 49b92094a25f189b411f393174ee666e73dddf36 SHA256 ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22
DIST MesaLib-7.1.tar.bz2 3338885 RMD160 e03960762a35eeb56755105fda5ba1b580c7dacc SHA1 0b946a8a4334ca22baf3e0fe583f88187e9d74fa SHA256 d63a29bf206a5304b3c319a47fa16892db3d2e14737f2c534acf1eb220e9c550

EBUILD mesa-7.2.ebuild 7176 RMD160 b386204b4fccc206356c1b926e000f8f5c42925d SHA1 5734c06cd36e31611876349c06f0227e43cdc5a9 SHA256 4e40d7ded71ace962a90fc886b1ecb8d85f39fe21c036dbb69564aba1f5d4b81
EBUILD mesa-7.3-r1.ebuild 7229 RMD160 b62d77615267fa439965d22fe09932ad2801e2ce SHA1 2dfbaddc6e4bf3deb00e185aed9de766915580c2 SHA256 445e702e5fab2149dbce6db69bb02a13c8fa47b7a3ebabd536550b5fab5d7871
EBUILD mesa-7.4.2.ebuild 7722 RMD160 f559febf74ebac3831e74759696e1734605177d9 SHA1 83334c5fdfa64f2402f87da9ccc0bb06a477e17a SHA256 9495663e2349284800aa0f677ae35a2654a5b6a20df1368526e3ee2c2bbe6cbc
EBUILD mesa-7.4.3.ebuild 7850 RMD160 fcff1dcb13b3d95786351ea55b61400bd0b34c3a SHA1 76d3bbf926a0d3124fed5e52e92e4aa520ad84ac SHA256 d1760d13e0f10c5f6ad7e44d43b07bc683f7a93aa4923f7a63692a751da2134b
MISC ChangeLog 39423 RMD160 254339398e819c716ea4ef0170b37fbb9523e264 SHA1 794362dbecdff3a7f0b234a8d227d4a558d3360c SHA256 6ed77b8079425c18b3e01586991a838adc39885feec59fb6c5d170ad31196d4c
MISC metadata.xml 251 RMD160 e6e718c1f8c8ab33331fcdc2ed16dc7da35d04aa SHA1 a753e5190a6008a77db021b70d5962cbc2e9e488 SHA256 689bc8ac5839e4eb6173899024bf1f6169a5d3f3a1e82e4cdd80011e3e43a8de
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)

iEYEARECAAYFAko+HlgACgkQHB6c3gNBRYcAkACcC4o3U6wQfYkkhW3Gq3/fQ0eM
arkAoJ1QROOcjLqL4L/7B9RTq5rrIII5
=anC/
-----END PGP SIGNATURE-----




commit 1dbbc39f48ce5f9aa63ab42930b14e48938b326f
Author: Brian Paul <brianp@vmware.com>
Date:   Mon Jun 22 11:23:30 2009 -0600

    intel: added a null ptr check
    
    This was hit during screen tear-down.

diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
index 54f6038..5a1314e 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -345,7 +345,8 @@ intel_renderbuffer_set_region(struct intel_renderbuffer *rb,
    intel_region_reference(&rb->region, region);
    intel_region_release(&old);
 
-   rb->pfPitch = region->pitch;
+   if (region)
+      rb->pfPitch = region->pitch;
 }
 
 /**

Lines 109-114 pkg_setup() { Link Here

(-)a/media-libs/mesa/mesa-7.4.3.ebuild (-1 / +4 lines)
109		109
110	src_unpack() {	110	src_unpack() {
111	[[ $PV = 9999* ]] && git_src_unpack \|\| unpack ${A}	111	[[ $PV = 9999* ]] && git_src_unpack \|\| unpack ${A}
		112
		113	# Fix null ptr check (https://bugs.freedesktop.org/show_bug.cgi?id=22408)
		114	cd "${S}"
		115	epatch "${FILESDIR}/nullptr.patch"
112	}	116	}
113		117
114	src_prepare() {	118	src_prepare() {
115	-

Return to bug 274981

Lines 1-10 Link Here

(-)a/media-libs/mesa/Manifest (-11 / +2 lines)
1	-----BEGIN PGP SIGNED MESSAGE-----
2	Hash: SHA1
3
4	AUX 6.5.2-i965-wine-fix.patch 2888 RMD160 e899ac128933eb1a65e5c79de97408679beb2a50 SHA1 741221fba69b3891665e16da5baf6e66be62449d SHA256 bc19f4b5ce44a90c6b2aeab2c1148200539791ff9d0c60c5ffc2d4d8fe5fee78	1	AUX 6.5.2-i965-wine-fix.patch 2888 RMD160 e899ac128933eb1a65e5c79de97408679beb2a50 SHA1 741221fba69b3891665e16da5baf6e66be62449d SHA256 bc19f4b5ce44a90c6b2aeab2c1148200539791ff9d0c60c5ffc2d4d8fe5fee78
5	AUX 7.4-fix-parallel-make.patch 552 RMD160 06fdc748ef5ffa9ced1fd0b13d24299ad3522f97 SHA1 72801ed7e6951506811637675947aa9a869365f6 SHA256 4df0f41cffa5a0472f934da8ca1adf6c2b051a068943392a7ceeea3ae9c1b30a	2	AUX 7.4-fix-parallel-make.patch 552 RMD160 06fdc748ef5ffa9ced1fd0b13d24299ad3522f97 SHA1 72801ed7e6951506811637675947aa9a869365f6 SHA256 4df0f41cffa5a0472f934da8ca1adf6c2b051a068943392a7ceeea3ae9c1b30a
6	AUX lib/libGL.la 755 RMD160 a60984e0d56d559c2c15bd4693e01404a7e0a408 SHA1 d6e231ffaccd1b13c3628744031cc761ffaf76d8 SHA256 b32ffd7f3f866da7dbae80ba78b1dc5b4924b33ab133b13397af9cda0a274f91	3	AUX lib/libGL.la 755 RMD160 a60984e0d56d559c2c15bd4693e01404a7e0a408 SHA1 d6e231ffaccd1b13c3628744031cc761ffaf76d8 SHA256 b32ffd7f3f866da7dbae80ba78b1dc5b4924b33ab133b13397af9cda0a274f91
7	AUX lib/libGLU.la 752 RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 SHA1 12c57ac5e7e8a94d4d41b0f37b0fb3f470791c39 SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5	4	AUX lib/libGLU.la 752 RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 SHA1 12c57ac5e7e8a94d4d41b0f37b0fb3f470791c39 SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5
		5	AUX nullptr.patch 681 RMD160 470a1c8b16343273c65a7f3d8b79114705ce76fe SHA1 8c30971c55c785b4fb9759734881ae82829fc90c SHA256 79ff6824ea5ee2b7f21392957cced092d90cf0bbb1e90029ccbadf2920c037fd
8	DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 SHA1 ba860bb6ee57c02202342dfd5927464a068ea18f SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f	6	DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 SHA1 ba860bb6ee57c02202342dfd5927464a068ea18f SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
9	DIST MesaLib-7.0.3.tar.bz2 3389327 RMD160 1672be9d235f19c779c42ea4f443995b1844c836 SHA1 49b92094a25f189b411f393174ee666e73dddf36 SHA256 ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22	7	DIST MesaLib-7.0.3.tar.bz2 3389327 RMD160 1672be9d235f19c779c42ea4f443995b1844c836 SHA1 49b92094a25f189b411f393174ee666e73dddf36 SHA256 ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22
10	DIST MesaLib-7.1.tar.bz2 3338885 RMD160 e03960762a35eeb56755105fda5ba1b580c7dacc SHA1 0b946a8a4334ca22baf3e0fe583f88187e9d74fa SHA256 d63a29bf206a5304b3c319a47fa16892db3d2e14737f2c534acf1eb220e9c550	8	DIST MesaLib-7.1.tar.bz2 3338885 RMD160 e03960762a35eeb56755105fda5ba1b580c7dacc SHA1 0b946a8a4334ca22baf3e0fe583f88187e9d74fa SHA256 d63a29bf206a5304b3c319a47fa16892db3d2e14737f2c534acf1eb220e9c550
Lines 19-31 EBUILD mesa-7.1.ebuild 7237 RMD160 9cf2b1f7023071ef801019c3a08334b01668bf8d SHA1 Link Here
19	EBUILD mesa-7.2.ebuild 7176 RMD160 b386204b4fccc206356c1b926e000f8f5c42925d SHA1 5734c06cd36e31611876349c06f0227e43cdc5a9 SHA256 4e40d7ded71ace962a90fc886b1ecb8d85f39fe21c036dbb69564aba1f5d4b81	17	EBUILD mesa-7.2.ebuild 7176 RMD160 b386204b4fccc206356c1b926e000f8f5c42925d SHA1 5734c06cd36e31611876349c06f0227e43cdc5a9 SHA256 4e40d7ded71ace962a90fc886b1ecb8d85f39fe21c036dbb69564aba1f5d4b81
20	EBUILD mesa-7.3-r1.ebuild 7229 RMD160 b62d77615267fa439965d22fe09932ad2801e2ce SHA1 2dfbaddc6e4bf3deb00e185aed9de766915580c2 SHA256 445e702e5fab2149dbce6db69bb02a13c8fa47b7a3ebabd536550b5fab5d7871	18	EBUILD mesa-7.3-r1.ebuild 7229 RMD160 b62d77615267fa439965d22fe09932ad2801e2ce SHA1 2dfbaddc6e4bf3deb00e185aed9de766915580c2 SHA256 445e702e5fab2149dbce6db69bb02a13c8fa47b7a3ebabd536550b5fab5d7871
21	EBUILD mesa-7.4.2.ebuild 7722 RMD160 f559febf74ebac3831e74759696e1734605177d9 SHA1 83334c5fdfa64f2402f87da9ccc0bb06a477e17a SHA256 9495663e2349284800aa0f677ae35a2654a5b6a20df1368526e3ee2c2bbe6cbc	19	EBUILD mesa-7.4.2.ebuild 7722 RMD160 f559febf74ebac3831e74759696e1734605177d9 SHA1 83334c5fdfa64f2402f87da9ccc0bb06a477e17a SHA256 9495663e2349284800aa0f677ae35a2654a5b6a20df1368526e3ee2c2bbe6cbc
22	EBUILD mesa-7.4.3.ebuild 7727 RMD160 df2d6717da22a38f89691efcc9fbc353c383ee78 SHA1 0007586afa4e417e45a22f4b8638c6247819c84a SHA256 19ec309998de434d3327eaa5e2dd967cfcc6bd8d98c97a7139eab2e10aa10e54	20	EBUILD mesa-7.4.3.ebuild 7850 RMD160 fcff1dcb13b3d95786351ea55b61400bd0b34c3a SHA1 76d3bbf926a0d3124fed5e52e92e4aa520ad84ac SHA256 d1760d13e0f10c5f6ad7e44d43b07bc683f7a93aa4923f7a63692a751da2134b
23	MISC ChangeLog 39423 RMD160 254339398e819c716ea4ef0170b37fbb9523e264 SHA1 794362dbecdff3a7f0b234a8d227d4a558d3360c SHA256 6ed77b8079425c18b3e01586991a838adc39885feec59fb6c5d170ad31196d4c	21	MISC ChangeLog 39423 RMD160 254339398e819c716ea4ef0170b37fbb9523e264 SHA1 794362dbecdff3a7f0b234a8d227d4a558d3360c SHA256 6ed77b8079425c18b3e01586991a838adc39885feec59fb6c5d170ad31196d4c
24	MISC metadata.xml 251 RMD160 e6e718c1f8c8ab33331fcdc2ed16dc7da35d04aa SHA1 a753e5190a6008a77db021b70d5962cbc2e9e488 SHA256 689bc8ac5839e4eb6173899024bf1f6169a5d3f3a1e82e4cdd80011e3e43a8de	22	MISC metadata.xml 251 RMD160 e6e718c1f8c8ab33331fcdc2ed16dc7da35d04aa SHA1 a753e5190a6008a77db021b70d5962cbc2e9e488 SHA256 689bc8ac5839e4eb6173899024bf1f6169a5d3f3a1e82e4cdd80011e3e43a8de
25	-----BEGIN PGP SIGNATURE-----
26	Version: GnuPG v2.0.11 (GNU/Linux)
27
28	iEYEARECAAYFAko+HlgACgkQHB6c3gNBRYcAkACcC4o3U6wQfYkkhW3Gq3/fQ0eM
29	arkAoJ1QROOcjLqL4L/7B9RTq5rrIII5
30	=anC/
31	-----END PGP SIGNATURE-----

Line 0 Link Here

(-)a/media-libs/mesa/files/nullptr.patch (+22 lines)
	1	commit 1dbbc39f48ce5f9aa63ab42930b14e48938b326f
	2	Author: Brian Paul <brianp@vmware.com>
	3	Date: Mon Jun 22 11:23:30 2009 -0600
	4
	5	intel: added a null ptr check
	6
	7	This was hit during screen tear-down.
	8
	9	diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
	10	index 54f6038..5a1314e 100644
	11	--- a/src/mesa/drivers/dri/intel/intel_fbo.c
	12	+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
	13	@@ -345,7 +345,8 @@ intel_renderbuffer_set_region(struct intel_renderbuffer *rb,
	14	intel_region_reference(&rb->region, region);
	15	intel_region_release(&old);
	16
	17	- rb->pfPitch = region->pitch;
	18	+ if (region)
	19	+ rb->pfPitch = region->pitch;
	20	}
	21
	22	/**