xserver-xorg-video-vmware: Changes to 'debian-unstable'

[Julien Cristau <jcristau@moszumanska.debian.org>]

 debian/changelog    |    7 +++++++
 vmwgfx/vmwgfx_saa.c |    6 ++++++
 2 files changed, 13 insertions(+)

New commits:
commit 38d102ca56729adae87efd8095e3bfc84f2309d4
Author: Julien Cristau <jcristau@debian.org>
Date:   Tue Feb 4 16:56:22 2014 +0100

    Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 7ef6574..f91f5a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-vmware (1:13.0.1-3) unstable; urgency=medium
+
+  * vmwgfx: handle changes of DamageUnregister API in 1.14.99.2 (closes:
+    #736981)
+
+ -- Julien Cristau <jcristau@debian.org>  Tue, 04 Feb 2014 16:56:20 +0100
+
 xserver-xorg-video-vmware (1:13.0.1-2) unstable; urgency=low
 
   * Restrict libxatracker build-dep to Linux.

commit adfd0624add4a4ba49d5e51b8dafa3c65c35f425
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Mon Oct 28 18:21:29 2013 -0400

    vmwgfx: handle changes of DamageUnregister API in 1.14.99.2
    
    Fix is inspired from the intel driver.
    
    Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
    Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
    (cherry picked from commit e26dec8f5278df74a102493bf6d2d8444dab5d6d)

diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
index 63df3a1..52a4d55 100644
--- a/vmwgfx/vmwgfx_saa.c
+++ b/vmwgfx/vmwgfx_saa.c
@@ -26,6 +26,7 @@
  */
 
 #include <xorg-server.h>
+#include <xorgVersion.h>
 #include <mi.h>
 #include <fb.h>
 #include <xf86drmMode.h>
@@ -76,7 +77,12 @@ vmwgfx_pixmap_remove_damage(PixmapPtr pixmap)
     if (!spix->damage || vpix->hw || vpix->gmr || vpix->malloc)
 	return;
 
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0)
+    DamageUnregister(spix->damage);
+#else
     DamageUnregister(&pixmap->drawable, spix->damage);
+#endif
+
     DamageDestroy(spix->damage);
     spix->damage = NULL;
 }