Add patch to fix building against xorg-server-1.14.99.903

Package-Manager: portage-2.2.7/cvs/Linux x86_64

4 files changed, 52 insertions, 24 deletions

diff --git a/x11-drivers/xf86-video-vmware/ChangeLog b/x11-drivers/xf86-video-vmware/ChangeLog
index b9c7c093a932..966d0c561b41 100644
--- a/x11-drivers/xf86-video-vmware/ChangeLog
+++ b/x11-drivers/xf86-video-vmware/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-vmware
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/ChangeLog,v 1.75 2013/10/08 05:07:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/ChangeLog,v 1.76 2013/12/04 01:17:59 chithanh Exp $
+
+  04 Dec 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-vmware-13.0.1-damageunregister.patch,
+  xf86-video-vmware-13.0.1.ebuild:
+  Add patch to fix building against xorg-server-1.14.99.903
 
   08 Oct 2013; Agostino Sarubbo <ago@gentoo.org>
   xf86-video-vmware-13.0.1.ebuild:
diff --git a/x11-drivers/xf86-video-vmware/Manifest b/x11-drivers/xf86-video-vmware/Manifest
index eb1e1dc7b33d..5cad24692cc1 100644
--- a/x11-drivers/xf86-video-vmware/Manifest
+++ b/x11-drivers/xf86-video-vmware/Manifest
@@ -1,31 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX xf86-video-vmware-12.0.2-xorg-server-1.13.patch 19856 SHA256 22363b8decf438db2eace2e2d7768517d2a5b4c48669cf40e55239dfbeb32ea6 SHA512 d4d5f58973c8ff463d3acc5166a23b932d9f5f47154f68ad23e74dc836d0681bf6fbc696f1de526fd18cad9d4fb4648d543d32db078e273a21e59ad88566bad0 WHIRLPOOL 3ff992b6ead7f768c374d1318aafc1962e1fb800f11f8da075e5283545e2704202f41e236f6687fd6d932dea7b63aea92285d792286448bb4499fdfd375d9f9c
 AUX xf86-video-vmware-13.0.0-remove-mibstore_h.patch 1686 SHA256 0a0fce7ddcb9c53da1b2aa1aa11317c10f0161026f40c82523c4dc0fd496016f SHA512 e362315fde7c4b61462aef49d7d21affafc0e5641bef693a2910247d0ad1331f1f2a538a2f5addafd1d96cc2decf140743728adbc61387201ba8b02d5ae06e0e WHIRLPOOL 72ab6c88a628bc0d27e6bb52538271e9304207cc57c8cc47e3f6eafdc1b51c6a65d8cfa2d2e19a22b91e59d9349d4cd9ca77821b06c4b5530405a30edbfc11f0
