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>
This commit is contained in:
Ross Burton
2013-11-07 12:06:04 +00:00
committed by Richard Purdie
parent bd53283b59
commit 32c1180c88
8 changed files with 2 additions and 66 deletions

View File

@@ -1,39 +0,0 @@
From a095f5005be66c1b9747187e91e5332b0d8b106b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 16 Apr 2013 13:47:22 +0200
Subject: [xserver 1.14/master] dixstruct.h: fix segfaults - char is unsigned
for ARM and PowerPC architectures
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
see ARM related bug reports [1-3]
Upstream-Status: Submitted [4]
[1] https://github.com/archlinuxarm/PKGBUILDs/issues/446I
[2] http://www.raspberrypi.org/phpBB3/viewtopic.php?t=38568&p=321673
[3] http://lists.linuxtogo.org/pipermail/openembedded-core/2013-April/037805.html
[4] http://lists.x.org/archives/xorg-devel/2013-April/036010.html
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
include/dixstruct.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 6784819..aef822c 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -96,7 +96,7 @@ typedef struct _Client {
unsigned int clientGone:1;
unsigned int closeDownMode:2;
unsigned int clientState:2;
- char smart_priority;
+ signed char smart_priority;
short noClientException; /* this client died or needs to be killed */
int priority;
ReplySwapPtr pSwapReplyFunc;
--
1.7.6.5

View File

@@ -1,21 +0,0 @@
Upstream-Status: Pending
fix compilation when not using xinerama
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Index: xorg-server-1.14.0/xfixes/xfixesint.h
===================================================================
--- xorg-server-1.14.0.orig/xfixes/xfixesint.h 2012-07-10 09:06:41.000000000 +0300
+++ xorg-server-1.14.0/xfixes/xfixesint.h 2013-03-11 15:01:07.019098531 +0200
@@ -291,8 +291,10 @@
SProcXFixesDestroyPointerBarrier(ClientPtr client);
/* Xinerama */
+#ifdef PANORAMIX
extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) (ClientPtr);
void PanoramiXFixesInit(void);
void PanoramiXFixesReset(void);
+#endif
#endif /* _XFIXESINT_H_ */

View File

@@ -5,14 +5,10 @@ SRC_URI += "file://crosscompile.patch \
file://fix_open_max_preprocessor_error.patch \
file://mips64-compiler.patch \
file://aarch64.patch \
file://fix_compilation_when_not_using_xinerama.patch \
file://0001-dixstruct.h-fix-segfaults-char-is-unsigned-for-ARM-a.patch \
"
SRC_URI[md5sum] = "86110278b784e279381b7f6f2295c508"
SRC_URI[sha256sum] = "1f5107573252c26439fdd165481765a2c0964e02a2e9fab36e02414d08f30630"
PR = "${INC_PR}.1"
SRC_URI[md5sum] = "9d68a30258c67faa3c036a4a85e8bf97"
SRC_URI[sha256sum] = "608ccfaafb845f6e559884a30f946d365209172416710d687b190e9e1ff65dc3"
# These extensions are now integrated into the server, so declare the migration
# path for in-place upgrades.