Update to 13.1.0:

This release provides a number of important bug fixes as well as support
for recent releases of Xserver. Distro maintainers are encouraged to upgrade.

The driver is intended to be backwards compatible with and used also with
older X servers.

Adam Jackson (1):
      saa: Adapt to GC client clip changes in xserver 1.17

Hans de Goede (2):
      Add support for XSERVER_PLATFORM_BUS
      Add support for server managed fds

Jakob Bornecrantz (7):
      vmware/vmwgfx: Don't move cursors without images
      vmware/vmwgfx: A bit more error logging when handling cursors
      vmware/vmwgfx: Fix auto colorkey fill usage
      vmware/legacy: Apply same fix to auto colorkey fill
      vmware/legacy: Fix uninitialized values in video commands
      vmware/vmwgfx: Fix compilation issue on older X servers
      vmware/legacy: Fix out of bound array indexing

Julien Cristau (1):
      configure: fix build without xatracker

Stefan Dirsch (1):
      xf86xv.h cannot be included without first including xorg-server.h.

Thomas Hellstrom (16):
      vmware/vmwgfx: Don't change backing-store of active scanout surfaces
      vmware/vmwgfx: Don't tell XA that we have a mask when we haven't
      vmware/vmwgfx: Set desired modes after xMir screen init
      vmware/vmwgfx: Fix initial dirty region for pixmaps
      vmware/saa: Disable the noreadback polyfillrect optimization
      vmware/vmwgfx: Fix xwayland build on newer XA versions
      vmware/vmwgfx: Fix an error path segfault
      vmware: Clear the PITCHLOCK register if available before modeset
      vmware: Fix bootstrap related compile errors on earlier X servers
      vmware/legacy: Fix overlay related compile breakage on earlier X servers
      vmware/vmwgfx: Don't add pixmaps to the pixmap list if they're already on it
      vmware/vmwgfx: Fix cursor problem with multimon
      Revert "vmware/saa: Disable the noreadback polyfillrect optimization"
      vmware/saa: Fix saa_check_copy_window dirty region v3
      vmware/saa: Fix saa_check_poly_fill_rect_noreadback v2
      vmware: Bump version number for release

4 files changed, 6 insertions, 64 deletions

diff --git a/x11/xf86-video-vmware/Makefile b/x11/xf86-video-vmware/Makefile
index 8cb83ac0de9..c35dac378f2 100644
--- a/x11/xf86-video-vmware/Makefile
+++ b/x11/xf86-video-vmware/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2014/08/10 09:08:21 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2015/01/19 23:39:27 wiz Exp $
 
-DISTNAME=	xf86-video-vmware-13.0.2
-PKGREVISION=	2
+DISTNAME=	xf86-video-vmware-13.1.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xf86-video-vmware/distinfo b/x11/xf86-video-vmware/distinfo
index dedfd95bba1..212dc8c0ba8 100644
--- a/x11/xf86-video-vmware/distinfo
+++ b/x11/xf86-video-vmware/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.10 2014/08/10 09:08:21 wiz Exp $
+$NetBSD: distinfo,v 1.11 2015/01/19 23:39:27 wiz Exp $
 
-SHA1 (xf86-video-vmware-13.0.2.tar.bz2) = ec38323a260e50c00f033aeff486a3ae53f46997
-RMD160 (xf86-video-vmware-13.0.2.tar.bz2) = 5ee347b3da2cba26dac8f947696feb67974cb074
-Size (xf86-video-vmware-13.0.2.tar.bz2) = 438773 bytes
-SHA1 (patch-configure) = 3f9e74646610d9fda96a98016ea34541e1ebd1fe
-SHA1 (patch-configure.ac) = 11a4479bff29fb3aa465df93d42f9fc800b0f9fc
+SHA1 (xf86-video-vmware-13.1.0.tar.bz2) = 3af1d56a9a75b5f6e10a78db2ce155ec65498802
+RMD160 (xf86-video-vmware-13.1.0.tar.bz2) = 50b8cd42e6176672c2e047a21cfabd624bb39b9b
+Size (xf86-video-vmware-13.1.0.tar.bz2) = 459255 bytes
 SHA1 (patch-src_svga__modes.h) = 3f70fd34b6d202445f1a6713f9c552f0dd17f488
diff --git a/x11/xf86-video-vmware/patches/patch-configure b/x11/xf86-video-vmware/patches/patch-configure
deleted file mode 100644
index 8816815f390..00000000000
--- a/x11/xf86-video-vmware/patches/patch-configure
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2014/04/01 11:20:22 wiz Exp $
-
-xatracker is optional, make it so.
-
---- configure.orig	2014-03-26 12:03:45.000000000 +0000
-+++ configure
-@@ -18719,31 +18738,11 @@ fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XATRACKER_PKG_ERRORS" >&5
- 
--	as_fn_error $? "Package requirements (xatracker >= 0.4.0) were not met:
--
--$XATRACKER_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables XATRACKER_CFLAGS
--and XATRACKER_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details." "$LINENO" 5
-+	BUILD_VMWGFX=no
- elif test $pkg_failed = untried; then
-      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
--	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables XATRACKER_CFLAGS
--and XATRACKER_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details" "$LINENO" 5; }
-+	BUILD_VMWGFX=no
- else
- 	XATRACKER_CFLAGS=$pkg_cv_XATRACKER_CFLAGS
- 	XATRACKER_LIBS=$pkg_cv_XATRACKER_LIBS
diff --git a/x11/xf86-video-vmware/patches/patch-configure.ac b/x11/xf86-video-vmware/patches/patch-configure.ac
deleted file mode 100644
index e7c6052653c..00000000000
--- a/x11/xf86-video-vmware/patches/patch-configure.ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2014/04/01 11:20:22 wiz Exp $
-
-xatracker is optional, make it so.
-
---- configure.ac.orig	2014-03-26 11:44:54.000000000 +0000
-+++ configure.ac
-@@ -126,7 +126,7 @@ if test x$BUILD_VMWGFX = xyes; then
- 			  [PKG_CHECK_EXISTS([xatracker = 2.0.0],
- 	                  [AC_DEFINE([HAVE_XA_2], 1,
-                		  [Has version 2 of XA])])],
--			  [],[BUILD_VMWGFX=no])
-+			  [BUILD_VMWGFX=no])
- #
- # Check for prime.
- #