- u_xf86xv.h-cannot-be-included-without-first-including-.patch
* include xorg-server.h before xf86xv.h in order to fix build with latest glibc OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-vmware?expand=0&rev=27
This commit is contained in:
43
u_xf86xv.h-cannot-be-included-without-first-including-.patch
Normal file
43
u_xf86xv.h-cannot-be-included-without-first-including-.patch
Normal file
@@ -0,0 +1,43 @@
|
||||
From 5efdd9808dcd42b95241142a309b3298c54ab4f5 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Dirsch <sndirsch@suse.de>
|
||||
Date: Mon, 6 Oct 2014 12:52:16 +0200
|
||||
Subject: [PATCH] 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>
|
||||
---
|
||||
vmwgfx/vmwgfx_overlay.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
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(...)
|
||||
--
|
||||
1.8.4.5
|
||||
|
@@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 6 10:55:58 UTC 2014 - sndirsch@suse.com
|
||||
|
||||
- u_xf86xv.h-cannot-be-included-without-first-including-.patch
|
||||
* include xorg-server.h before xf86xv.h in order to fix
|
||||
build with latest glibc
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 7 09:55:35 UTC 2014 - sndirsch@suse.com
|
||||
|
||||
|
@@ -25,6 +25,7 @@ Group: System/X11/Servers/XF86_4
|
||||
Url: http://xorg.freedesktop.org/
|
||||
#http://xorg.freedesktop.org/releases/individual/driver/
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
Patch0: u_xf86xv.h-cannot-be-included-without-first-including-.patch
|
||||
ExclusiveArch: %ix86 x86_64
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: pkgconfig(fontsproto)
|
||||
@@ -49,6 +50,7 @@ vmware is an Xorg driver for VMware virtual video cards.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%configure
|
||||
|
Reference in New Issue
Block a user