Patchwork [1/3] Revert "libdrm: Explicitly disable the cairo dependency"

login
register
mail settings
Submitter Daniel Stone
Date Oct. 8, 2012, 9:22 a.m.
Message ID <1349688137-22470-1-git-send-email-daniel@fooishbar.org>
Download mbox | patch
Permalink /patch/37911/
State New
Headers show

Comments

Daniel Stone - Oct. 8, 2012, 9:22 a.m.
A better patch has already been pushed upstream.

This reverts commit 7f4a8dd914e35c2eaaba7bd953273d10a94d85eb.
---
 meta/recipes-graphics/drm/libdrm.inc           |    2 --
 meta/recipes-graphics/drm/libdrm/nocairo.patch |   39 ------------------------
 meta/recipes-graphics/drm/libdrm_2.4.39.bb     |    1 -
 3 files changed, 42 deletions(-)
 delete mode 100644 meta/recipes-graphics/drm/libdrm/nocairo.patch

Patch

diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc
index 2ed9c14..cc09791 100644
--- a/meta/recipes-graphics/drm/libdrm.inc
+++ b/meta/recipes-graphics/drm/libdrm.inc
@@ -18,8 +18,6 @@  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.*"
diff --git a/meta/recipes-graphics/drm/libdrm/nocairo.patch b/meta/recipes-graphics/drm/libdrm/nocairo.patch
deleted file mode 100644
index f9b7f3a..0000000
--- a/meta/recipes-graphics/drm/libdrm/nocairo.patch
+++ /dev/null
@@ -1,39 +0,0 @@ 
-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])
- 
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.39.bb b/meta/recipes-graphics/drm/libdrm_2.4.39.bb
index cb1f7f9..4e6a8d5 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.39.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.39.bb
@@ -4,7 +4,6 @@  PR = "${INC_PR}.0"
 
 SRC_URI += "file://installtests.patch \
             file://GNU_SOURCE_definition.patch \
-            file://nocairo.patch \
            "
 
 SRC_URI[md5sum] = "9a299e021d81bab6c82307582c78319d"