diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.2-fix-includes.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.2-fix-includes.patch')
-rw-r--r-- | x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.2-fix-includes.patch | 41 |
1 files changed, 41 insertions, 0 deletions
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 + |