[OE-core] [PATCH 4/4] xf86-video-vmware: delete references to xserver's mibstore.h

[Saul Wold]

On 03/11/2013 09:27 AM, Laurentiu Palcu wrote:
> mibstore.h has been deleted in the new xserver. Update the driver too.
>
There seemed to be an issue applying this patch.

Can you please verify this.

Thanks
	Sau!


> Signed-off-by: Laurentiu Palcu <laurentiu.palcu at intel.com>
> ---
>   .../xf86-video-vmware/Kill-mibstore.patch          |   63 ++++++++++++++++++++
>   .../xorg-driver/xf86-video-vmware_13.0.0.bb        |    2 +
>   2 files changed, 65 insertions(+)
>   create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch
>
> 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 0000000..e85a2ea
> --- /dev/null
> +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch
> @@ -0,0 +1,63 @@
> +Upstream-Status: Backported
> +
> +From 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Mon Sep 17 00:00:00 2001
> +From: Zack Rusin <zackr at vmware.com>
> +Date: Thu, 14 Feb 2013 14:33:01 -0800
> +Subject: [PATCH] Kill mibstore
> +
> +It was a noop for at least 5 years and it has been removed.
> +
> +Signed-off-by: Zack Rusin <zackr at vmware.com>
> +---
> + saa/saa_priv.h         |    1 -
> + src/vmware.c           |    2 --
> + vmwgfx/vmwgfx_driver.c |    1 -
> + 3 files changed, 4 deletions(-)
> +
> +diff --git a/saa/saa_priv.h b/saa/saa_priv.h
> +index 6652054..5d81453 100644
> +--- a/saa/saa_priv.h
> ++++ b/saa/saa_priv.h
> +@@ -48,7 +48,6 @@
> + #include "pixmapstr.h"
> + #include "windowstr.h"
> + #include "servermd.h"
> +-#include "mibstore.h"
> + #include "colormapst.h"
> + #include "gcstruct.h"
> + #include "input.h"
> +diff --git a/src/vmware.c b/src/vmware.c
> +index 41201f1..6b74e14 100644
> +--- a/src/vmware.c
> ++++ b/src/vmware.c
> +@@ -23,7 +23,6 @@ char rcsId_vmware[] =
> + #include "xf86Pci.h"		/* pci */
> +
> + #include "mipointer.h"		/* sw cursor */
> +-#include "mibstore.h"		/* backing store */
> + #include "micmap.h"		/* mi color map */
> + #include "vgaHW.h"		/* VGA hardware */
> + #include "fb.h"
> +@@ -1483,7 +1482,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
> +      * If backing store is to be supported (as is usually the case),
> +      * initialise it.
> +      */
> +-    miInitializeBackingStore(pScreen);
> +     xf86SetBackingStore(pScreen);
> +     xf86SetSilkenMouse(pScreen);
> +
> +diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
> +index 9959ffb..7863ba2 100644
> +--- a/vmwgfx/vmwgfx_driver.c
> ++++ b/vmwgfx/vmwgfx_driver.c
> +@@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL)
> + 		   (ms->only_hw_presents) ? "enabled" : "disabled");
> +     }
> +
> +-    miInitializeBackingStore(pScreen);
> +     xf86SetBackingStore(pScreen);
> +     xf86SetSilkenMouse(pScreen);
> +     miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
> +--
> +1.7.9.5
> +
> 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 4399bb1..1466b86 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."
>
>   LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53"
>
> +SRC_URI = "file://Kill-mibstore.patch"
> +
>   DEPENDS += "virtual/libx11 libxvmc drm glproto \
>   	    virtual/libgl xineramaproto libpciaccess"
>
>