Eric Anholt wrote: > On Tue, 2008-08-19 at 18:20 -0600, Brian Paul wrote: >> Dave Airlie wrote: >>>> On Sun, Aug 17, 2008 at 12:23:06 +0200, Stefan Dirsch wrote: >>>> >>>>> Looks like dri_bufmgr.h/intel_bufmgr.h are missing in the >>>>> tarball. Could this be? >>>>> >>>> See my other reply on mesa3d-dev, they're from libdrm git master. >>> So I see a couple of ways to resolve this, >>> >>> 1) Back out GEM, release 7.1, put GEM back in - preferred by me. >> That occured to me too and I think I prefer it as well. >> >> What I'd probably do then is create a mesa-7.2 branch, based on 7.1, >> which will be a stable, bug-fix branch without GEM. > > Sorry. When I did the merge, someone had told me that 7.1 had already > been branched, and I didn't check before the merge. I agree, for 7.1 it > should be without GEM. Could you just cut the branchpoint before my > merge? If I've caused too much pain and you want everything that's > happened in master except for GEM on the branch, I could do that work > for you (just say so).
I know I've commited a fair number of changes on master since you added the GEM code. I have a feeling it might be easier for you to back-out the GEM code, make a branch, then re-add GEM on master. Besides, your git-fu is probably much better than mine. The branch should be called "mesa_7_2_branch". I'll make a 7.1 release off that quickly, then designate it a bug-fix only branch, leading to the 7.2 release. OK, Eric? > Our plan for our quarterly release is to take whatever is the most > 7.1-ish and include GEM on top of that. But the timeframe for that is > the next couple of months, not the next couple of days. -Brian ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
