Update to 13.0.2:

This release contains support for both XMir and XWayland, updated
support for the new XA version released with the new Mesa 10.1 version.


Gaetan Nadon (1):
      vmwgfx: handle changes of DamageUnregister API in 1.14.99.2

Jakob Bornecrantz (2):
      vmware: Fix compilation on newer X servers
      Bump the version number to 13.0.2

Rob Clark (1):
      vmwgfx: update for XA API changes

Thomas Hellstrom (17):
      vmwgfx: Avoid HW operations when not master
      vmwgfx: Implement textured video completely on top of XA.
      vmwgfx: Get rid of device-specific DMA code
      vmwgfx: Fix some compilation warnings and indentations
      vmwgfx: Support also XA version 1 v2
      vmwgfx: Remove stray 1
      Revert "vmwgfx: Get rid of device-specific DMA code"
      vmwgfx: Really allow XA version 2.
      vmwgfx: Fix compile breakage on XA version 1.
      vmwgfx: Add an infrastructure to be able to run hosted under a compositor v2
      vmwgfx: Add support for XMir v2.
      vmwgfx: Add support for XWayland
      vmwgfx: Enable direct dmas
      vmwgfx: Block DMA to prime surfaces for now
      vmware: Fix build errors and warnings
      vmware: Require libdrm 2.4.38 to build XMir.
      vmware/vmwgfx: Always allocate shared hardware surfaces.

4 files changed, 63 insertions, 7 deletions

diff --git a/x11/xf86-video-vmware/Makefile b/x11/xf86-video-vmware/Makefile
index a19f5a32f41..cbf1b2052e1 100644
--- a/x11/xf86-video-vmware/Makefile
+++ b/x11/xf86-video-vmware/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2013/05/16 06:32:45 richard Exp $
-#
+# $NetBSD: Makefile,v 1.17 2014/04/01 11:20:22 wiz Exp $
 
-DISTNAME=	xf86-video-vmware-13.0.1
+DISTNAME=	xf86-video-vmware-13.0.2
 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 c484d69ab18..6b429a51076 100644
--- a/x11/xf86-video-vmware/distinfo
+++ b/x11/xf86-video-vmware/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.8 2013/05/16 06:32:45 richard Exp $
+$NetBSD: distinfo,v 1.9 2014/04/01 11:20:22 wiz Exp $
 
-SHA1 (xf86-video-vmware-13.0.1.tar.bz2) = c7109eb9f683156b12d3c55a74d51345ab70abfe
-RMD160 (xf86-video-vmware-13.0.1.tar.bz2) = f4f48524069f6fe0ed9bdb755268f1483bc0459c
-Size (xf86-video-vmware-13.0.1.tar.bz2) = 432401 bytes
+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
diff --git a/x11/xf86-video-vmware/patches/patch-configure b/x11/xf86-video-vmware/patches/patch-configure
new file mode 100644
index 00000000000..8816815f390
--- /dev/null
+++ b/x11/xf86-video-vmware/patches/patch-configure
@@ -0,0 +1,40 @@
+$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
new file mode 100644
index 00000000000..e7c6052653c
--- /dev/null
+++ b/x11/xf86-video-vmware/patches/patch-configure.ac
@@ -0,0 +1,15 @@
+$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.
+ #