+AUX xf86-video-vmware-13.0.1-damageunregister.patch 1095 SHA256 2f60533fa5f0f1b7cefe174b6b0cd3b60373d0a3a5ea2bfea73a33c1764c2a13 SHA512 d6b9a37dba30b7d47624f86f824723fa4b98b8b06072b33439a65ba44ff7c18123dbefd5aad7d19c079c3bf6028d683d9c852b014428fcff79412bee779a0efb WHIRLPOOL 55d3c8f521e9c80d77fb7521ceb937d560ab8279beb6060e901a66aa104185f7b7bbb35dc14cc9c8c60e01af24c3dab7a305c184fdf1bcb7a8f027852ec58eb3
 DIST xf86-video-vmware-12.0.2.tar.bz2 432468 SHA256 c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147 SHA512 14adbde330e247251fd425449fb79c8399f14ad9a295a1bea776e9bd77706ff9db9a7d0351f5faa8b96aac2b1d747ea289dc89b5cfdcbce5a11bba80b6765709 WHIRLPOOL b3061ef519f77bd8418bf48dafa2f18abb9d435f2eee7b3f64a217744eabaae4313d1d7cc22803817b5eceaeaa0347bcfc03e1c22535d34a6854a5d638c08fdc
 DIST xf86-video-vmware-13.0.0.tar.bz2 445703 SHA256 44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6 SHA512 4106c17469dc1d7fd3d6a9acd5c45d0cdae0d7c8c5ad9463d24de138fd67dbdf09cd32e0665063822d12dad512b27ccd16497097484551778fffabf7db8d5cfe WHIRLPOOL 86889dc1de009699db3b926ba76d5a1775c05f048ff47acd51212e61d6826b572966d89a4e54bc5551884d604e08b5255bd5d4638863ffc97ea8831286514088
 DIST xf86-video-vmware-13.0.1.tar.bz2 432401 SHA256 802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d SHA512 2faf5fd524dffd2cd89a8b5a06b5470acbc51c3ee4f48bafc425b8e9c7c76d294201651cfb8c1d104c313885108e22abb6da736de1f3dbcf134a0926158ed147 WHIRLPOOL c52cb2a65f243a3cbe70da5f007aa0af97cf32e576b8bb6a400374d775edaab78ccf9ac341f94fc4bd95a2cf58672adce4462b079d889338f0b5ea93a8cd4252
 EBUILD xf86-video-vmware-12.0.2-r1.ebuild 513 SHA256 5563ed9b1309df0c1446f596c06448d1f3feefdacf423002f1d8f85e8b4c03ad SHA512 b550ea276f9214920f6a710a11f3e6f1ed13d2166b1a76a933634ac714bfb0b69aadf42ad0aee7a4d86aba1ae0cbad4172901c156036cd8373ef9612c8d108ae WHIRLPOOL 91ebadf26c4edbe91f3fb243e723d08421b48a4e129265808b05dba62c976dc9c0d5ac770fe9a3681d3f186b943853f7e31ec27945487e48455e9b23a6c5919b
 EBUILD xf86-video-vmware-13.0.0-r1.ebuild 521 SHA256 8275223630860dd91d6f3db28dd6f27b2ed16a5943dc0fddad3c18dfe1f9398b SHA512 1c283ba44e9db5f7d4cf42f60f4c59394f80fecbc7559e73e2e06436e5e622c929d7bf8ec3a62682ef544a1170f1342f8cca410a9ef02607d9aaa76073cfb2cf WHIRLPOOL 571379bc1c6b5a536236c2e93b539c49233bf968113ef1035cd61d07b915b3485e693c541558c1d0c6c1bd757c578b97155873dac07d33b3309f39afe350c6de
 EBUILD xf86-video-vmware-13.0.0.ebuild 461 SHA256 18a97061379acf8da326be0810f01e062c2fc9450af8a6bbde12bd52827408ca SHA512 adc5e9bfbf0aa4d93d5ea3f1bbebc502edcaa6fa8868e11daa37f13c5893fca2bd9133d96c5373085ef5099d644518ac90d3c185b79bbaaefd93106069bc5bf6 WHIRLPOOL 51736e6f7a459e8e90126fddd9850e10157dec999ecb1d8abf214570469c0c67890e754f4d8f150876489d7703a5d94d4db4f9d999cd58f977f94e48a6c35b2e
