summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_compilation_when_not_using_xinerama.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-11-07 12:06:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-08 17:31:35 +0000
commit32c1180c88e6845156ee170d68b86d7c55d31ff5 (patch)
tree8db2b740df3d8818e55eb1151351576f3fbbca2a /meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_compilation_when_not_using_xinerama.patch
parentbd53283b599ae57a50e1966089222f3b9a81db12 (diff)
downloadpoky-32c1180c88e6845156ee170d68b86d7c55d31ff5.tar.gz
xserver-xorg: upgrade to 1.14.4
The xinerama and dixstruct patches are merged in 1.14.4, so drop them. Also drop explicit PR statement. (From OE-Core rev: 60973d0584e2533f0debfcd8e80c5e29beb68e37) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_compilation_when_not_using_xinerama.patch')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_compilation_when_not_using_xinerama.patch21
1 files changed, 0 insertions, 21 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_compilation_when_not_using_xinerama.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_compilation_when_not_using_xinerama.patch
deleted file mode 100644
index f0c165d26c..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_compilation_when_not_using_xinerama.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Upstream-Status: Pending
2
3fix compilation when not using xinerama
4
5Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
6
7Index: xorg-server-1.14.0/xfixes/xfixesint.h
8===================================================================
9--- xorg-server-1.14.0.orig/xfixes/xfixesint.h 2012-07-10 09:06:41.000000000 +0300
10+++ xorg-server-1.14.0/xfixes/xfixesint.h 2013-03-11 15:01:07.019098531 +0200
11@@ -291,8 +291,10 @@
12 SProcXFixesDestroyPointerBarrier(ClientPtr client);
13
14 /* Xinerama */
15+#ifdef PANORAMIX
16 extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) (ClientPtr);
17 void PanoramiXFixesInit(void);
18 void PanoramiXFixesReset(void);
19+#endif
20
21 #endif /* _XFIXESINT_H_ */