Fix compilation (#530978 by Leonid Kopylov, Chí-Thanh Christopher Nguyễn, Pieter Van den Abeele and Tobias Müller)

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 60 insertions, 20 deletions

diff --git a/x11-drivers/xf86-video-vmware/ChangeLog b/x11-drivers/xf86-video-vmware/ChangeLog
index 19f04a38bc4c..d3a989221a00 100644
--- a/x11-drivers/xf86-video-vmware/ChangeLog
+++ b/x11-drivers/xf86-video-vmware/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-vmware
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/ChangeLog,v 1.80 2014/04/06 10:11:30 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/ChangeLog,v 1.81 2015/01/18 22:21:11 pacho Exp $
+
+  18 Jan 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/xf86-video-vmware-13.0.2-fix-includes.patch,
+  xf86-video-vmware-13.0.2.ebuild:
+  Fix compilation (#530978 by Leonid Kopylov, Chí-Thanh Christopher Nguyễn,
+  Pieter Van den Abeele and Tobias Müller)
 
   06 Apr 2014; Agostino Sarubbo <ago@gentoo.org>
   xf86-video-vmware-13.0.1-r1.ebuild:
diff --git a/x11-drivers/xf86-video-vmware/Manifest b/x11-drivers/xf86-video-vmware/Manifest
index a6f67e661d9a..f84758cf4142 100644
--- a/x11-drivers/xf86-video-vmware/Manifest
+++ b/x11-drivers/xf86-video-vmware/Manifest
@@ -6,6 +6,7 @@ AUX xf86-video-vmware-13.0.0-remove-mibstore_h.patch 1686 SHA256 0a0fce7ddcb9c53
 AUX xf86-video-vmware-13.0.1-damageunregister.patch 1095 SHA256 2f60533fa5f0f1b7cefe174b6b0cd3b60373d0a3a5ea2bfea73a33c1764c2a13 SHA512 d6b9a37dba30b7d47624f86f824723fa4b98b8b06072b33439a65ba44ff7c18123dbefd5aad7d19c079c3bf6028d683d9c852b014428fcff79412bee779a0efb WHIRLPOOL 55d3c8f521e9c80d77fb7521ceb937d560ab8279beb6060e901a66aa104185f7b7bbb35dc14cc9c8c60e01af24c3dab7a305c184fdf1bcb7a8f027852ec58eb3
 AUX xf86-video-vmware-13.0.1-xa-compat-2.patch 830 SHA256 7f6da81f7ff750f64894fba2d3d290724c8c9c0dcb1ddce561f150367ec3680b SHA512 332ce8c6f0cd1a19a3b718cc07a599bbb73f9c34a146be2f18e8ba1596dfa4bd4e0d5ed95e4b593bc17fb11601d3c1b9b47b146836d56bab361dec26c8a41b8c WHIRLPOOL 82ae8f42916dd46efd5c630cebcfccc1827b9c54341c29746eea5a696dffc9657d9b8a57a8427223bb2556426b54df1b40b9f9a2b9dffd58b52338bf642ed775
 AUX xf86-video-vmware-13.0.1-xatracker-2.patch 5781 SHA256 4a04f46547f9f35f222d59dbc727ea4f2691f0aada4bf9b555e49b04964c88a1 SHA512 5325801b0c5f228d6241df62e16de5505d670bdbf77888ecefb3e7d7c83822070e8f9295beea9dc51ab714163b7825200e5c472042248b389911c57e275f0e8a WHIRLPOOL 13e13a6aaac961be3fa83023543ede8be9b408130dc474a4dda11e2786b08cf4a3be6595625d6b58d9f3ce47efd1a26b9f178913deaf23a79476eecbc2482e3e
+AUX xf86-video-vmware-13.0.2-fix-includes.patch 1396 SHA256 a3f9b959e79958b44cdda0444e5f3e54503c5f72e869fb6d242e9463d25e2a8f SHA512 5e0d419952e0f9ecc56a9b34bbb55bbd4086682a8ca1500244799f3283244365161e1b26ffa62fac8c5b46d6b3bc0c3d02dff704cb58ba26f3c0b644fe80f3d8 WHIRLPOOL c2c488075567ae7408cfd1de19172d25a6dcd831f4867c0522d83856e10d0db2f6204fcac64131a133ab69e16d1de0da041fe1e533e89a8ba90f95ebac2901ff
 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
@@ -15,23 +16,13 @@ EBUILD xf86-video-vmware-13.0.0-r1.ebuild 521 SHA256 8275223630860dd91d6f3db28dd
 EBUILD xf86-video-vmware-13.0.0.ebuild 461 SHA256 18a97061379acf8da326be0810f01e062c2fc9450af8a6bbde12bd52827408ca SHA512 adc5e9bfbf0aa4d93d5ea3f1bbebc502edcaa6fa8868e11daa37f13c5893fca2bd9133d96c5373085ef5099d644518ac90d3c185b79bbaaefd93106069bc5bf6 WHIRLPOOL 51736e6f7a459e8e90126fddd9850e10157dec999ecb1d8abf214570469c0c67890e754f4d8f150876489d7703a5d94d4db4f9d999cd58f977f94e48a6c35b2e
 EBUILD xf86-video-vmware-13.0.1-r1.ebuild 615 SHA256 ec5b8b74675e9e2c981f229defc0743ff4ddbe0a5e995f2a5c810310e6654df1 SHA512 3417efd392d11e233bd8b233d15e1b13f964b745dd89d3cfcefa511eb334a69c6854547399eecdd71c3e5714205ad91ac9c332d9e0d5e6e11382c8d4305d7b65 WHIRLPOOL a184c293b5a148764e72fd03e522e470349b91500ad35135d0b99727af865491b093c08cb9b76826cb890ff1552fd5bdc9f805abf92e992596a6ac9a4eda8704
 EBUILD xf86-video-vmware-13.0.1.ebuild 515 SHA256 ad7f69e252909ffb2a3f152c264514837cf31779a4a90b8a7f5cb802440d5dea SHA512 e45be0f180c4715e08a6bc68cb97a04c9446d730c4b0d9a007eaa32a788d42a1d961523fb71015a9d4d22b610a87612207d4b03ccc16ad6970acbd7375ff7ab8 WHIRLPOOL 1541a158ea55418311ce980acdd15c61db2bb8080df3a28d86e5867bd4a9c509b0bb81082397ecd91d7902aa5b6dfe7ec6475cc9b4fa2a79ae539899b880e461
-EBUILD xf86-video-vmware-13.0.2.ebuild 461 SHA256 e22046bd1fcf61584b39646ef91507db60a2d8d8510f9e4707a70dcfcb566b76 SHA512 6759116084c6fd317dd255a50030e293096ce76d7fa470e06bb39000074bf6d1708bab42f094a4e03eb5718e4e4b5a1bfee9f6a5c4391aaba2a7f219905543b0 WHIRLPOOL 6f57d18d418b0664dc362ac7ca169b38b229b8123d29139425f89733eae0d2e96363281123cfa5106fd1b46761580ddfd20f8a01c5b6b1c13ee99aab6f67d688
-MISC ChangeLog 12660 SHA256 5fcf6b1fe78ce477f67afc2d0539aedb7bede599b66496b6ab34c06128787c57 SHA512 78d3cb63488523d88445ad433ca60db3a08a8d4aeeb222ee9eff6daa33acdbf43f63b09ea5e0586c37853704d86c19ca2565fa532f4c9845d9bcefe3466508f2 WHIRLPOOL ca4c9e45b5a8ee9f3a8332f715836c6438c0fbaefa906300c315038729e5e2f5845c6c6f0931b470ec1fd83b6ef2b731dc531184d3c9e17848be12e91f8e6cc2
+EBUILD xf86-video-vmware-13.0.2.ebuild 517 SHA256 bd5d4309017f6553d9a3d7c042e90d6574f1ba430e0095b4f4ae5a04a787d15e SHA512 fc1d4b51305995ab663ca1ba37779273fb2f01dfdc88162b44fc97669ce96e7cfb9616a06ed262183d1334e62505b04d59fe08e35adc1c923609a92835ef09f1 WHIRLPOOL c7559af078e270bc26328924adf942be3a2125d89999ee3841e62d828f7e7536c71007d68a89f40194e3ff8107ff2aad1346aed0e1ddc8fad47e5fd67484581f
+MISC ChangeLog 12921 SHA256 56c08e30a72f798fd07d0437311521da950348dec1a20d2f65cd00c9c680dbfb SHA512 cf50e612e6e33f95cb0cbe1adff6fc146dbc1d9b2439ab130afee1fa92b14bec7c3c8e5a51327b7fb8bfb696fb52d94f6008d82c10a9c58f9babd05706bd5d59 WHIRLPOOL 48c852337debd9a10e49aa2920a8ba0edbdd3cba0662930b73d0083491113a2fb78a264554b16aabd0c0818561153d41950e801bbf18a2a23e34e806f237a355
 MISC metadata.xml 254 SHA256 32d68d1ad2e14d3f3af865dce8b2e42fec8722f17b1b35beeb5ecbd9b8e1a253 SHA512 6d59e8be0228a3a61b27b0984a3ec1a98d5288106c62d9b5fcec735138f3671aec4217de6220c7c978e255242d0db6f71abccae79cc385ce06a6b3d895d00f06 WHIRLPOOL 64bff93fcf13f4db3f1adb4a3d07352faf3d1d2af0ae4fca3411e9b31e40f6494cca8373f83ef0daac2bfaeed1c20bb6af06507d3ae50f3fece86dc7c80c41fa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTQShTAAoJELp701BxlEWfM5AP/i6DMDpfBT/66wtoqtixHw9l
-Rxbvn2s7IUg67GeJV2DfzQYaPMOceRFvYgjtHR0L+/ujHT5XQpAkar2BiHICmv1K
-ImDivTTkNMOYPVZRCKGxIfROA73HVLmx/cye9sYQ4P0muFveRLAKo6yvzzs4nGJg
-Jl714ldRUaiMMGY4G4lVAeQdfp/DN9E0UOk1wXZDDhZh2Phk/7M0igHEusaOQts9
-72ef0FAM+vXryuOH4mJWTBBD1CfPMxB/kRpBaOUF38gV5iQ5egwAlqXEDqHiRw++
-LBgVwt782/6EuguGi+B06icedlNN/0Z7MmvZmSoGn1kdTaATKc+6ElonKfKQvb2R
-BYRwU8akTpQ43byZnI7G+D6jzorkYQ3f+NaOxh/oChs+YQQMdHVRKTa4IUyR3gE8
-i1FetDor/mCPmZwoO+gobG+6gGl+ZC6gu+mHgwtsT2HulYDk8lQd5YHoGEl2yNEE
-R4ppALQn8v6He1lADqOahRAP2GJoV8wwiKwVzi3+r5cCfIjYfsgJPx5ps8a+Q/TW
-peR7DqMi1Yjx4/D4nqh5XmS8ql/G38SWIuaw+t8q51b9x5hPSGNKod6YlFQ0Fv+V
-j1jhCx4QBREkookGFuBcucGgpLE2Jkx5NkePpldRQTgvCwv1nxeDZRoSkcMaiQ0u
-TFd4LotIKHzLKwIKXrLJ
-=sN/G
+iEYEAREIAAYFAlS8MdgACgkQCaWpQKGI+9QUqQCfSTzaekx+d5lxgVe6ZbhSDGln
+wPoAn2EGwSgyadckTHrHKzMbl+wZcLfD
+=Asyz
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.2-fix-includes.patch b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.2-fix-includes.patch
new file mode 100644
index 000000000000..434cb679f761
--- /dev/null
+++ b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.2-fix-includes.patch
@@ -0,0 +1,41 @@
+From 4664412d7a5266d2b392957406b34abc5db95e48 Mon Sep 17 00:00:00 2001
+From: Stefan Dirsch <sndirsch@suse.de>
+Date: Tue, 7 Oct 2014 11:29:32 +0200
+Subject: xf86xv.h cannot be included without first including xorg-server.h.
+
+Without this the build fails on systems with the latest glibc,
+throwing this error:
+
+In file included from /usr/include/string.h:634:0,
+                 from /usr/include/xorg/os.h:53,
+                 from /usr/include/xorg/misc.h:115,
+                 from /usr/include/xorg/screenint.h:50,
+                 from /usr/include/xorg/scrnintstr.h:50,
+                 from /usr/include/xorg/xvdix.h:55,
+                 from /usr/include/xorg/xf86xv.h:32,
+                 from vmwgfx_overlay.c:38:
+/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
+strndup(const char *str, size_t n);
+
+This is caused by HAVE_STRNDUP not being set (it is set from xorg-server.h),
+causing os.h to redefine it.
+
+Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
+Reviewed-by: Daniel Stone <daniels@collabora.com>
+Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
+
+diff --git a/vmwgfx/vmwgfx_overlay.c b/vmwgfx/vmwgfx_overlay.c
+index ef1d541..2b05b0e 100644
+--- a/vmwgfx/vmwgfx_overlay.c
++++ b/vmwgfx/vmwgfx_overlay.c
+@@ -35,6 +35,7 @@
+  */
+ 
+ 
++#include "xorg-server.h"
+ #include "xf86xv.h"
+ #include "fourcc.h"
+ #define debug_printf(...)
+-- 
+cgit v0.10.2
+
diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.2.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.2.ebuild
index 8846cb1f33fd..5fecf72e3366 100644
--- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.2.ebuild
+++ b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.2.ebuild,v 1.1 2014/03/27 18:19:01 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.2.ebuild,v 1.2 2015/01/18 22:21:11 pacho Exp $
 
 EAPI=5
 
@@ -14,3 +14,5 @@ IUSE=""
 RDEPEND="x11-libs/libdrm[libkms,video_cards_vmware]
 	media-libs/mesa[xa]"
 DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-13.0.2-fix-includes.patch )