-EBUILD xf86-video-vmware-13.0.1.ebuild 454 SHA256 71310e81beee1c9dc1c746b55425c83d34ef451d271e8354e95f2ab44c64eca5 SHA512 eb3628fc94762f5471a3d3ef61a5a11fbed1634b849be6a1112b08dd76e6578edf3c5d61f389bc70cccea9d0535b3df5a5705c42281563701dbc332a37d4c8b8 WHIRLPOOL 5f17383db795139e4734dae7f1afd1c24c247538b12c987e08c32f4547ceee07bfb780de59c9c592ee2ee43c54afe420d56fc2b800e84eaa44d2dea56e156b68
-MISC ChangeLog 11721 SHA256 4c0be13cd7dad1e022e9511ca89af76c1e0ac115eabc8ccce904be4fc6c66d4d SHA512 2f1f6b295c16256e1d9bc48885968207014ab6f9dec1e2b3ec8e49777ace620ce4a2caf74bb8ce29f7b49bd06d3d1e16ff84799f70dc100807cd68ea8020b7d0 WHIRLPOOL e88c54c15c4c694afd019e822b638dd5338dc6daa686c8e338b3ee26598cf6980f6af9d68e733229bf990b3b2ba8bd9dc741deb6e198496f34952ebf3dc2a63a
+EBUILD xf86-video-vmware-13.0.1.ebuild 515 SHA256 ad7f69e252909ffb2a3f152c264514837cf31779a4a90b8a7f5cb802440d5dea SHA512 e45be0f180c4715e08a6bc68cb97a04c9446d730c4b0d9a007eaa32a788d42a1d961523fb71015a9d4d22b610a87612207d4b03ccc16ad6970acbd7375ff7ab8 WHIRLPOOL 1541a158ea55418311ce980acdd15c61db2bb8080df3a28d86e5867bd4a9c509b0bb81082397ecd91d7902aa5b6dfe7ec6475cc9b4fa2a79ae539899b880e461
+MISC ChangeLog 11949 SHA256 b3be02a79642704754c8391fabf955aa63c79c07ea50530e3d146b22e501e94d SHA512 2c50427cad5290dbef55446fca7865802166be212b5a54b33bedc4acf9c7438cad24bf9567c96743810131a7f43a174aa121a50eff7d42f5c3b7477194ce6515 WHIRLPOOL 983c0815355a9abb4d2e0d8b974f2b216aabc1c3f1aca3ee46918473b357eafbb69e33fb2ebb5f2ec8ecb7926fa1c597fba413041aeb7a52c66124c9f8aea16d
 MISC metadata.xml 254 SHA256 32d68d1ad2e14d3f3af865dce8b2e42fec8722f17b1b35beeb5ecbd9b8e1a253 SHA512 6d59e8be0228a3a61b27b0984a3ec1a98d5288106c62d9b5fcec735138f3671aec4217de6220c7c978e255242d0db6f71abccae79cc385ce06a6b3d895d00f06 WHIRLPOOL 64bff93fcf13f4db3f1adb4a3d07352faf3d1d2af0ae4fca3411e9b31e40f6494cca8373f83ef0daac2bfaeed1c20bb6af06507d3ae50f3fece86dc7c80c41fa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCgAGBQJSU5LvAAoJELp701BxlEWfufwP/RxMOxANAeVWcxuh/9bfW5NV
-xtR+YemJ2Mc1Xb1AFtiQBzmxUEgju2AXLlk/gjYTHXlh49LoVJuSL4cLoyrF4/1r
-UzQFN5qeil7rRzW8aOA1H+vQmNqxSYXgp5Rm+5IG5A2OI9WzsaBjSJZf4NOFKsh7
-Sa/87Or4YJBvoPalxC9kY1n5ojt2oTK/jPRL4iMU891nyHMuXgu6Fcd9YCq+lBIh
-95NFXLsecvX3w13dwwM2pZ4ERVSIuexjkqmeC5x2uO2K5G9a3Y2FfBfEgQTW/XFp
-jFl+TzkAt0tSYP4Hu0IhfNkL+S8s/xXdlRKMekFd+Gyp/hIjSuGqxz4QlyWJ3+Hd
-Ck4xU+pakWeC17VpE/fP7e33IR0NwGd0+0zfTWJ10btbNoQzhHZ+E1zIOa18U6qv
-DtmwWOnhSPKHR7hl8kwI68ByvjTqERMiNLNL9AfzVpxW0zh0p7LjcJWsqJJ8Zmiy
-aP9HGSW/je5dLG7cMTYnseIO/pPFB2XwL7gr2nI+qviPIYq+WWyjLQExG0Dxnyfr
-mnkWpPrBK+wf5woU3/BsrkZ1VcAZEge1lVGnO61RdA+i6BJ5McLsMujq8DNm/NN9
-pB9YPz7snx0UE+fpGGvKydqyDKBBkJtJNAmDnwwq36l2gaMxRlVoCrNfm1FzOm/H
-EiCa7r1ggw+7Y13p/i0T
-=V2H7
------END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-damageunregister.patch b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-damageunregister.patch
new file mode 100644
index 000000000000..0b2a8e6869b3
--- /dev/null
+++ b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-damageunregister.patch
@@ -0,0 +1,38 @@
+From e26dec8f5278df74a102493bf6d2d8444dab5d6d Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon, 28 Oct 2013 22:21:29 +0000
+Subject: 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>
+---
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index fd80682..346e7f4 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;
+ }
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1.ebuild
index cb359f7a52ed..acd4f12ab809 100644
--- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1.ebuild
+++ b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1.ebuild,v 1.3 2013/10/08 05:07:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1.ebuild,v 1.4 2013/12/04 01:17:58 chithanh Exp $
 
 EAPI=5
 
@@ -14,3 +14,7 @@ IUSE=""
 RDEPEND="x11-libs/libdrm[libkms,video_cards_vmware]
 	media-libs/mesa[xa]"
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-damageunregister.patch
+)