norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge ce2b110c110a61e35e2bc7c17f1c9cd4a44dc25f into beb7c25137b6149e6e422983b9071dd8254209f5

Browse Source
This commit is contained in:
Marcin Ślusarz 2012-08-22 12:59:46 -07:00
commit c23153a11f
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -270,6 +270,8 @@ libkmscon_static_la_SOURCES = \
src/static_misc.c \
external/htable.h \
external/htable.c
libkmscon_static_la_CPPFLAGS = \
$(AM_CPPFLAGS)
if KMSCON_HAVE_GLES2
nodist_libkmscon_static_la_SOURCES = \
@ -278,8 +280,7 @@ nodist_libkmscon_static_la_SOURCES = \
src/static_gl_shader.c \
src/static_shaders.c
libkmscon_static_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
libkmscon_static_la_CPPFLAGS += \
$(GLES2_CFLAGS)
endif

10
configure.ac
View File

@ -362,7 +362,15 @@ AM_CONDITIONAL([UTERM_HAVE_DUMB], [test x$dumb_enabled = xyes])
AM_CONDITIONAL([UTERM_HAVE_DRM], [test x$drm_enabled = xyes])
AM_CONDITIONAL([KMSCON_HAVE_GLES2], [test x$gles2_enabled = xyes])
AC_CHECK_DECLS([gbm_bo_get_stride], [], [], [[#include <gbm.h>]])
if test x$have_gbm = xyes ; then
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
CFLAGS=$GBM_CFLAGS
LIBS=$GBM_LIBS
AC_CHECK_LIB([gbm], [gbm_bo_get_stride], [AC_DEFINE([HAVE_GBM_BO_GET_STRIDE], [1], [Define to 1 if your libgbm have gbm_bo_get_stride])])
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
fi
#
# xkbcommon keyboard backend

2
src/uterm_video_drm.c
View File

@ -83,7 +83,7 @@ static int init_rb(struct uterm_display *disp, struct drm_rb *rb)
return -EFAULT;
}
#if defined(HAVE_DECL_GBM_BO_GET_STRIDE) && HAVE_DECL_GBM_BO_GET_STRIDE
#if defined(HAVE_GBM_BO_GET_STRIDE) && HAVE_GBM_BO_GET_STRIDE
stride = gbm_bo_get_stride(rb->bo);
#else
stride = gbm_bo_get_pitch(rb->bo);