From cbd8f09d867e3cee760aa8cef3da4805191d8257 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Tue, 5 Aug 2014 08:23:31 +0900 Subject: [PATCH] set the DEFINE according to the version of capi-base-common Change-Id: I4b2126808c5e7c3793f847401e627c60c70d6443 --- configure.ac | 6 ++++-- src/tbm_surface.c | 20 +++++++++++++++----- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index de98d92..a338076 100644 --- a/configure.ac +++ b/configure.ac @@ -53,8 +53,10 @@ PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) PKG_CHECK_MODULES(LIBDRM, libdrm) PKG_CHECK_MODULES(LIBDRI2, libdri2) PKG_CHECK_MODULES(X11, x11) -PKG_CHECK_MODULES(CAPI, capi-base-common) -# PKG_CHECK_MODULES(CAPI, capi-base-common >= 0.1.1) +PKG_CHECK_MODULES(CAPI, [capi-base-common >= 0.1.1], [capi_0.1.1=yes], [capi_0.1.1=no]) +if test x"$capi_0.1.1" = xyes; then + AC_DEFINE(HAVE_CAPI_0_1_1,1,[The version of capi-base-common is over 0.1.1]) +fi LIBTBM_CFLAGS="$PTHREADSTUBS_CFLAGS $LIBDRM_CFLAGS $LIBDRI2_CFLAGS $X11_CFLAGS $CAPI_CFLAGS" LIBTBM_LIBS="$PTHREADSTUBS_LIBS $LIBDRM_LIBS $LIBDRI2_LIBS $X11_LIBS $CAPI_LIBS" diff --git a/src/tbm_surface.c b/src/tbm_surface.c index 19d6f2c..5002c72 100755 --- a/src/tbm_surface.c +++ b/src/tbm_surface.c @@ -99,7 +99,9 @@ tbm_surface_create (int width, int height, tbm_format format) { if (!(width > 0) || !(height > 0)) { - //set_last_result (TBM_SURFACE_ERROR_INVALID_PARAMETER); +#ifdef HAVE_CAPI_0_1_1 + set_last_result (TBM_SURFACE_ERROR_INVALID_PARAMETER); +#endif return NULL; } @@ -113,11 +115,15 @@ tbm_surface_create (int width, int height, tbm_format format) surf = tbm_surface_internal_create_with_flags (gBufMgr, width, height, format, TBM_BO_DEFAULT); if (!surf) { - //set_last_result (TBM_SURFACE_ERROR_INVALID_OPERATION); +#ifdef HAVE_CAPI_0_1_1 + set_last_result (TBM_SURFACE_ERROR_INVALID_OPERATION); +#endif return NULL; } - //set_last_result (TBM_SURFACE_ERROR_NONE); +#ifdef HAVE_CAPI_0_1_1 + set_last_result (TBM_SURFACE_ERROR_NONE); +#endif return surf; } @@ -216,13 +222,17 @@ tbm_surface_get_format (tbm_surface_h surface) { if (surface) { - //set_last_result (TBM_SURFACE_ERROR_INVALID_PARAMETER); +#ifdef HAVE_CAPI_0_1_1 + set_last_result (TBM_SURFACE_ERROR_INVALID_PARAMETER); +#endif return 0; } struct _tbm_surface *surf = (struct _tbm_surface *)surface; - //set_last_result (TBM_SURFACE_ERROR_NONE); +#ifdef HAVE_CAPI_0_1_1 + set_last_result (TBM_SURFACE_ERROR_NONE); +#endif return surf->info.format; } -- 2.7.4