[Shr-Devel] [PATCH] shr/merge: Merge xf86-video-glamo-kms to xf86-video-glamo as kms branch is now merged to master.

[Martin Jansa]

---
 conf/distro/include/shr-om-gta02.conf           |    2 +-
 recipes/xorg-driver/xf86-video-glamo-kms_git.bb |   11 -----------
 recipes/xorg-driver/xf86-video-glamo_git.bb     |   12 +++++++-----
 3 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 recipes/xorg-driver/xf86-video-glamo-kms_git.bb

diff --git a/conf/distro/include/shr-om-gta02.conf b/conf/distro/include/shr-om-gta02.conf
index bb01361..7252a5b 100644
--- a/conf/distro/include/shr-om-gta02.conf
+++ b/conf/distro/include/shr-om-gta02.conf
@@ -8,5 +8,5 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
 MACHINE_DRI_MODULES = "glamo"
 
-XSERVER = "xserver-xorg xf86-video-glamo-kms xf86-input-evdev xf86-input-keyboard xf86-input-mouse"
+XSERVER = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse"
 
diff --git a/recipes/xorg-driver/xf86-video-glamo-kms_git.bb b/recipes/xorg-driver/xf86-video-glamo-kms_git.bb
deleted file mode 100644
index 6ab5991..0000000
--- a/recipes/xorg-driver/xf86-video-glamo-kms_git.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-driver-video.inc
-SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=kms"
-
-S = "${WORKDIR}/git"
-
-PV=1.0.0+gitr${SRCREV}
-PR = "r1"
-
-RDEPENDS = "xserver-xorg-extension-dri xserver-xorg-extension-dri2 xserver-xorg-extension-glx mesa-dri"
-
-DESCRIPTION = "X.Org X server -- Glamo display driver with KMS support"
diff --git a/recipes/xorg-driver/xf86-video-glamo_git.bb b/recipes/xorg-driver/xf86-video-glamo_git.bb
index 57044ce..08c757d 100644
--- a/recipes/xorg-driver/xf86-video-glamo_git.bb
+++ b/recipes/xorg-driver/xf86-video-glamo_git.bb
@@ -1,12 +1,14 @@
 require xorg-driver-video.inc
-SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=master \
-  file://0001-dpms.h-dpmsconst.h.patch;patch=1"
+SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=master"
 
 S = "${WORKDIR}/git"
 
 PV="1.0.0+gitr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
-RDEPENDS = "xserver-xorg-extension-dri xserver-xorg-extension-dri2 xserver-xorg-extension-glx"
+RDEPENDS = "xserver-xorg-extension-dri xserver-xorg-extension-dri2 xserver-xorg-extension-glx mesa-dri"
+DEPENDS += "libdrm"
 
-DESCRIPTION = "X.Org X server -- Glamo display driver"
+DESCRIPTION = "X.Org X server -- Glamo display driver with KMS support"
+
+EXTRA_OECONF = " --enable-kms "
-- 
1.6.5.1