summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/drm/libdrm/nocairo.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/drm/libdrm/nocairo.patch')
-rw-r--r--meta/recipes-graphics/drm/libdrm/nocairo.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/meta/recipes-graphics/drm/libdrm/nocairo.patch b/meta/recipes-graphics/drm/libdrm/nocairo.patch
deleted file mode 100644
index f9b7f3acec..0000000000
--- a/meta/recipes-graphics/drm/libdrm/nocairo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1We don't want the cairo dependency. Unfortunately simply checking whether its present
2isn't good enough. If its not in DEPENDS, it can disappear half way through building.
3We therefore need to explictly disable it.
4
5RP
62012/10/5
7
8Index: libdrm-2.4.39/configure.ac
9===================================================================
10--- libdrm-2.4.39.orig/configure.ac 2012-08-24 14:54:42.000000000 +0000
11+++ libdrm-2.4.39/configure.ac 2012-10-05 11:37:52.484821221 +0000
12@@ -63,6 +63,11 @@
13 [Disable KMS mm abstraction library (default: auto)]),
14 [LIBKMS=$enableval], [LIBKMS=auto])
15
16+AC_ARG_ENABLE(cairo,
17+ AS_HELP_STRING([--disable-cairo],
18+ [Disable cairo (default: auto)]),
19+ [ENABLECAIRO=$enableval], [ENABLECAIRO=auto])
20+
21 AC_ARG_ENABLE(intel,
22 AS_HELP_STRING([--disable-intel],
23 [Enable support for intel's KMS API (default: auto)]),
24@@ -201,9 +206,12 @@
25 AC_DEFINE(HAVE_EXYNOS, 1, [Have EXYNOS support])
26 fi
27
28-PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
29-if test "x$HAVE_CAIRO" = xyes; then
30- AC_DEFINE(HAVE_CAIRO, 1, [Have cairo support])
31+HAVE_CAIRO=no
32+if test "x$ENABLECAIRO" = xyes; then
33+ PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
34+ if test "x$HAVE_CAIRO" = xyes; then
35+ AC_DEFINE(HAVE_CAIRO, 1, [Have cairo support])
36+ fi
37 fi
38 AM_CONDITIONAL(HAVE_CAIRO, [test "x$HAVE_CAIRO" = xyes])
39