[patch] Add another commit mentioned on upstream bug.

nullptr_and_assert.patch (text/plain), 6.02 KB, created by Alex Bennee on 2009-06-23 16:45:37 UTC

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 1dc05d3..7d802ff 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,10 +1,9 @@
------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 assertfix.patch 879 RMD160 a017d6117d7fb3629642decc11c5b7f4269b8a53 SHA1 6c7e88d92333ebb662eb22a93562bfb2a71bd69d SHA256 a083f2cb53c6ce8076981cd3ad60dd8d252195e7a0044b2d901e226fc4d19b2d
 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
@@ -19,13 +18,6 @@ EBUILD mesa-7.1.ebuild 7237 RMD160 9cf2b1f7023071ef801019c3a08334b01668bf8d SHA1
 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 7727 RMD160 df2d6717da22a38f89691efcc9fbc353c383ee78 SHA1 0007586afa4e417e45a22f4b8638c6247819c84a SHA256 19ec309998de434d3327eaa5e2dd967cfcc6bd8d98c97a7139eab2e10aa10e54
+EBUILD mesa-7.4.3.ebuild 7888 RMD160 a65d6c19c593c2a281e7049639d528eac9b5882a SHA1 b7e1deeeca21f6ce8be7ea834037ef2925472023 SHA256 b7ed8aaa765a709923ae23fe51f7c70b7fada6873f16666bb9d4719c2b112336
 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-----
diff --git a/media-libs/mesa/files/assertfix.patch b/media-libs/mesa/files/assertfix.patch
new file mode 100644
index 0000000..1857ad5
--- /dev/null
+++ b/media-libs/mesa/files/assertfix.patch
@@ -0,0 +1,24 @@
+commit 4b8cd0b0ad48c3b0129451924f7461ffcbbc8597
+Author: Brian Paul <[e-mail]>
+Date:   Mon Jun 22 11:23:13 2009 -0600
+
+    intel: call _mesa_unreference_framebuffer() in intelDestroyBuffer()
+    
+    This was a call to _mesa_reference_framebuffer(ptr, NULL) but the NULL
+    pointer is incorrect in Mesa 7.4.x.
+    
+    Fixes a failed assertion during screen tear-down.
+
+diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
+index 59fa54f..8d2a3a7 100644
+--- a/src/mesa/drivers/dri/intel/intel_screen.c
++++ b/src/mesa/drivers/dri/intel/intel_screen.c
+@@ -409,7 +409,7 @@ intelDestroyBuffer(__DRIdrawablePrivate * driDrawPriv)
+       }
+    }
+ 
+-   _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
++   _mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)));
+ }
+ 
+ 
diff --git a/media-libs/mesa/files/nullptr.patch b/media-libs/mesa/files/nullptr.patch
new file mode 100644
index 0000000..5aeeeb2
--- /dev/null
+++ b/media-libs/mesa/files/nullptr.patch
@@ -0,0 +1,22 @@
+commit 1dbbc39f48ce5f9aa63ab42930b14e48938b326f
+Author: Brian Paul <[e-mail]>
+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;
+ }
+ 
+ /**
diff --git a/media-libs/mesa/mesa-7.4.3.ebuild b/media-libs/mesa/mesa-7.4.3.ebuild
index 2e86295..7cc11a1 100644
--- a/media-libs/mesa/mesa-7.4.3.ebuild
+++ b/media-libs/mesa/mesa-7.4.3.ebuild
@@ -109,6 +109,11 @@ pkg_setup() {
 
 src_unpack() {
 	[[ $PV = 9999* ]] && git_src_unpack || unpack ${A}
+
+	# Fix null ptr check (https://bugs.freedesktop.org/show_bug.cgi?id=22408)
+	cd "${S}"
+	epatch "${FILESDIR}/nullptr.patch"
+	epatch "${FILESDIR}/assertfix.patch"
 }
 
 src_prepare() {