mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-14 08:02:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

libdrm: Explicitly disable the cairo dependency

Browse Source 
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>
This commit is contained in:
Richard Purdie
2012-10-05 11:46:05 +00:00
parent 7b9803160c
commit 7f4a8dd914
3 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-graphics/drm/libdrm.inc
View File

@@ -18,6 +18,8 @@ DEPENDS += " libpciaccess"
inherit autotools pkgconfig
EXTRA_OECONF += "--disable-cairo"
PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-kms"
FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode*"
FILES_${PN}-drivers = "${libdir}/libdrm_*.so.*"

39
meta/recipes-graphics/drm/libdrm/nocairo.patch Normal file
View File

@@ -0,0 +1,39 @@
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.
RP
2012/10/5
Index: libdrm-2.4.39/configure.ac
===================================================================
--- libdrm-2.4.39.orig/configure.ac 2012-08-24 14:54:42.000000000 +0000
+++ libdrm-2.4.39/configure.ac 2012-10-05 11:37:52.484821221 +0000
@@ -63,6 +63,11 @@
[Disable KMS mm abstraction library (default: auto)]),
[LIBKMS=$enableval], [LIBKMS=auto])
+AC_ARG_ENABLE(cairo,
+ AS_HELP_STRING([--disable-cairo],
+ [Disable cairo (default: auto)]),
+ [ENABLECAIRO=$enableval], [ENABLECAIRO=auto])
+
AC_ARG_ENABLE(intel,
AS_HELP_STRING([--disable-intel],
[Enable support for intel's KMS API (default: auto)]),
@@ -201,9 +206,12 @@
AC_DEFINE(HAVE_EXYNOS, 1, [Have EXYNOS support])
fi
-PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
-if test "x$HAVE_CAIRO" = xyes; then
- AC_DEFINE(HAVE_CAIRO, 1, [Have cairo support])
+HAVE_CAIRO=no
+if test "x$ENABLECAIRO" = xyes; then
+ PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
+ if test "x$HAVE_CAIRO" = xyes; then
+ AC_DEFINE(HAVE_CAIRO, 1, [Have cairo support])
+ fi
fi
AM_CONDITIONAL(HAVE_CAIRO, [test "x$HAVE_CAIRO" = xyes])

1
meta/recipes-graphics/drm/libdrm_2.4.39.bb
View File

@@ -4,6 +4,7 @@ PR = "${INC_PR}.0"
SRC_URI += "file://installtests.patch \
file://GNU_SOURCE_definition.patch \
file://nocairo.patch \
"
SRC_URI[md5sum] = "9a299e021d81bab6c82307582c78319d"