On Mon, 2010-04-19 at 06:11 -0700, Dan Nicholson wrote: > On Sun, Apr 18, 2010 at 1:51 PM, Jakob Bornecrantz <[email protected]> > wrote: > > On Sun, Apr 18, 2010 at 6:40 PM, CSJ <[email protected]> wrote: > >> Hi, Dan > >> > >> This patch works with > >> ./autogen.sh --prefix="$PREFIX" --enable-xcb --with-dri-drivers=i915 > >> --disable-gallium --without-demos > >> > >> if I use > >> ./autogen.sh --prefix="$PREFIX" --enable-xcb --with-dri-drivers=i915 > >> --disable-gallium > >> it failed as attached with-demos.log. > >> > >> if I use > >> ./autogen.sh --prefix="$PREFIX" --enable-xcb --without-dri-drivers > >> --enable-gallium-intel > >> it failed as attach intel-gallium-enabled.log > > > > Add --disable-egl for now. It looks like the gallium egl driver > > assumes X headers are installed. > > So, I'm fixing this right now, but running into an issue with 7.8 vs. > master. On 7.8 there is progs/egl/*.c, but on master there are > subdirectories there. So, if I want to make the fixes on 7.8 as per > current mesa rules, I'll have to wait for them to get merged forward > to master and then make another commit on master to fix it when that > happens. > > What's the policy on merging 7.8 into master? Can I do it myself or > can I request someone else does it?
You can, and in fact everyone should be encouraged to merge their fixes right away - if everyone merged their own fixes, nobody should have to deal with conflicts from unrelated fixes. -- Earthling Michel Dänzer | http://www.vmware.com Libre software enthusiast | Debian, X and DRI developer _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
