[oe-commits] Martin Jansa : xf86-video-glamo: better patch for nonDRM kernels

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 723a7c8b21d2b1de1e1923a0168a87a1f225a8ee
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=723a7c8b21d2b1de1e1923a0168a87a1f225a8ee

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Jun 30 10:40:13 2010 +0200

xf86-video-glamo: better patch for nonDRM kernels

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

---

 ...glamo-output-initialize-mode-name-to-NULL.patch |   25 ++++++++++---------
 recipes/xorg-driver/xf86-video-glamo_git.bb        |    5 ++-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/recipes/xorg-driver/xf86-video-glamo/0001-glamo-output-initialize-mode-name-to-NULL.patch b/recipes/xorg-driver/xf86-video-glamo/0001-glamo-output-initialize-mode-name-to-NULL.patch
index 9595c60..8912344 100644
--- a/recipes/xorg-driver/xf86-video-glamo/0001-glamo-output-initialize-mode-name-to-NULL.patch
+++ b/recipes/xorg-driver/xf86-video-glamo/0001-glamo-output-initialize-mode-name-to-NULL.patch
@@ -1,24 +1,25 @@
-From 8fbaa322761429ed26a0f048f14590f120a6b440 Mon Sep 17 00:00:00 2001
+From 993affdb7cdcc4d2bd9c5df784c2d61c75d34701 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa at gmail.com>
-Date: Tue, 29 Jun 2010 14:02:15 +0200
-Subject: [PATCH] glamo-output: initialize mode->name to NULL
+Date: Wed, 30 Jun 2010 10:05:23 +0200
+Subject: [PATCH] glamo-output: initialize mode name to NULL with calloc
 
 ---
- src/glamo-output.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ src/glamo-output.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/glamo-output.c b/src/glamo-output.c
-index 60ea902..ca71c59 100644
+index 10a0f8e..eea3cb2 100644
 --- a/src/glamo-output.c
 +++ b/src/glamo-output.c
-@@ -171,6 +174,7 @@ GlamoOutputInit(ScrnInfoPtr pScrn) {
+@@ -165,7 +165,7 @@ GlamoOutputInit(ScrnInfoPtr pScrn) {
+     output->driver_private = pGlamoOutput;
+     pGlamoOutput->modes = NULL;
  
-     mode->next = NULL;
-     mode->prev = NULL;
-+    mode->name = NULL;
+-    mode = xnfalloc(sizeof(DisplayModeRec));
++    mode = xnfcalloc(1, sizeof(DisplayModeRec));
+     if (!mode)
+         return;
  
-     ConvertModeFbToXfree(&pGlamo->fb_var, mode, NULL);
-     xf86SetModeDefaultName(mode);
 -- 
 1.7.1
 
diff --git a/recipes/xorg-driver/xf86-video-glamo_git.bb b/recipes/xorg-driver/xf86-video-glamo_git.bb
index 9ab0b92..71fa207 100644
--- a/recipes/xorg-driver/xf86-video-glamo_git.bb
+++ b/recipes/xorg-driver/xf86-video-glamo_git.bb
@@ -4,10 +4,11 @@ DEPENDS += "libdrm"
 RDEPENDS_${PN} = "xserver-xorg-extension-dri xserver-xorg-extension-dri2 xserver-xorg-extension-glx mesa-dri"
 PE = "2"
 PV = "1.0.0+gitr${SRCPV}"
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 
 SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=master \
-           file://0001-glamo-output-initialize-mode-name-to-NULL.patch"
+           file://0001-glamo-output-initialize-mode-name-to-NULL.patch \
+          "
 
 S = "${WORKDIR}/git"
 SRCREV = "e43cf499d0df41eb6ca2a1a7c21af71e31207635"