Annotation of /trunk/libdrm/patches/libdrm-2.4.33-no-cairo.patch
Parent Directory
| 
Revision Log
Revision 2184 -
(hide annotations)
(download)
Wed Jun 5 11:29:26 2013 UTC (10 years, 11 months ago) by niro
File size: 1781 byte(s)
Wed Jun 5 11:29:26 2013 UTC (10 years, 11 months ago) by niro
File size: 1781 byte(s)
-added patch to disable cairo hard-dependency
| 1 | niro | 2184 | diff --git a/configure.ac b/configure.ac |
| 2 | index 290362c..8c28107 100644 | ||
| 3 | --- a/configure.ac | ||
| 4 | +++ b/configure.ac | ||
| 5 | @@ -222,11 +222,23 @@ if test "x$EXYNOS" = xyes; then | ||
| 6 | AC_DEFINE(HAVE_EXYNOS, 1, [Have EXYNOS support]) | ||
| 7 | fi | ||
| 8 | |||
| 9 | +AC_ARG_ENABLE([cairo-tests], | ||
| 10 | + [AS_HELP_STRING([--enable-cairo-tests], | ||
| 11 | + [Enable support for Cairo rendering in tests (default: auto)])], | ||
| 12 | + [CAIRO=$enableval], [CAIRO=auto]) | ||
| 13 | PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no]) | ||
| 14 | -if test "x$HAVE_CAIRO" = xyes; then | ||
| 15 | - AC_DEFINE(HAVE_CAIRO, 1, [Have cairo support]) | ||
| 16 | +AC_MSG_CHECKING([whether to enable Cairo tests]) | ||
| 17 | +if test "x$CAIRO" = xauto; then | ||
| 18 | + CAIRO="$HAVE_CAIRO" | ||
| 19 | fi | ||
| 20 | -AM_CONDITIONAL(HAVE_CAIRO, [test "x$HAVE_CAIRO" = xyes]) | ||
| 21 | +if test "x$CAIRO" = xyes; then | ||
| 22 | + if ! test "x$HAVE_CAIRO" = xyes; then | ||
| 23 | + AC_MSG_ERROR([Cairo support required but not present]) | ||
| 24 | + fi | ||
| 25 | + AC_DEFINE(HAVE_CAIRO, 1, [Have Cairo support]) | ||
| 26 | +fi | ||
| 27 | +AC_MSG_RESULT([$CAIRO]) | ||
| 28 | +AM_CONDITIONAL(HAVE_CAIRO, [test "x$CAIRO" = xyes]) | ||
| 29 | |||
| 30 | # For enumerating devices in test case | ||
| 31 | PKG_CHECK_MODULES(LIBUDEV, libudev, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no]) | ||
| 32 | diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am | ||
| 33 | index b5ec771..065ae13 100644 | ||
| 34 | --- a/tests/modetest/Makefile.am | ||
| 35 | +++ b/tests/modetest/Makefile.am | ||
| 36 | @@ -1,8 +1,7 @@ | ||
| 37 | AM_CFLAGS = \ | ||
| 38 | -I$(top_srcdir)/include/drm \ | ||
| 39 | -I$(top_srcdir)/libkms/ \ | ||
| 40 | - -I$(top_srcdir) \ | ||
| 41 | - $(CAIRO_CFLAGS) | ||
| 42 | + -I$(top_srcdir) | ||
| 43 | |||
| 44 | noinst_PROGRAMS = \ | ||
| 45 | modetest | ||
| 46 | @@ -12,5 +11,9 @@ modetest_SOURCES = \ | ||
| 47 | |||
| 48 | modetest_LDADD = \ | ||
| 49 | $(top_builddir)/libdrm.la \ | ||
| 50 | - $(top_builddir)/libkms/libkms.la \ | ||
| 51 | - $(CAIRO_LIBS) | ||
| 52 | + $(top_builddir)/libkms/libkms.la | ||
| 53 | + | ||
| 54 | +if HAVE_CAIRO | ||
| 55 | +AM_CFLAGS += $(CAIRO_CFLAGS) | ||
| 56 | +modetest_LDADD += $(CAIRO_LIBS) | ||
| 57 | +endif | ||
| 58 | -- | ||
| 59 | 1.7.10.4 | ||
| 60 |