[Mesa-dev] failed to compile mesa

[Dan Nicholson]

On Mon, Apr 19, 2010 at 6:31 AM, Jakob Bornecrantz <wallbraker at gmail.com> wrote:
> On Mon, Apr 19, 2010 at 2:11 PM, Dan Nicholson <dbn.lists at gmail.com> wrote:
>> On Sun, Apr 18, 2010 at 1:51 PM, Jakob Bornecrantz <wallbraker at gmail.com> wrote:
>>> On Sun, Apr 18, 2010 at 6:40 PM, CSJ <changsijay at gmail.com> 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?
>
> Go ahead and merge it yourself, I just tried it and I got no conflicts
> so there shouldn't be any problems for you.

Well, it depends on changes that are in my tree. :)

> I would say in this case you could do the fix twice in 7.8 and the
> master and fix the merge conflict, so master is never broken. Just as
> long as you do the merge so that other people don't have to figure out
> what goes on. At least that what would have done, it could be frowned
> upon by other devs.

Sounds good. I guess I thought there was more of a policy on when
merging stable to master happened that I just wasn't privy to. I'll
just do a local merge and then push both branches at the same time.

--
Dan