geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

always define HAVE_CAIRO 

Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
main
Eric Engestrom 2018-01-26 15:15:29 +00:00
parent ec53f4808c
commit d2b0a4ec70
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -466,6 +466,8 @@ if test "x$CAIRO" = xyes; then
AC_MSG_ERROR([Cairo support required but not present]) AC_MSG_ERROR([Cairo support required but not present])
fi fi
AC_DEFINE(HAVE_CAIRO, 1, [Have Cairo support]) AC_DEFINE(HAVE_CAIRO, 1, [Have Cairo support])
else
AC_DEFINE(HAVE_CAIRO, 0)
fi fi
AC_MSG_RESULT([$CAIRO]) AC_MSG_RESULT([$CAIRO])
AM_CONDITIONAL(HAVE_CAIRO, [test "x$CAIRO" = xyes]) AM_CONDITIONAL(HAVE_CAIRO, [test "x$CAIRO" = xyes])

4
meson.build
View File

@ -256,15 +256,13 @@ foreach t : [[with_intel, 'INTEL'], [with_vmwgfx, 'VMWGFX'],
[with_exynos, 'EXYNOS'], [with_exynos, 'EXYNOS'],
[with_vc4, 'VC4'], [with_vc4, 'VC4'],
[with_freedreno_kgsl, 'FREEDRENO_KGSL'], [with_freedreno_kgsl, 'FREEDRENO_KGSL'],
[dep_cairo.found(), 'CAIRO'],
[with_radeon, 'RADEON']] [with_radeon, 'RADEON']]
config.set10('HAVE_@0@'.format(t[1]), t[0]) config.set10('HAVE_@0@'.format(t[1]), t[0])
endforeach endforeach
if with_freedreno_kgsl and not with_freedreno if with_freedreno_kgsl and not with_freedreno
error('cannot enable freedreno-kgsl without freedreno support') error('cannot enable freedreno-kgsl without freedreno support')
endif endif
if dep_cairo.found()
config.set10('HAVE_CAIRO', true)
endif
if dep_valgrind.found() if dep_valgrind.found()
config.set10('HAVE_VALGRIND', true) config.set10('HAVE_VALGRIND', true)
endif endif

4
tests/util/pattern.c
View File

@ -34,7 +34,7 @@
#include <drm_fourcc.h> #include <drm_fourcc.h>
#ifdef HAVE_CAIRO #if HAVE_CAIRO
#include <cairo.h> #include <cairo.h>
#include <math.h> #include <math.h>
#endif #endif
@ -546,7 +546,7 @@ static void fill_smpte(const struct util_format_info *info, void *planes[3],
static void make_pwetty(void *data, unsigned int width, unsigned int height, static void make_pwetty(void *data, unsigned int width, unsigned int height,
unsigned int stride, uint32_t format) unsigned int stride, uint32_t format)
{ {
#ifdef HAVE_CAIRO #if HAVE_CAIRO
cairo_surface_t *surface; cairo_surface_t *surface;
cairo_t *cr; cairo_t *cr;
cairo_format_t cairo_format; cairo_format_t cairo_format;