summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-05 11:46:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-05 16:18:26 +0100
commit7f4a8dd914e35c2eaaba7bd953273d10a94d85eb (patch)
tree6d29261295264b51573aed6252119aff80912c29 /meta
parent7b9803160c125541a7c3488498589a29efdca15e (diff)
downloadpoky-7f4a8dd914e35c2eaaba7bd953273d10a94d85eb.tar.gz
libdrm: Explicitly disable the cairo dependency
We don't want the cairo dependency. Unfortunately simply checking whether its present isn't good enough. If its not in DEPENDS, it can disappear half way through building. We therefore need to explictly disable it. (From OE-Core rev: 51df11c5747f69b4112121df78fc1e10644d390a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/drm/libdrm.inc2
-rw-r--r--meta/recipes-graphics/drm/libdrm/nocairo.patch39
-rw-r--r--meta/recipes-graphics/drm/libdrm_2.4.39.bb1
3 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc
index cc09791070..2ed9c14b1d 100644
--- a/meta/recipes-graphics/drm/libdrm.inc
+++ b/meta/recipes-graphics/drm/libdrm.inc
@@ -18,6 +18,8 @@ DEPENDS += " libpciaccess"
18 18
19inherit autotools pkgconfig 19inherit autotools pkgconfig
20 20
21EXTRA_OECONF += "--disable-cairo"
22
21PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-kms" 23PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-kms"
22FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode*" 24FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode*"
23FILES_${PN}-drivers = "${libdir}/libdrm_*.so.*" 25FILES_${PN}-drivers = "${libdir}/libdrm_*.so.*"
diff --git a/meta/recipes-graphics/drm/libdrm/nocairo.patch b/meta/recipes-graphics/drm/libdrm/nocairo.patch
new file mode 100644
index 0000000000..f9b7f3acec
--- /dev/null
+++ b/meta/recipes-graphics/drm/libdrm/nocairo.patch
@@ -0,0 +1,39 @@
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
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.39.bb b/meta/recipes-graphics/drm/libdrm_2.4.39.bb
index 4e6a8d56c6..cb1f7f99fc 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.39.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.39.bb
@@ -4,6 +4,7 @@ PR = "${INC_PR}.0"
4 4
5SRC_URI += "file://installtests.patch \ 5SRC_URI += "file://installtests.patch \
6 file://GNU_SOURCE_definition.patch \ 6 file://GNU_SOURCE_definition.patch \
7 file://nocairo.patch \
7 " 8 "
8 9
9SRC_URI[md5sum] = "9a299e021d81bab6c82307582c78319d" 10SRC_URI[md5sum] = "9a299e021d81bab6c82307582c78319d"