summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-03-11 18:05:13 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-15 01:53:04 +0000
commit5b2aaa3c1ce0aadb2f89ad1ecc791410ea66fe10 (patch)
treedbe9919e79bb74770fc56b9cdbdf3cc028409659
parent2fbe818f5e455f57f79fb105ad1c4ddc5b64c941 (diff)
downloadpoky-5b2aaa3c1ce0aadb2f89ad1ecc791410ea66fe10.tar.gz
xf86-video-*: delete references to mibstore.h
This patch removes any references to mibstore.h, which has been removed from xserver-org, from the following drivers: * xf86-video-vmware * xf86-video-fbdev * xf86-video-vesa (From OE-Core rev: c2a2ac579876695c162ccca0ca3673f4d06ce60e) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@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-fbdev/Remove-mibstore.h.patch35
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.3.bb2
-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.2.bb2
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch63
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb2
6 files changed, 141 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-fbdev/Remove-mibstore.h.patch b/meta/recipes-graphics/xorg-driver/xf86-video-fbdev/Remove-mibstore.h.patch
new file mode 100644
index 0000000000..225ff01943
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-fbdev/Remove-mibstore.h.patch
@@ -0,0 +1,35 @@
1Upstream-Status: Backported
2
3From ac293412a01d87f87eb61f4adb9db7486a75d3fc Mon Sep 17 00:00:00 2001
4From: Adam Jackson <ajax@redhat.com>
5Date: Tue, 25 Sep 2012 08:54:37 -0400
6Subject: [PATCH] Remove mibstore.h
7
8Signed-off-by: Adam Jackson <ajax@redhat.com>
9---
10 src/fbdev.c | 2 --
11 1 file changed, 2 deletions(-)
12
13diff --git a/src/fbdev.c b/src/fbdev.c
14index cd7ebc5..f5a7378 100644
15--- a/src/fbdev.c
16+++ b/src/fbdev.c
17@@ -14,7 +14,6 @@
18 #include "xf86_OSproc.h"
19
20 #include "mipointer.h"
21-#include "mibstore.h"
22 #include "micmap.h"
23 #include "colormapst.h"
24 #include "xf86cmap.h"
25@@ -845,7 +844,6 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL)
26 }
27
28 xf86SetBlackWhitePixels(pScreen);
29- miInitializeBackingStore(pScreen);
30 xf86SetBackingStore(pScreen);
31
32 /* software cursor */
33--
341.7.9.5
35
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.3.bb b/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.3.bb
index ff627a14a2..51c51449a3 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.3.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.3.bb
@@ -4,5 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
4DESCRIPTION = "X.Org X server -- fbdev display driver" 4DESCRIPTION = "X.Org X server -- fbdev display driver"
5PR = "${INC_PR}.0" 5PR = "${INC_PR}.0"
6 6
7SRC_URI += "file://Remove-mibstore.h.patch"
8
7SRC_URI[md5sum] = "1d99f1dfb3f0fea077b6b61caa3dc85a" 9SRC_URI[md5sum] = "1d99f1dfb3f0fea077b6b61caa3dc85a"
8SRC_URI[sha256sum] = "ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831" 10SRC_URI[sha256sum] = "ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831"
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
new file mode 100644
index 0000000000..0805d815c3
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa/Remove-mibstore.h.patch
@@ -0,0 +1,37 @@
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.2.bb
index 0fc6b71a33..7373f85e2b 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.2.bb
@@ -20,5 +20,7 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
20 20
21RRECOMMENDS_${PN} += "xserver-xorg-module-libint10" 21RRECOMMENDS_${PN} += "xserver-xorg-module-libint10"
22 22
23SRC_URI += "file://Remove-mibstore.h.patch"
24
23SRC_URI[md5sum] = "3eddd393fba79550e012d717499d58ad" 25SRC_URI[md5sum] = "3eddd393fba79550e012d717499d58ad"
24SRC_URI[sha256sum] = "144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3" 26SRC_URI[sha256sum] = "144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch
new file mode 100644
index 0000000000..e85a2ea9b6
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch
@@ -0,0 +1,63 @@
1Upstream-Status: Backported
2
3From 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Mon Sep 17 00:00:00 2001
4From: Zack Rusin <zackr@vmware.com>
5Date: Thu, 14 Feb 2013 14:33:01 -0800
6Subject: [PATCH] Kill mibstore
7
8It was a noop for at least 5 years and it has been removed.
9
10Signed-off-by: Zack Rusin <zackr@vmware.com>
11---
12 saa/saa_priv.h | 1 -
13 src/vmware.c | 2 --
14 vmwgfx/vmwgfx_driver.c | 1 -
15 3 files changed, 4 deletions(-)
16
17diff --git a/saa/saa_priv.h b/saa/saa_priv.h
18index 6652054..5d81453 100644
19--- a/saa/saa_priv.h
20+++ b/saa/saa_priv.h
21@@ -48,7 +48,6 @@
22 #include "pixmapstr.h"
23 #include "windowstr.h"
24 #include "servermd.h"
25-#include "mibstore.h"
26 #include "colormapst.h"
27 #include "gcstruct.h"
28 #include "input.h"
29diff --git a/src/vmware.c b/src/vmware.c
30index 41201f1..6b74e14 100644
31--- a/src/vmware.c
32+++ b/src/vmware.c
33@@ -23,7 +23,6 @@ char rcsId_vmware[] =
34 #include "xf86Pci.h" /* pci */
35
36 #include "mipointer.h" /* sw cursor */
37-#include "mibstore.h" /* backing store */
38 #include "micmap.h" /* mi color map */
39 #include "vgaHW.h" /* VGA hardware */
40 #include "fb.h"
41@@ -1483,7 +1482,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
42 * If backing store is to be supported (as is usually the case),
43 * initialise it.
44 */
45- miInitializeBackingStore(pScreen);
46 xf86SetBackingStore(pScreen);
47 xf86SetSilkenMouse(pScreen);
48
49diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
50index 9959ffb..7863ba2 100644
51--- a/vmwgfx/vmwgfx_driver.c
52+++ b/vmwgfx/vmwgfx_driver.c
53@@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL)
54 (ms->only_hw_presents) ? "enabled" : "disabled");
55 }
56
57- miInitializeBackingStore(pScreen);
58 xf86SetBackingStore(pScreen);
59 xf86SetSilkenMouse(pScreen);
60 miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
61--
621.7.9.5
63
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb
index 4399bb1ec7..fef5af4341 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb
@@ -6,6 +6,8 @@ DESCRIPTION = "vmware is an Xorg driver for VMware virtual video cards."
6 6
7LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53" 7LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53"
8 8
9SRC_URI += "file://Kill-mibstore.patch"
10
9DEPENDS += "virtual/libx11 libxvmc drm glproto \ 11DEPENDS += "virtual/libx11 libxvmc drm glproto \
10 virtual/libgl xineramaproto libpciaccess" 12 virtual/libgl xineramaproto libpciaccess"
11 13