From 76a90f18d5bc7a5d24a5e0727ff128887050c81a Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Thu, 9 May 2013 14:11:11 +0300 Subject: xf86-video-vmware: upgrade to 13.0.1 Removed the backported patch. (From OE-Core rev: 01b74d26ba9f96122105987581660ee2b26521b6) Signed-off-by: Laurentiu Palcu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../xf86-video-vmware/Kill-mibstore.patch | 63 ---------------------- .../xorg-driver/xf86-video-vmware_13.0.0.bb | 19 ------- .../xorg-driver/xf86-video-vmware_13.0.1.bb | 15 ++++++ 3 files changed, 15 insertions(+), 82 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.1.bb (limited to 'meta/recipes-graphics') 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 deleted file mode 100644 index e85a2ea9b6..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/Kill-mibstore.patch +++ /dev/null @@ -1,63 +0,0 @@ -Upstream-Status: Backported - -From 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Mon Sep 17 00:00:00 2001 -From: Zack Rusin -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 ---- - 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 deleted file mode 100644 index fef5af4341..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-driver-video.inc - -SUMMARY = "X.Org X server -- VMware SVGA display driver" - -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" - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "b72be57517cbc7a56362f2ee0f092269" -SRC_URI[sha256sum] = "44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6" - -COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.1.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.1.bb new file mode 100644 index 0000000000..1526a02327 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.1.bb @@ -0,0 +1,15 @@ +require xorg-driver-video.inc + +SUMMARY = "X.Org X server -- VMware SVGA display driver" + +DESCRIPTION = "vmware is an Xorg driver for VMware virtual video cards." + +LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53" + +DEPENDS += "virtual/libx11 libxvmc drm glproto \ + virtual/libgl xineramaproto libpciaccess" + +SRC_URI[md5sum] = "b08e0195ebf3f88a82129322cb93da08" +SRC_URI[sha256sum] = "802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d" + +COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' -- cgit v1.2.3-54-g00ecf