summaryrefslogtreecommitdiffstats
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:55:28 +0100
commit05bbc3db86f7f875fe2746e5430a0807762a2dc8 (patch)
tree779a0594a65927cff0d32f3c86d0704d2501ab0b
parent552780d315292d05ac2469fe8c0e290fb252f384 (diff)
downloadpoky-05bbc3db86f7f875fe2746e5430a0807762a2dc8.tar.gz
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. (From OE-Core rev: cce5f8ea5ecf87c506be1c5e21d5058fbe953143) 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>
-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 @@
1Upstream-Status: Backported
2
3From 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc Mon Sep 17 00:00:00 2001
4From: Adam Jackson <ajax@redhat.com>
5Date: Tue, 25 Sep 2012 08:55:03 -0400
6Subject: [PATCH] Remove mibstore.h
7
8Signed-off-by: Adam Jackson <ajax@redhat.com>
9---
10 src/vesa.c | 4 ----
11 1 file changed, 4 deletions(-)
12
13diff --git a/src/vesa.c b/src/vesa.c
14index 11cd26c..b73d104 100644
15--- a/src/vesa.c
16+++ b/src/vesa.c
17@@ -49,9 +49,6 @@
18 /* All drivers initialising the SW cursor need this */
19 #include "mipointer.h"
20
21-/* All drivers implementing backing store need this */
22-#include "mibstore.h"
23-
24 /* Colormap handling */
25 #include "micmap.h"
26 #include "xf86cmap.h"
27@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL)
28 VESADGAInit(pScrn, pScreen);
29
30 xf86SetBlackWhitePixels(pScreen);
31- miInitializeBackingStore(pScreen);
32 xf86SetBackingStore(pScreen);
33
34 /* software cursor */
35--
361.7.9.5
37
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'
17 17
18RRECOMMENDS_${PN} += "xserver-xorg-module-libint10" 18RRECOMMENDS_${PN} += "xserver-xorg-module-libint10"
19 19
20SRC_URI += "file://Remove-mibstore.h.patch" 20SRC_URI[md5sum] = "3690a5356ed121b1a7dfb59a6dcf4bf9"
21 21SRC_URI[sha256sum] = "ce8b75e5a40e9dae76f2ac9e2880f7f73a848653ca2eed5880f52dc2c0d3aef8"
22SRC_URI[md5sum] = "3eddd393fba79550e012d717499d58ad"
23SRC_URI[sha256sum] = "144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3"