[Mesa-dev] [PATCH 3/3] configure: check for core xcb (libxcb.so) and link VL targets against it.

[Emil Velikov]

On 12/07/14 10:28, Christian König wrote:
> Am 12.07.2014 01:13, schrieb Emil Velikov:
>> Make sure to check the presence of the module in order to pick the
>> correct libs flag and before feeding them to the compiler/linker.
>>
>> Current libXvMC*, libvdpau* and libomx_mesa depends unconditionally
>> upon xcb, due to their usage of the aux/vl gellium module.
> 
> Small typo "gellium" instead of "gallium".
> 
>>
>> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> 
> The dependency to x11-xcb and xcb-dri2 doesn't pull in core xcb as well?
> 
It (implicitly) pulls the system xcb, rather than the one available in the
custom prefix. If the system's xcb api does not match the one requested/used
by mesa, the build will just break :'(

Cheers,
Emil

> Anyway patch looks good to me and is Reviewed-by: Christian König
> <christian.koenig at amd.com>
> 
> Regards,
> Christian.
> 
>> ---
>>   configure.ac | 8 ++++----
>>   1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index dd827be..7755741 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -1413,22 +1413,22 @@ if test -n "$with_gallium_drivers" -a
>> "x$with_gallium_drivers" != xswrast; then
>>   fi
>>     if test "x$enable_xvmc" = xyes; then
>> -    PKG_CHECK_MODULES([XVMC], [xvmc >= $XVMC_REQUIRED x11-xcb xcb-dri2 >=
>> $XCBDRI2_REQUIRED])
>> +    PKG_CHECK_MODULES([XVMC], [xvmc >= $XVMC_REQUIRED x11-xcb xcb xcb-dri2
>> >= $XCBDRI2_REQUIRED])
>>       GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xvmc"
>>       enable_gallium_loader=yes
>>   fi
>>   AM_CONDITIONAL(HAVE_ST_XVMC, test "x$enable_xvmc" = xyes)
>>     if test "x$enable_vdpau" = xyes; then
>> -    PKG_CHECK_MODULES([VDPAU], [vdpau >= $VDPAU_REQUIRED x11-xcb xcb-dri2
>> >= $XCBDRI2_REQUIRED],
>> -                      [VDPAU_LIBS="`$PKG_CONFIG --libs x11-xcb xcb-dri2`"])
>> +    PKG_CHECK_MODULES([VDPAU], [vdpau >= $VDPAU_REQUIRED x11-xcb xcb
>> xcb-dri2 >= $XCBDRI2_REQUIRED],
>> +                      [VDPAU_LIBS="`$PKG_CONFIG --libs x11-xcb xcb
>> xcb-dri2`"])
>>       GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS vdpau"
>>       enable_gallium_loader=yes
>>   fi
>>   AM_CONDITIONAL(HAVE_ST_VDPAU, test "x$enable_vdpau" = xyes)
>>     if test "x$enable_omx" = xyes; then
>> -    PKG_CHECK_MODULES([OMX], [libomxil-bellagio >=
>> $LIBOMXIL_BELLAGIO_REQUIRED x11-xcb xcb-dri2 >= $XCBDRI2_REQUIRED])
>> +    PKG_CHECK_MODULES([OMX], [libomxil-bellagio >=
>> $LIBOMXIL_BELLAGIO_REQUIRED x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED])
>>       GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS omx"
>>       enable_gallium_loader=yes
>>   fi
>