pacho       15/01/18 22:21:11

  Added:                xf86-video-vmware-13.0.2-fix-includes.patch
  Log:
  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)

Revision  Changes    Path
1.1                  
x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.2-fix-includes.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.2-fix-includes.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.2-fix-includes.patch?rev=1.1&content-type=text/plain

Index: xf86-video-vmware-13.0.2-fix-includes.patch
===================================================================
>From 4664412d7a5266d2b392957406b34abc5db95e48 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <[email protected]>
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 <[email protected]>
Reviewed-by: Daniel Stone <[email protected]>
Acked-by: Thomas Hellstrom <[email protected]>

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





Reply via email to