[Glamor] [PATCH] Use GBM_LIBS and GBM_CFLAGS

Christian König deathsimple at vodafone.de
Fri Aug 23 07:00:36 PDT 2013


Am 23.08.2013 07:38, schrieb Michel Dänzer:
> On Don, 2013-08-22 at 08:11 -0600, Christian König wrote:
>> From: Christian König <christian.koenig at amd.com>
>>
>> Signed-off-by: Christian König <christian.koenig at amd.com>
>> ---
>>   src/Makefile.am |   10 ++++++++--
>>   1 file changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/Makefile.am b/src/Makefile.am
>> index 4beb559..c1759c6 100644
>> --- a/src/Makefile.am
>> +++ b/src/Makefile.am
>> @@ -64,9 +64,15 @@ LIBGLAMOREGL = libglamoregl.la
>>   module_LTLIBRARIES = $(LIBGLAMOREGL)
>>   libglamoregl_la_DEPENDENCIES = libglamor.la
>>   libglamoregl_la_LDFLAGS = -avoid-version -module
>> -libglamoregl_la_LIBADD = $(EGL_LIBS) $(GLX_SYS_LIBS) libglamor.la
>> +libglamoregl_la_LIBADD = $(EGL_LIBS) $(GLX_SYS_LIBS) $(GBM_LIBS) libglamor.la
>>   libglamoregl_la_SOURCES = glamor_eglmodule.c $(top_srcdir)/src/glamor_egl.c
>> -libglamoregl_la_CFLAGS = $(AM_CFLAGS) $(GLX_DEFINES) -I$(top_srcdir)/src $(LIBDRM_CFLAGS) $(EGL_CFLAGS)
>> +libglamoregl_la_CFLAGS = \
>> +	$(AM_CFLAGS) \
>> +	$(GLX_DEFINES) \
>> +	-I$(top_srcdir)/src \
>> +	$(LIBDRM_CFLAGS) \
>> +	$(EGL_CFLAGS) \
>> +	$(GBM_CFLAGS)
>>   endif
>>   
>>
> Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

I don't have commit access to that repository, can you commit this stuff?

We should also add a check that EGL support the drm platform, otherwise 
we run into a segmentation fault without a good hint for the user what 
is going wrong.

Christian.


More information about the Glamor mailing list