[oe-commits] Ross Burton : xf86-video-vesa: upgrade to 2.3.3

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: cce5f8ea5ecf87c506be1c5e21d5058fbe953143
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=cce5f8ea5ecf87c506be1c5e21d5058fbe953143

Author: Ross Burton <ross.burton at intel.com>
Date:   Mon Oct  7 11:49:09 2013 +0000

xf86-video-vesa: upgrade to 2.3.3

Drop Remove-mibstore.h.patch as that was a backport from git and is integrated
into 2.3.3.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../xf86-video-vesa/Remove-mibstore.h.patch        |   37 --------------------
 ...ideo-vesa_2.3.2.bb => xf86-video-vesa_2.3.3.bb} |    6 +--
 2 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa/Remove-mibstore.h.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vesa/Remove-mibstore.h.patch
deleted file mode 100644
index 0805d81..0000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa/Remove-mibstore.h.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Upstream-Status: Backported
-
-From 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax at redhat.com>
-Date: Tue, 25 Sep 2012 08:55:03 -0400
-Subject: [PATCH] Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax at redhat.com>
----
- src/vesa.c |    4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/vesa.c b/src/vesa.c
-index 11cd26c..b73d104 100644
---- a/src/vesa.c
-+++ b/src/vesa.c
-@@ -49,9 +49,6 @@
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
- 
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
- /* Colormap handling */
- #include "micmap.h"
- #include "xf86cmap.h"
-@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL)
-     VESADGAInit(pScrn, pScreen);
- 
-     xf86SetBlackWhitePixels(pScreen);
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
- 
-     /* software cursor */
--- 
-1.7.9.5
-
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.2.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb
similarity index 75%
rename from meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.2.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb
index 4ec07a0..4052f70 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.2.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb
@@ -17,7 +17,5 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
 RRECOMMENDS_${PN} += "xserver-xorg-module-libint10"
 
-SRC_URI += "file://Remove-mibstore.h.patch"
-
-SRC_URI[md5sum] = "3eddd393fba79550e012d717499d58ad"
-SRC_URI[sha256sum] = "144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3"
+SRC_URI[md5sum] = "3690a5356ed121b1a7dfb59a6dcf4bf9"
+SRC_URI[sha256sum] = "ce8b75e5a40e9dae76f2ac9e2880f7f73a848653ca2eed5880f52dc2c0d3aef8"