summaryrefslogtreecommitdiff
path: root/meta/recipes-graphics/xorg-driver
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-10-07 11:49:09 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-14 16:54:31 +0100
commitcce5f8ea5ecf87c506be1c5e21d5058fbe953143 (patch)
tree80f2e80cd1e43743700e419c90d87e87332d949a /meta/recipes-graphics/xorg-driver
parente7c3969b37f5ddbd83c1956f72a4cfb4d1060b66 (diff)
downloadopenembedded-core-cce5f8ea5ecf87c506be1c5e21d5058fbe953143.tar.gz
openembedded-core-cce5f8ea5ecf87c506be1c5e21d5058fbe953143.tar.bz2
openembedded-core-cce5f8ea5ecf87c506be1c5e21d5058fbe953143.zip
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@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-driver')
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-vesa/Remove-mibstore.h.patch37
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb (renamed from meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.2.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 0805d815c3..0000000000
--- 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@redhat.com>
-Date: Tue, 25 Sep 2012 08:55:03 -0400
-Subject: [PATCH] Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax@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
index 4ec07a03b1..4052f703b8 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"