Add some upstream fixes that re-order GL context destruction in the ati

drivers to avoid a possible NULL dereference.

I've also restored the entire ChangeLog, as it appears to have been truncated
during Diego's last commit.
(Portage version: 2.1_pre7-r5)

5 files changed, 787 insertions, 14 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 2e6297edd154..ccac68bfc9aa 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.77 2006/04/08 21:57:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.78 2006/04/12 02:49:02 joshuabaergen Exp $
+
+*mesa-6.5-r1 (12 Apr 2006)
+
+  12 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/6.5-re-order-context-destruction.patch, +mesa-6.5-r1.ebuild:
+  Add some upstream fixes that re-order GL context destruction in the ati
+  drivers to avoid a possible NULL dereference.
+  
+  I've also restored the entire ChangeLog, as it appears to have been truncated
+  during Diego's last commit.
 
   08 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> mesa-6.4.2-r2.ebuild,
   mesa-6.5.ebuild:
@@ -8,3 +18,366 @@
   dlopen_lib() function in portability eclass. This allows to link correctly
   to libGL when using libtool on Gentoo/FreeBSD.
 
+  03 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> mesa-6.4.2-r2.ebuild,
+  mesa-6.5.ebuild:
+  Add special case for FreeBSD where libGL has only major soversion.
+
+  01 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org> mesa-6.5.ebuild:
+  Bump the libdrm dependency and fix the i810 chip series driver compile.  (Bug
+  #128328, Alex Rostovtsev)
+
+  01 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  mesa-6.4.2-r2.ebuild, mesa-6.5.ebuild:
+  Add some missing x11-proto dependencies.  (bug #128336, Steven Jenkins)
+
+*mesa-6.5 (01 Apr 2006)
+
+  01 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; +mesa-6.5.ebuild:
+  Bump for masked development release, needed for newer i810 drivers. Also
+  adds some GLSL (OpenGL Shading Language) support and lots of development in
+  r300 driver, among others.
+
+  31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> mesa-6.4.2-r2.ebuild:
+  Add ~x86-fbsd keyword.
+
+*mesa-6.4.2-r2 (12 Mar 2006)
+
+  12 Mar 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/radeon-texture-problem.patch, -mesa-6.4.2-r1.ebuild,
+  +mesa-6.4.2-r2.ebuild:
+  Fix a Radeon crash in certain applications (such as Croquet 0.3), and don't
+  compile debug code into the drivers if USE=-debug (Santiago Gala, bug
+  #125004).  Also, fix a naming conflict between SGI GLU code and glibc 2.4
+  (SpanKY, KIMURA Masaru / hiyuh, bug #125809).
+
+  28 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.4.2-r1.ebuild:
+  Make USE=debug work more nicely with FEATURES=splitdebug.
+
+*mesa-6.4.2-r1 (16 Feb 2006)
+
+  16 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/64bit-fix-have-dix-config.patch,
+  +files/64bit-fix-indirect-vertex-array.patch,
+  -files/6.4.1-amd64-include-assyntax.patch, -mesa-6.4.1-r1.ebuild,
+  -mesa-6.4.2.ebuild, +mesa-6.4.2-r1.ebuild:
+  Really fix direct rendering on amd64. Also remove old versions.
+
+  14 Feb 2006; Markus Rothe <corsair@gentoo.org> mesa-6.4.1-r1.ebuild,
+  mesa-6.4.2.ebuild:
+  Added ~ppc64
+
+  06 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.4.2.ebuild:
+  Add mach64 and tdfx to ppc defaults. Some evidence that glide-v3 works on
+  ppc exists; needs testing, and is required for tdfx 3D to work.
+
+  06 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.4.2.ebuild:
+  Add arch-dependent defaults for building 3D drivers.
+
+  03 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.4.2.ebuild:
+  Add a fake video_cards_none for people who don't want any DRI drivers, e.g.
+  if they're using binary drivers.
+
+*mesa-6.4.2 (03 Feb 2006)
+
+  03 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; +mesa-6.4.2.ebuild:
+  Bump. Port to VIDEO_CARDS. Not really any relevant upstream changes, except
+  a change in the install script to install GLw headers. Also,
+  6.4.1-amd64-include-assyntax.patch was incorporated into this release.
+
+  02 Feb 2006; Herbie Hopkins <herbs@gentoo.org> mesa-6.4.1-r1.ebuild:
+  Fix setting of the default dri drivers directory.
+
+  02 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.4.1-r1.ebuild:
+  Add USE=debug support.
+
+  31 Jan 2006; Rene Nussbaumer <killerfox@gentoo.org> mesa-6.4.1-r1.ebuild:
+  Unstable on hppa.
+
+  23 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/configurable-dri-dir.patch, mesa-6.4.1-r1.ebuild:
+  Some people don't understand what #ifndef means.
+
+  26 Dec 2005; Stefaan De Roeck <stefaan@gentoo.org> mesa-6.4.1-r1.ebuild:
+  Marked ~alpha
+
+  16 Dec 2005; Herbie Hopkins <herbs@gentoo.org>
+  +files/6.4-multilib-fix.patch, +files/configurable-dri-dir.patch,
+  mesa-6.4.1-r1.ebuild:
+  Cleaned up multilib fixes, made default dri drivers directory configurable
+  so we can set it to lib64 on multilib systems.
+
+*mesa-6.4.1-r1 (12 Dec 2005)
+
+  12 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; -mesa-6.4.1.ebuild,
+  +mesa-6.4.1-r1.ebuild:
+  Install correct libGLU.so.1.3.
+
+  09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; -mesa-6.4-r1.ebuild:
+  Pull old versions.
+
+  02 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  files/6.4.1-amd64-include-assyntax.patch:
+  Add more info to patch.
+
+  02 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/6.4.1-amd64-include-assyntax.patch, mesa-6.4.1.ebuild:
+  (#114066) Add 6.4.1-amd64-include-assyntax.patch to fix amd64 build.
+
+*mesa-6.4.1 (30 Nov 2005)
+
+  30 Nov 2005; Donnie Berkholz <spyderous@gentoo.org>; +mesa-6.4.1.ebuild:
+  New version. This is the one that's expected to be in X.Org 7.0. Fix libGL.*
+  symlink deletion so the dot really matches a dot instead of any character,
+  so other symlinks don't get deleted. (#110840) Build with PIC, since it
+  hasn't been shown to slow it down. Remove commented-out lines about OSMesa.
+  Keep using 6.4-dont-install-gles-headers.patch, so don't delete it when
+  pulling 6.4.
+
+  27 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> mesa-6.4-r1.ebuild:
+  Added Diego's patch for FreeBSD support. Closes bug #111145.
+
+  16 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> mesa-6.4-r1.ebuild:
+  Changed xorg-x11 blocker for clarity.
+
+*mesa-6.4-r1 (14 Nov 2005)
+
+  14 Nov 2005; Donnie Berkholz <spyderous@gentoo.org>; -mesa-6.4.ebuild,
+  +mesa-6.4-r1.ebuild:
+  Install GLwDrawA.h, and if USE=motif, install GLwMDrawA.h. Reported by
+  Stefaan De Roeck <stefaan@gentoo.org>.
+
+  14 Nov 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/dont-install-gles-headers.patch,
+  -files/mesa-add-dri-asm-files.patch, -mesa-6.3.2-r1.ebuild:
+  Pull old version.
+
+  11 Nov 2005; MATSUU Takuto <matsuu@gentoo.org> mesa-6.4.ebuild:
+  added ~sh keyword
+
+  01 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> mesa-6.4.ebuild:
+  Change xorg-x11 blocker to allow for rc metabuilds.
+
+*mesa-6.4 (31 Oct 2005)
+
+  31 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/6.4-dont-install-gles-headers.patch, +mesa-6.4.ebuild:
+  Bump.
+
+  30 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  mesa-6.3.2-r1.ebuild:
+  Change xorg-x11 blocker to allow for metabuilds.
+
+  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org> mesa-6.3.2-r1.ebuild:
+  added ~mips keyword
+
+  12 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.2-r1.ebuild:
+  Add runtime blocker for !<x11-base/xorg-x11-7.
+
+  12 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/lib/libOSMesa.la, -mesa-6.3.1.1-r3.ebuild, -mesa-6.3.2.ebuild:
+  Pull old ebuilds. Current versions aren't using libOSMesa.la either, so pull
+  that too.
+
+*mesa-6.3.2-r1 (20 Sep 2005)
+
+  20 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +mesa-6.3.2-r1.ebuild:
+  Mesa isn't making libGLU.so -> libGLU.so.# unversioned to versioned symlink.
+  This makes stuff trying to link against libGLU break.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  06 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  mesa-6.3.1.1-r3.ebuild, mesa-6.3.2.ebuild:
+  Add missing 'set' argument to eselect.
+
+  06 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.2.ebuild:
+  (#104367) Add xf86vidmodeproto and libICE to deps.
+
+  04 Sep 2005; Luca Barbato <lu_zero@gentoo.org> mesa-6.3.2.ebuild:
+  Marked ~ppc
+
+  03 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  mesa-6.3.1.1-r3.ebuild, mesa-6.3.2.ebuild:
+  Switching to use eselect over opengl-update.
+
+  22 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.2.ebuild:
+  Split out an arch-specific variable DRI_DRIVERS_${ARCH} for defining which
+  drivers to build. Put it up at the top, to try separating data from code.
+  Perhaps doing something similar in pkg_setup(), but having if...elif and
+  just DRI_DRIVERS, would work reasonably, but it doesn't isolate the data as
+  well.
+
+  22 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.2.ebuild:
+  Move EXTRA_LIB_PATH blanking out from within a sparc block, because it
+  should be used for everyone. Also move arch-specific section away from
+  generic sections.
+
+*mesa-6.3.2 (22 Aug 2005)
+
+  22 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/mesa-add-dri-asm-files.patch, +mesa-6.3.2.ebuild:
+  Bump to latest devel release. The assembly files in DRI drivers didn't get
+  packaged, so add mesa-add-dri-asm-files.patch to patch them in. I think this
+  release will also fix 32/64 systems, if they also have the latest DRM.
+
+  22 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/fix-include-locations.patch, -files/fix-xthreads-location.patch,
+  -files/use-xthreads.patch, -mesa-6.3.1.1.ebuild, -mesa-6.3.1.1-r1.ebuild,
+  -mesa-6.3.1.1-r2.ebuild:
+  Pull old versions.
+
+  20 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  mesa-6.3.1.1-r3.ebuild:
+  Stop installing glut headers to avoid conflicts with virtual/glut providers.
+  Reported by Andrej Kacian <ticho@gentoo.org>.
+
+  17 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  mesa-6.3.1.1-r3.ebuild:
+  Add x11-proto/printproto to DEPEND on USE=motif.
+
+  16 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  mesa-6.3.1.1-r3.ebuild:
+  libOSMesa isn't building anymore, so stop symlinking and installing libtool
+  archives.
+
+*mesa-6.3.1.1-r3 (16 Aug 2005)
+
+  16 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +mesa-6.3.1.1-r3.ebuild:
+  Fix direct rendering on r200 by adding USING_EGL=0. Turning off EGL takes a
+  lot of work.
+
+  15 Aug 2005; Herbie Hopkins <herbs@gentoo.org> mesa-6.3.1.1-r2.ebuild:
+  Fix multilib issue and add ~amd64 keyword.
+
+  15 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  mesa-6.3.1.1-r2.ebuild:
+  Install libGL.la to /usr/lib/opengl/xorg-x11/lib, where libGL.so really is,
+  instead of /usr/lib. This only seems necessary because of the LDPATH hack in
+  opengl-update.
+
+*mesa-6.3.1.1-r2 (14 Aug 2005)
+
+  14 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/change-default-dri-driver-dir.patch,
+  +files/dont-install-gles-headers.patch, +mesa-6.3.1.1-r2.ebuild:
+  Stop building EGL things, because they aren't ready upstream. Also the EGL
+  demos rely on glut, which creates a circular dependency. Change the default
+  DRI driver directory to the one we actually use. This should be enough to
+  get direct rendering working.
+
+*mesa-6.3.1.1-r1 (12 Aug 2005)
+
+  12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +mesa-6.3.1.1-r1.ebuild:
+  Bump to update to CVS head as of yesterday.
+
+  12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.1.1.ebuild:
+  Turn parallel build back off. Can get problems with depend files not existing.
+
+  12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.1.1.ebuild:
+  Test out parallel make. fmccor says it works.
+
+  12 Aug 2005; Ferris McCormick <fmccor@gentoo.org> mesa-6.3.1.1.ebuild:
+  1. General cleanup for sparc, get rid of the ill-considered
+     IUSE=dri;
+  2. Make sure to install the actual dri drivers as well as the
+     base libGL package.
+
+  11 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; Manifest:
+  Fix manifest.
+
+  11 Aug 2005; Ferris McCormick <fmccor@gentoo.org> mesa-6.3.1.1.ebuild:
+  Following changes build a reunning libGL for sparc testing and set
+  a sane set of DRI drivers, depending on USE=dri flag:
+  1.	With dri, sparc assembly appears to be unusable.  This is because
+  	the build and directory structures have been changed so that the
+  	actual initialization code moves to the dri drivers themselves
+  	when sparc assembly is built.  Correcting this is nontrivial,
+  	because the glx build uses hard-defined source names and paths.
+  2.	With USE=dri, on sparc build only a subset of the full complement
+  	of drivers.  For now, DRI_DIRS = fb ffb mach64 mga radeon savage
+  3.  Without USE=dri, change the target to (generic) linux-sparc.  In
+  	this case, architecture is actually set by CFLAGS passed in to the
+  	configure target, and both glx-capable and stand-alone versions
+  	of libGL are built.
+  4.  For testing, and perhaps ultimately for performance, on sparc, unless
+  	USE=dri, do not fix_opengl_symlinks
+  With these changes in place,
+  LD_LIBRARY_PATH=<path-to-libGL>:<path-to-libGLU> some-libGL-program
+  works fine.
+
+  10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/fix-include-locations.patch, mesa-6.3.1.1.ebuild:
+  Add fix-include-locations.patch to standardize include locations to
+  <X11/extensions/foo.h> instead of some mixture of <foo.h> and "foo.h."
+
+  10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/makedepend-location.patch, mesa-6.3.1.1.ebuild:
+  Add makedepend-location.patch to stop mesa from looking in /usr/X11R6/bin.
+
+  10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.1.1.ebuild:
+  Add dep on >=x11-proto/glproto-1.4-r1.
+
+  10 Aug 2005; Ferris McCormick <fmccor@gentoo.org> mesa-6.3.1.1.ebuild:
+  1.  Correct echo "$(...)" to echo "\$(...)";
+  2.  When building for sparc, make sure that:
+  	a.  Use sparc assembly versions where appropriate;
+  	b.  Make sure sparc-specific sources are built;
+  	c.  For testing, don't actually build the dri drivers
+  	    because they are known not to work.
+  	d.  TODO:  Figure out why two versions of libGL are built,
+  		and why the install ends up linking to the incorrect
+  		version (the one with the undefined externals).
+
+  10 Aug 2005; Ferris McCormick <fmccor@gentoo.org> mesa-6.3.1.1.ebuild:
+  Add ~sparc keyword (X modular testing).
+
+  10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.1.1.ebuild:
+  Add dep on >=opengl-update-2.2.2.
+
+  10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.1.1.ebuild:
+  Add fix_opengl_symlinks() from xorg-x11, to set up the libGL symlinks.
+
+  10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.1.1.ebuild:
+  Stop cleaning out /usr/lib/opengl/xorg-x11, now that two other packages also
+  install to it.
+
+  10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; -mesa-3.5.ebuild:
+  Drop old version.
+
+*mesa-6.3.1.1 (10 Aug 2005)
+
+  10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/fix-xthreads-location.patch, +files/lib/libGL.la,
+  +files/lib/libGLU.la, +files/lib/libOSMesa.la, +files/use-xthreads.patch,
+  +mesa-6.3.1.1.ebuild:
+  Add for modular X.
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> mesa-3.5.ebuild:
+  Fix use invocation
+
+  24 Nov 2003; Aron Griffis <agriffis@gentoo.org> mesa-3.5.ebuild:
+  Add ~alpha
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*mesa-3.5 (22 Jul 2002)
+
+  22 Jul 2002; Seemant Kulleen <seemant@gentoo.org> mesa-3.5.ebuild
+  files/digest-mesa-3.5 :
+
+  This was updated a while ago. I repoman'd it, and cleaned up spacing and
+  syntax a little.
+
+*mesa-3.4.2 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 5d84be697d9c..fe255c4e924c 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,15 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 184cab696e5be1eea2dfc727c51eed34 ChangeLog 506
-RMD160 3b689497aa5fefcc447d65fbe92137214adfda5f ChangeLog 506
-SHA256 17241c79738662f1a30501532289711bc3de6e60748d2237f68dae3dca8d1e6d ChangeLog 506
+MD5 c2b08b897ea9a7d618e4744264a40f65 ChangeLog 15753
+RMD160 e74d6723b120949038cf8f2e5a184e521ac31d97 ChangeLog 15753
+SHA256 621c68acd0c0f1e6d609c98e4319dae083105257b17d65909d0aa25c97546fd4 ChangeLog 15753
 MD5 ae36bba4e878c77dc2e823ce00e98869 files/6.4-dont-install-gles-headers.patch 421
 RMD160 70713f143d080b444089a95712efd227227c523f files/6.4-dont-install-gles-headers.patch 421
 SHA256 8f636c2e09ac7fdab0d06ebe62af5a311b52a03bf7b7bdecf4789a6e30e0777e files/6.4-dont-install-gles-headers.patch 421
 MD5 d6254b7a775480084efcd30d9fb4cbad files/6.4-multilib-fix.patch 535
 RMD160 5ab0237e5096728b38675c9c265cfb2c88009c00 files/6.4-multilib-fix.patch 535
 SHA256 8fe39ec2ca86b206cb0d870d6644f68eb52af209f5bfb6eaad612deee80d754f files/6.4-multilib-fix.patch 535
+MD5 621322964afb60d36444f1dfe86719b2 files/6.5-re-order-context-destruction.patch 2295
+RMD160 5c2648f9d4fca2f3abf53ad9d29101fd931493be files/6.5-re-order-context-destruction.patch 2295
+SHA256 64fc2ec01fb786a5f2d861449e6243bf41e6c4e40031c9713b5ad34e3a6fcde9 files/6.5-re-order-context-destruction.patch 2295
 MD5 0009bfb15983cd6258cde8ca9ec7134c files/64bit-fix-have-dix-config.patch 645
 RMD160 4a05bcdab2828f9b5ad80df80d63d4767617b756 files/64bit-fix-have-dix-config.patch 645
 SHA256 757a94fe2e76f6ea4d831a3aaf3fac7e344527239a10b014d6900af341e7abab files/64bit-fix-have-dix-config.patch 645
@@ -25,6 +25,9 @@ SHA256 097fd81c0c397325418ce66f42aa19a137843d8953e4ac9265bc4f90cf2f2ab7 files/di
 MD5 80bc8bfb6472d4dcbad6e14a2595c1a9 files/digest-mesa-6.5 241
 RMD160 069ddf1320b547a5a5cf1af3d0611a6c35398c7e files/digest-mesa-6.5 241
 SHA256 5a5ab578d50f251808ddf18cd61f6e5518224168555fc288725a8466892b4f88 files/digest-mesa-6.5 241
+MD5 80bc8bfb6472d4dcbad6e14a2595c1a9 files/digest-mesa-6.5-r1 241
+RMD160 069ddf1320b547a5a5cf1af3d0611a6c35398c7e files/digest-mesa-6.5-r1 241
+SHA256 5a5ab578d50f251808ddf18cd61f6e5518224168555fc288725a8466892b4f88 files/digest-mesa-6.5-r1 241
 MD5 f0ebdc72043e76ad7eddc4ad91349927 files/lib/libGL.la 763
 RMD160 a6882fb5d6d8ad195845bdda3bcbbef2aef79099 files/lib/libGL.la 763
 SHA256 0fb9c02b01c9b2306fac89034144bb3e87aedba0dee0a49203aa18fbf0b706bf files/lib/libGL.la 763
@@ -40,16 +43,12 @@ SHA256 01d74821fedfd3409d5aa5c7620c2d51e7f1ddad63b6b01d4bd25595afdfbbea files/ra
 MD5 ffaefbcfe50fb00810770e2342ee8430 mesa-6.4.2-r2.ebuild 9076
 RMD160 5ceb3bbe2801d01999875a670232e7966d02125f mesa-6.4.2-r2.ebuild 9076
 SHA256 458b92ef427553d05e75e0ff4ccb0a330ba5b1c7660bbd721b2ac41a871f25d8 mesa-6.4.2-r2.ebuild 9076
+MD5 0033e3b9b7f7291f39da23658c046097 mesa-6.5-r1.ebuild 8869
+RMD160 e783f7371ed95902489be72a8c5c5e7b9579bcf8 mesa-6.5-r1.ebuild 8869
+SHA256 4ac06094195dc3308f2d6f04ecb61adb2d90a1f0f6f7bd17df61233785b4f64e mesa-6.5-r1.ebuild 8869
 MD5 031467cd2fc95caabcb10b14d703344d mesa-6.5.ebuild 8810
 RMD160 7022c60019fddda6fd88ec0858a476ba8c216a10 mesa-6.5.ebuild 8810
 SHA256 2c820275f2b6c91e602fc9c1ee4032dd835bca9bb8b079d134b200aa32bf395f mesa-6.5.ebuild 8810
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEODHaAiZjviIA2XgRAmM/AJ9fdAmPVWp7xUYRScL6jc0X50yi2wCgp9cS
-GqbkAYs/S5TuwsSUPruaGkU=
-=mru/
------END PGP SIGNATURE-----
diff --git a/media-libs/mesa/files/6.5-re-order-context-destruction.patch b/media-libs/mesa/files/6.5-re-order-context-destruction.patch
new file mode 100644
index 000000000000..a882d07a6877
--- /dev/null
+++ b/media-libs/mesa/files/6.5-re-order-context-destruction.patch
@@ -0,0 +1,72 @@
+--- src/mesa/drivers/dri/r128/r128_context.c	2006/02/03 13:29:11	1.23
++++ src/mesa/drivers/dri/r128/r128_context.c	2006/04/09 17:48:28	1.24
+@@ -296,10 +296,6 @@
+       _ac_DestroyContext( rmesa->glCtx );
+       _swrast_DestroyContext( rmesa->glCtx );
+ 
+-      /* free the Mesa context */
+-      rmesa->glCtx->DriverCtx = NULL;
+-      _mesa_destroy_context(rmesa->glCtx);
+-
+       if ( release_texture_heaps ) {
+          /* This share group is about to go away, free our private
+           * texture object data.
+@@ -314,6 +310,10 @@
+ 	 assert( is_empty_list( & rmesa->swapped ) );
+       }
+ 
++      /* free the Mesa context */
++      rmesa->glCtx->DriverCtx = NULL;
++      _mesa_destroy_context(rmesa->glCtx);
++
+       /* free the option cache */
+       driDestroyOptionCache (&rmesa->optionCache);
+ 
+--- src/mesa/drivers/dri/r200/r200_context.c	2006/04/04 11:04:30	1.58
++++ src/mesa/drivers/dri/r200/r200_context.c	2006/04/09 17:48:28	1.59
+@@ -590,10 +590,6 @@
+ 	    r200VtxfmtDestroy( rmesa->glCtx );
+       }
+ 
+-      /* free the Mesa context */
+-      rmesa->glCtx->DriverCtx = NULL;
+-      _mesa_destroy_context( rmesa->glCtx );
+-
+       if (rmesa->state.scissor.pClipRects) {
+ 	 FREE(rmesa->state.scissor.pClipRects);
+ 	 rmesa->state.scissor.pClipRects = NULL;
+@@ -613,6 +609,10 @@
+ 	 assert( is_empty_list( & rmesa->swapped ) );
+       }
+ 
++      /* free the Mesa context */
++      rmesa->glCtx->DriverCtx = NULL;
++      _mesa_destroy_context( rmesa->glCtx );
++
+       /* free the option cache */
+       driDestroyOptionCache (&rmesa->optionCache);
+ 
+--- src/mesa/drivers/dri/radeon/radeon_context.c	2006/04/04 11:04:30	1.51
++++ src/mesa/drivers/dri/radeon/radeon_context.c	2006/04/09 17:48:28	1.52
+@@ -521,10 +521,6 @@
+ 	    radeonVtxfmtDestroy( rmesa->glCtx );
+       }
+ 
+-      /* free the Mesa context */
+-      rmesa->glCtx->DriverCtx = NULL;
+-      _mesa_destroy_context( rmesa->glCtx );
+-
+       _mesa_vector4f_free( &rmesa->tcl.ObjClean );
+ 
+       if (rmesa->state.scissor.pClipRects) {
+@@ -546,6 +542,10 @@
+ 	 assert( is_empty_list( & rmesa->swapped ) );
+       }
+ 
++      /* free the Mesa context */
++      rmesa->glCtx->DriverCtx = NULL;
++      _mesa_destroy_context( rmesa->glCtx );
++
+       /* free the option cache */
+       driDestroyOptionCache (&rmesa->optionCache);
+ 
diff --git a/media-libs/mesa/files/digest-mesa-6.5-r1 b/media-libs/mesa/files/digest-mesa-6.5-r1
new file mode 100644
index 000000000000..79639c7ca0fc
--- /dev/null
+++ b/media-libs/mesa/files/digest-mesa-6.5-r1
@@ -0,0 +1,3 @@
+MD5 61beda590bfc5b4a12e979d5f2d70d7a MesaLib-6.5.tar.bz2 3062363
+RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd MesaLib-6.5.tar.bz2 3062363
+SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd MesaLib-6.5.tar.bz2 3062363
diff --git a/media-libs/mesa/mesa-6.5-r1.ebuild b/media-libs/mesa/mesa-6.5-r1.ebuild
new file mode 100644
index 000000000000..cc6cd9972ec8
--- /dev/null
+++ b/media-libs/mesa/mesa-6.5-r1.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5-r1.ebuild,v 1.1 2006/04/12 02:49:02 joshuabaergen Exp $
+
+inherit eutils toolchain-funcs multilib flag-o-matic portability
+
+OPENGL_DIR="xorg-x11"
+
+MY_PN="${PN/m/M}"
+MY_P="${MY_PN}-${PV}"
+MY_SRC_P="${MY_PN}Lib-${PV}"
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE_VIDEO_CARDS="
+	video_cards_ati
+	video_cards_sunffb
+	video_cards_i810
+	video_cards_mga
+	video_cards_none
+	video_cards_s3virge
+	video_cards_savage
+	video_cards_sis
+	video_cards_tdfx
+	video_cards_trident
+	video_cards_via"
+IUSE="${IUSE_VIDEO_CARDS}
+	debug
+	motif"
+
+RDEPEND="dev-libs/expat
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+	x11-libs/libXi
+	x11-libs/libXmu
+	>=x11-libs/libdrm-2.0.1
+	x11-libs/libICE
+	app-admin/eselect-opengl
+	motif? ( virtual/motif )
+	!<=x11-base/xorg-x11-6.9"
+DEPEND="${RDEPEND}
+	x11-misc/makedepend
+	x11-proto/inputproto
+	x11-proto/xextproto
+	!hppa? ( x11-proto/xf86driproto )
+	x11-proto/xf86vidmodeproto
+	>=x11-proto/glproto-1.4-r1
+	motif? ( x11-proto/printproto )"
+
+PROVIDE="virtual/opengl virtual/glu"
+
+S="${WORKDIR}/${MY_P}"
+
+# Think about: ggi, svga, fbcon, no-X configs
+
+if use debug; then
+	if ! has splitdebug ${FEATURES}; then
+		RESTRICT="${RESTRICT} nostrip"
+	fi
+fi
+
+pkg_setup() {
+	if use debug; then
+		strip-flags
+		append-flags -g
+	fi
+
+	if [[ ${KERNEL} == "FreeBSD" ]]; then
+		CONFIG="freebsd"
+	elif use x86; then
+		CONFIG="linux-dri-x86"
+	elif use amd64; then
+		CONFIG="linux-dri-x86-64"
+	elif use ppc; then
+		CONFIG="linux-dri-ppc"
+	else
+		CONFIG="linux-dri"
+	fi
+}
+
+src_unpack() {
+	HOSTCONF="${S}/configs/${CONFIG}"
+
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/6.4-dont-install-gles-headers.patch
+	epatch ${FILESDIR}/change-default-dri-driver-dir.patch
+	epatch ${FILESDIR}/6.4-multilib-fix.patch
+	epatch ${FILESDIR}/6.5-re-order-context-destruction.patch
+
+	# Don't compile debug code with USE=-debug - bug #125004
+	if ! use debug; then
+	   einfo "Removing DO_DEBUG defs in dri drivers..."
+	   find src/mesa/drivers/dri -name *.[hc] -exec egrep -l "\#define\W+DO_DEBUG\W+1" {} \; | xargs sed -i -re "s/\#define\W+DO_DEBUG\W+1/\#define DO_DEBUG 0/" ;
+	fi
+
+
+	# Fix dprintf issues with sys-libs/glibc-2.4, see bug #125806.
+	einfo "sed for dprintf to __mesa_dprintf..."
+	sed -i -e "s:dprintf:__mesa_dprintf:g" $(grep dprintf src/glu/sgi/* -rl) \
+		|| die "sed for dprintf to __mesa_dprintf failed. :("
+
+	# Set default dri drivers directory
+	echo "DEFINES += -DDEFAULT_DRIVER_DIR='\"/usr/$(get_libdir)/xorg/modules/dri\"'" >> ${HOSTCONF}
+
+	# Configurable DRI drivers
+	if use video_cards_ati; then
+		add_drivers mach64 r128 radeon r200 r300
+	fi
+	if use video_cards_sunffb; then
+		add_drivers ffb
+	fi
+	if use video_cards_i810; then
+		add_drivers i810 i915
+	fi
+	if use video_cards_mga; then
+		add_drivers mga
+	fi
+	if use video_cards_s3virge; then
+		add_drivers s3v
+	fi
+	if use video_cards_savage; then
+		add_drivers savage
+	fi
+	if use video_cards_sis; then
+		add_drivers sis
+	fi
+	if use video_cards_tdfx; then
+		add_drivers tdfx
+	fi
+	if use video_cards_trident; then
+		add_drivers trident
+	fi
+	if use video_cards_via; then
+		add_drivers unichrome
+	fi
+
+	# Defaults based on X.Org 6.9, with some changes
+	if [[ ! -n "${VIDEO_CARDS}" ]]; then
+		if use alpha; then
+			add_drivers mga tdfx r128 r200 r300 radeon
+		elif use amd64; then
+			add_drivers i915 mga r128 r200 r300 radeon tdfx
+		elif use arm; then
+			add_drivers mga r128 r200 r300 radeon
+		elif use hppa; then
+			# no accelerated 3D on hppa
+			true
+		elif use ia64; then
+			add_drivers mach64 mga r128 r200 r300 radeon tdfx unichrome
+		elif use mips; then
+			# no accelerated 3D on mips
+			true
+		elif use ppc; then
+			add_drivers mach64 mga r128 r200 r300 radeon tdfx
+		elif use ppc64; then
+			add_drivers mga r128 r200 r300 radeon
+		elif use sparc; then
+			add_drivers ffb mach64
+		elif use x86; then
+			add_drivers i810 i915 mach64 mga r128 r200 r300 radeon s3v savage \
+				sis tdfx trident unichrome
+		fi
+	fi
+
+	# Set drivers to everything on which we ran add_drivers()
+	echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
+
+	if use sparc; then
+		einfo "Sparc assembly code is not working; deactivating"
+		echo "ASM_FLAGS =" >> ${HOSTCONF}
+		echo "ASM_SOURCES =" >> ${HOSTCONF}
+	fi
+
+	# Kill this; we don't want /usr/X11R6/lib ever to be searched in this
+	# build.
+	echo "EXTRA_LIB_PATH =" >> ${HOSTCONF}
+
+	echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
+	echo "CC = $(tc-getCC)" >> ${HOSTCONF}
+	echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
+	# bug #110840 - Build with PIC, since it hasn't been shown to slow it down
+	echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
+
+	# Removed glut, since we have separate freeglut/glut ebuilds
+	# Remove EGL, since Brian Paul says it's not ready for a release
+	echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
+
+	# Get rid of glut includes
+	rm -f ${S}/include/GL/glut*h
+
+	# r200 breaks without this, since it's the only EGL-enabled driver so far
+	echo "USING_EGL = 0" >> ${HOSTCONF}
+
+	# Don't build EGL demos. EGL isn't ready for release, plus they produce a
+	# circular dependency with glut.
+	echo "PROGRAM_DIRS =" >> ${HOSTCONF}
+
+	# Documented in configs/default
+	if use motif; then
+		# Add -lXm
+		echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
+		# Add GLwMDrawA.c
+		echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
+	fi
+}
+
+src_compile() {
+	emake -j1 ${CONFIG} || die "Build failed"
+}
+
+src_install() {
+	dodir /usr
+	make \
+		DESTDIR=${D}/usr \
+		INCLUDE_DIR=${D}/usr/include \
+		LIB_DIR=${D}/usr/$(get_libdir) \
+		install || die "Installation failed"
+
+	##
+	# Install the actual drivers --- 'make install' doesn't install them
+	# anywhere.
+	dodir /usr/$(get_libdir)/xorg/modules/dri
+	exeinto /usr/$(get_libdir)/xorg/modules/dri
+	ebegin "Installing drivers to ${EXEDESTTREE}"
+	find ${S}/lib* -name '*_dri.so' | xargs doexe
+	eend
+
+	if ! use motif; then
+		rm ${D}/usr/include/GL/GLwMDrawA.h
+	fi
+
+	# Don't install private headers
+	rm ${D}/usr/include/GL/GLw*P.h
+
+	fix_opengl_symlinks
+	dynamic_libgl_install
+
+	# Install libtool archives
+	insinto /usr/$(get_libdir)
+	# (#67729) Needs to be lib, not $(get_libdir)
+	doins ${FILESDIR}/lib/libGLU.la
+	insinto /usr/$(get_libdir)/opengl/xorg-x11/lib
+	doins ${FILESDIR}/lib/libGL.la
+
+	# On *BSD libcs dlopen() and similar functions are present directly in
+	# libc.so and does not require linking to libdl. portability eclass takes
+	# care of finding the needed library (if needed) witht the dlopen_lib
+	# function.
+	sed -i -e 's:-ldl:'$(dlopen_lib)':g' \
+		${D}/usr/$(get_libdir)/libGLU.la \
+		${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+
+	# Create the two-number versioned libs (.so.#.#), since only .so.# and
+	# .so.#.#.# were made
+	dosym libGLU.so.1.3.060401 /usr/$(get_libdir)/libGLU.so.1.3
+	dosym libGLw.so.1.0.0 /usr/$(get_libdir)/libGLw.so.1.0
+
+	# libGLU doesn't get the plain .so symlink either
+	dosym libGLU.so.1 /usr/$(get_libdir)/libGLU.so
+
+	# Figure out why libGL.so.1.5 is built (directfb), and why it's linked to
+	# as the default libGL.so.1
+}
+
+pkg_postinst() {
+	switch_opengl_implem
+}
+
+fix_opengl_symlinks() {
+	# Remove invalid symlinks
+	local LINK
+	for LINK in $(find ${D}/usr/$(get_libdir) \
+		-name libGL\.* -type l); do
+		rm -f ${LINK}
+	done
+	# Create required symlinks
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		# FreeBSD doesn't use major.minor versioning, so the library is only
+		# libGL.so.1 and no libGL.so.1.2 is ever used there, thus only create
+		# libGL.so symlink and leave libGL.so.1 being the real thing
+		dosym libGL.so.1 /usr/$(get_libdir)/libGL.so
+	else
+		dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so
+		dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1
+	fi
+}
+
+dynamic_libgl_install() {
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving libGL and friends for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
+		local x=""
+		for x in ${D}/usr/$(get_libdir)/libGL.so* \
+			${D}/usr/$(get_libdir)/libGL.la \
+			${D}/usr/$(get_libdir)/libGL.a; do
+			if [ -f ${x} -o -L ${x} ]; then
+				# libGL.a cause problems with tuxracer, etc
+				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
+			fi
+		done
+		# glext.h added for #54984
+		for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
+			fi
+		done
+	eend 0
+}
+
+switch_opengl_implem() {
+		# Switch to the xorg implementation.
+		# Use new opengl-update that will not reset user selected
+		# OpenGL interface ...
+		echo
+		eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+add_drivers() {
+	DRI_DRIVERS="${DRI_DRIVERS} $@"
+}