configure.ac | 2 +-
debian/changelog | 33 +++++++++++++++++++++++++++------
debian/patches/series | 1 +
saa/saa_priv.h | 1 -
saa/saa_render.c | 4 ++++
src/vmware.c | 2 --
vmwgfx/vmwgfx_crtc.c | 6 +++++-
vmwgfx/vmwgfx_driver.c | 1 -
8 files changed, 38 insertions(+), 12 deletions(-)
New commits:
commit 4f3cc7dbf7617dda3c21daf9328adc3aa2ef349d
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Wed Jul 10 18:38:13 2013 +0200
release to saucy
diff --git a/debian/changelog b/debian/changelog
index cebdb3d..2e440a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+xserver-xorg-video-vmware (1:13.0.1-0ubuntu1) saucy; urgency=low
+
+ * New upstream release.
+ - Drop remove-mibstore.diff (upstream)
+ - Fix crash under xserver 1.14 (LP: #1199403)
+
+ -- Robert Hooker <sarv...@ubuntu.com> Wed, 10 Jul 2013 12:14:42 -0400
+
+xserver-xorg-video-vmware (1:13.0.0-0ubuntu0.2) saucy; urgency=low
+
+ * Refresh remove-mibstore.diff
+
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Thu, 04 Jul 2013
23:11:52 +0200
+
+xserver-xorg-video-vmware (1:13.0.0-0ubuntu0.1) raring; urgency=low
+
+ * Merge from unreleased debian git.
+ * remove-mibstore.diff: Remove mibstore.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 08 Feb 2013 15:05:54 +0200
+
+xserver-xorg-video-vmware (1:13.0.0-1) UNRELEASED; urgency=low
+
+ * New upstream release to build against xserver 1.13.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 02 Aug 2012 10:46:43 +0300
+
xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-0ubuntu1) quantal-proposed;
urgency=low
* Merge from unreleased debian git, remaining changes:
@@ -8,12 +35,6 @@ xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-0ubuntu1)
quantal-proposed; urg
-- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 02 Aug 2012 11:14:41 +0300
-xserver-xorg-video-vmware (1:12.0.2+git.e5ac80d8-1) UNRELEASED; urgency=low
-
- * New upstream snapshot to build against xserver 1.13.
-
- -- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 02 Aug 2012 10:46:43 +0300
-
xserver-xorg-video-vmware (1:12.0.2-1) unstable; urgency=low
* New upstream release:
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..a82d1b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+#placeholder
commit b3345886332ee2b9fd1348dc2cd36257dfd71986
Author: Jakob Bornecrantz <ja...@vmware.com>
Date: Wed Apr 17 12:03:32 2013 +0200
Bump the version number to 13.0.1
diff --git a/configure.ac b/configure.ac
index 424fb92..0631bcc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-vmware],
- [13.0.0],
+ [13.0.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-vmware])
AC_CONFIG_SRCDIR([Makefile.am])
commit d13a6334fe76f4e869b2cb8c0a6a13c185b1bedd
Author: Loïc Yhuel <loic.yh...@gmail.com>
Date: Thu Apr 11 11:29:10 2013 +0200
vmwgfx: Use myGlyphs to fix crashes
Tested-by: Christian Hesse <m...@eworm.de>
Reviewed-by: Jakob Bornecrantz <ja...@vmware.com>
Signed-off-by: Loïc Yhuel <loic.yh...@gmail.com>
Signed-off-by: Jakob Bornecrantz <ja...@vmware.com>
diff --git a/saa/saa_render.c b/saa/saa_render.c
index c69f2c9..c6ce68c 100644
--- a/saa/saa_render.c
+++ b/saa/saa_render.c
@@ -406,6 +406,8 @@ saa_render_setup(ScreenPtr pScreen)
saa_wrap(sscreen, ps, Trapezoids, saa_trapezoids);
saa_wrap(sscreen, ps, Triangles, saa_triangles);
saa_wrap(sscreen, ps, Composite, saa_composite);
+ saa_wrap(sscreen, ps, Glyphs, miGlyphs);
+ saa_wrap(sscreen, ps, UnrealizeGlyph, miUnrealizeGlyph);
}
}
@@ -419,6 +421,8 @@ saa_render_takedown(ScreenPtr pScreen)
saa_unwrap(sscreen, ps, Trapezoids);
saa_unwrap(sscreen, ps, Triangles);
saa_unwrap(sscreen, ps, Composite);
+ saa_unwrap(sscreen, ps, Glyphs);
+ saa_unwrap(sscreen, ps, UnrealizeGlyph);
}
}
#endif
commit 23d87c92b7211cc5249eefe4ab3a2c7f370e279e
Author: Zack Rusin <za...@vmware.com>
Date: Thu Feb 14 14:33:01 2013 -0800
Kill mibstore
It was a noop for at least 5 years and it has been removed.
Signed-off-by: Zack Rusin <za...@vmware.com>
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());
commit 686859fba16ed2616c38bbe5d4e38abf4c5b7ae9
Author: Zack Rusin <za...@vmware.com>
Date: Tue Jan 15 12:05:45 2013 -0800
Bump the version number to 13.0.0
New abi and various fixes
Signed-off-by: Zack Rusin <za...@vmware.com>
diff --git a/configure.ac b/configure.ac
index 444e3fb..424fb92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-vmware],
- [12.0.99.901],
+ [13.0.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-vmware])
AC_CONFIG_SRCDIR([Makefile.am])
commit adf375f3d400e51b1e445e89de6bd82be0bb4ef3
Author: Zack Rusin <za...@vmware.com>
Date: Thu Dec 6 16:40:13 2012 -0500
xf86-video-vmware 12.0.99.901
Internal release for a round of QE testing
Signed-off-by: Zack Rusin <za...@vmware.com>
diff --git a/configure.ac b/configure.ac
index d57a3c1..444e3fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-vmware],
- [12.0.2],
+ [12.0.99.901],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-vmware])
AC_CONFIG_SRCDIR([Makefile.am])
commit 007bed30270ca9548dfe6e359972b56cbb8e2f13
Author: Jakob Bornecrantz <ja...@vmware.com>
Date: Tue May 29 23:01:14 2012 +0200
vmwgfx: Guard against null rotate pixmap in shadow destroy
Reviewed-by: Thomas Hellström <thellst...@vmware.com>
Signed-off-by: Jakob Bornecrantz <ja...@vmware.com>
diff --git a/vmwgfx/vmwgfx_crtc.c b/vmwgfx/vmwgfx_crtc.c
index eaf87b2..fec04c0 100644
--- a/vmwgfx/vmwgfx_crtc.c
+++ b/vmwgfx/vmwgfx_crtc.c
@@ -250,8 +250,12 @@ crtc_shadow_create(xf86CrtcPtr crtc, void *data, int
width, int height)
static void
crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *data)
{
- ScreenPtr pScreen = rotate_pixmap->drawable.pScreen;
+ ScreenPtr pScreen;
+ if (rotate_pixmap == NULL)
+ return;
+
+ pScreen = rotate_pixmap->drawable.pScreen;
pScreen->DestroyPixmap(rotate_pixmap);
}
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uwxph-0004re...@vasks.debian.org
