[Mesa-dev] [PATCH 1/1] Link libEGL.so against libglapi.so

[Chia-I Wu]

On Fri, Jan 28, 2011 at 9:22 AM, Jammy Zhou <jammy.zhou at linaro.org> wrote:
> Just to make sure that this patch was sent out, so replied again here.
>
> Hi Chia-I,
>
> Could you please review this small patch?
Sorry for the slow response.  I recently had a surgery and I was not
able to spend much time on my inbox.  I will start catching up in the
following weekend.

When _glapi_get_proc_address is missing, I think egl_dri2 should
dlopen libglapi.so.  If --enable-shared-glapi is not given (libGL.so
does not use the shared libglapi.so), egl_dri2 should disable
EGL_OPENGL_BIT as libglapi.so and libGL.so are conflicting.

> Regards,
> Jammy
>
> On Thu, Jan 27, 2011 at 1:32 PM, Jammy Zhou <jammy.zhou at linaro.org> wrote:
>>
>> egl_dri2 has been made built-in driver of EGL recently, and it depends on
>> _glapi_get_proc_address symbol, which is defined in libglapi.so. So add
>> the dependency of libglapi.so to libEGL
>>
>> Signed-off-by: Jammy Zhou <jammy.zhou at linaro.org>
>> ---
>>  src/egl/main/Makefile |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
>> index c710631..fcbce2b 100644
>> --- a/src/egl/main/Makefile
>> +++ b/src/egl/main/Makefile
>> @@ -58,7 +58,7 @@ LOCAL_LIBS =
>>  ifeq ($(filter dri2, $(EGL_DRIVERS_DIRS)),dri2)
>>  LOCAL_CFLAGS += -D_EGL_BUILT_IN_DRIVER_DRI2
>>  LOCAL_LIBS += $(TOP)/src/egl/drivers/dri2/libegl_dri2.a
>> -EGL_LIB_DEPS += $(XCB_DRI2_LIBS) $(LIBUDEV_LIBS) $(DLOPEN_LIBS)
>> $(LIBDRM_LIB)
>> +EGL_LIB_DEPS += $(XCB_DRI2_LIBS) $(LIBUDEV_LIBS) $(DLOPEN_LIBS)
>> $(LIBDRM_LIB) -l$(GLAPI_LIB)
>>  endif
>>  ifeq ($(filter glx, $(EGL_DRIVERS_DIRS)),glx)
>>  LOCAL_CFLAGS += -D_EGL_BUILT_IN_DRIVER_GLX
>> --
>> 1.7.1
>>
>
>



-- 
olv at LunarG.com