diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2015-01-18 22:21:11 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2015-01-18 22:21:11 +0000 |
| commit | fce3404296daf9d36d12586d9ab736f1b379ce3f (patch) | |
| tree | 6443597a2b3a94a47516493f2ced001e7520186a /x11-drivers/xf86-video-vmware | |
| parent | Use java_prepare() instead of src_prepare. Add `doc' USE flag. (diff) | |
| download | gentoo-2-fce3404296daf9d36d12586d9ab736f1b379ce3f.tar.gz gentoo-2-fce3404296daf9d36d12586d9ab736f1b379ce3f.tar.bz2 gentoo-2-fce3404296daf9d36d12586d9ab736f1b379ce3f.zip | |
Fix compilation (#530978 by Leonid Kopylov, Chí-Thanh Christopher Nguyễn, Pieter Van den Abeele and Tobias Müller)
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'x11-drivers/xf86-video-vmware')
3 files changed, 53 insertions, 4 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/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 ) |