[oe-commits] Martin Jansa : xserver-xorg-1.8.99.903: update patch for freedesktop #28824

[git version control]

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

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

xserver-xorg-1.8.99.903: update patch for freedesktop #28824

* https://bugs.freedesktop.org/show_bug.cgi?id=28824

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

---

 ...ake-sure-that-DisplayModeRec-name-is-init.patch |   28 ++++++-------------
 recipes/xorg-xserver/xserver-xorg_1.8.99.903.bb    |    2 +-
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.99.903/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch b/recipes/xorg-xserver/xserver-xorg-1.8.99.903/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch
index b87d976..adbc274 100644
--- a/recipes/xorg-xserver/xserver-xorg-1.8.99.903/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.8.99.903/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch
@@ -1,35 +1,25 @@
-From 2ba68d05755b4dc8ec8b70733cfece032e01ce89 Mon Sep 17 00:00:00 2001
+From 7deb3068ff65ecadf035e8e493d418aca89c9212 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa at gmail.com>
-Date: Tue, 29 Jun 2010 13:26:59 +0200
+Date: Wed, 30 Jun 2010 10:42:36 +0200
 Subject: [PATCH] xf86Modes: make sure that DisplayModeRec name is initialized to NULL and then don't call free() on it in xf86SetModeDefaultName
 
-Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
 ---
- hw/xfree86/modes/xf86Modes.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
+ hw/xfree86/modes/xf86Modes.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c
-index 05f4319..ccd2cc6 100644
+index 05f4319..09a9679 100644
 --- a/hw/xfree86/modes/xf86Modes.c
 +++ b/hw/xfree86/modes/xf86Modes.c
-@@ -138,7 +138,8 @@ xf86SetModeDefaultName(DisplayModePtr mode)
+@@ -206,7 +206,7 @@ xf86DuplicateMode(const DisplayModeRec *pMode)
  {
-     Bool interlaced = !!(mode->Flags & V_INTERLACE);
+     DisplayModePtr pNew;
  
--    free(mode->name);
-+    if (mode->name)
-+	free(mode->name);
- 
-     mode->name = XNFprintf("%dx%d%s", mode->HDisplay, mode->VDisplay,
- 			   interlaced ? "i" : "");
-@@ -210,6 +211,7 @@ xf86DuplicateMode(const DisplayModeRec *pMode)
+-    pNew = xnfalloc(sizeof(DisplayModeRec));
++    pNew = xnfcalloc(1, sizeof(DisplayModeRec));
      *pNew = *pMode;
      pNew->next = NULL;
      pNew->prev = NULL;
-+    pNew->name = NULL;
- 
-     if (pMode->name == NULL)
- 	xf86SetModeDefaultName(pNew);
 -- 
 1.7.1
 
diff --git a/recipes/xorg-xserver/xserver-xorg_1.8.99.903.bb b/recipes/xorg-xserver/xserver-xorg_1.8.99.903.bb
index 142ea61..709c57c 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.8.99.903.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.8.99.903.bb
@@ -6,7 +6,7 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native"
 PE = "2"
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
 
 # Needs newer mesa-dri, where is D_P = "-1"
 DEFAULT_PREFERENCE = "-1"