On Tue, Feb 10, 2009 at 4:10 PM, Ian Romanick <i...@paranormal-entertainment.com> wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Brian Paul wrote: >> Brian Paul wrote: >>> Over the next day or so we're going to merge the gallium-0.2 branch to >>> master. master and gallium-0.2 are both development branches and >>> keeping the core Mesa work synced between them is a bit of PITA. >>> >>> To work out the kinks I'll be pushing a short term >>> "gallium-master-merge" branch for testing/fixing before going to master. >>> >>> In terms of the build system, we'll initially default to the non-gallium >>> build. To build with gallium I'll add some new configs like >>> 'linux-gallium'. >> >> OK, I think the "gallium-master-merge" branch is in pretty good shape >> now. I encourage people to grab it, build it and test. You should >> probably run 'make realclean' before building. >> >> If there's no issues I'll probably merge to master within 24 hours. > > There's an issue. The non-Gallium build is broken beyond all > recognition. Configuring with './configure > - --with-dri-driver=swrast,i915,i965' dies in src/gallium/drivers/nv04. > If I'm not doing a Gallium build, why is it building src/gallium? If > I'm not building the nouveau driver, why is it in drivers/nv04?
Jerome commented out the DRI_DIRS part and some other stuff in the gallium branch and that's been merged in. I was going to take a look at it a little later, but if you just want to get a non-gallium build, you may want to revert 14f79d46. http://cgit.freedesktop.org/mesa/mesa/commit/?id=14f79d46 -- Dan ------------------------------------------------------------------------------ Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM) software. With Adobe AIR, Ajax developers can use existing skills and code to build responsive, highly engaging applications that combine the power of local resources and data with the reach of the web. Download the Adobe AIR SDK and Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com _______________________________________________ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
