[oe-commits] Martin Jansa : xf86-video-glamo: disable KMS, fix build with KMS disabled

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 695786ad0fac01f3dff2232a187e95ab7ef864b0
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=695786ad0fac01f3dff2232a187e95ab7ef864b0

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Aug 16 08:28:41 2012 +0200

xf86-video-glamo: disable KMS, fix build with KMS disabled

* RDEPENDS are not needed without KMS
* libdrm in meta-openmoko doesn't provide support for glamo, so not it would fail to build with KMS enabled

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../0001-fix-build-with-KMS-disabled.patch         |   29 ++++++++++++++++++++
 .../xorg-driver/xf86-video-glamo_git.bb            |    6 ++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-fix-build-with-KMS-disabled.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-fix-build-with-KMS-disabled.patch
new file mode 100644
index 0000000..25e8320
--- /dev/null
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-fix-build-with-KMS-disabled.patch
@@ -0,0 +1,29 @@
+From f485e878bc8bb0e381a38a30009308c82fa8d672 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa at gmail.com>
+Date: Thu, 16 Aug 2012 08:18:56 +0200
+Subject: [PATCH] fix build with KMS disabled
+
+Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
+---
+ src/glamo.h |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/glamo.h b/src/glamo.h
+index d4a2f19..5fd5c04 100644
+--- a/src/glamo.h
++++ b/src/glamo.h
+@@ -37,8 +37,11 @@
+ #include "xf86.h"
+ #include "exa.h"
+ #include <linux/fb.h>
++
++#ifdef HAVE_KMS
+ #include <libdrm/drm.h>
+ #include <libdrm/glamo_bo.h>
++#endif
+ 
+ #define GLAMO_REG_BASE(c)		((c)->attr.address[0])
+ #define GLAMO_REG_SIZE(c)		(0x2400)
+-- 
+1.7.8.6
+
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
index 5d752db..6fb78ab 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
@@ -4,16 +4,16 @@ DEPENDS += "libdrm"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
 
-RDEPENDS_${PN} = "xserver-xorg-extension-dri xserver-xorg-extension-dri2 xserver-xorg-extension-glx"
 PE = "2"
 PV = "1.0.0+gitr${SRCPV}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=master \
            file://0001-glamo-kms-driver-drop-unused-xf86_config.patch \
+           file://0001-fix-build-with-KMS-disabled.patch \
           "
 
 S = "${WORKDIR}/git"
 SRCREV = "cb9ed17035a79e49dde26a1e7e2bc5f10fd8144b"
 
-EXTRA_OECONF = " --enable-kms "
+EXTRA_OECONF = " --disable-kms "