summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/0001-dixstruct.h-fix-segfaults-char-is-unsigned-for-ARM-a.patch39
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_compilation_when_not_using_xinerama.patch21
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/aarch64.patch)0
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/crosscompile.patch)0
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_open_max_preprocessor_error.patch)0
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/macro_tweak.patch)0
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/mips64-compiler.patch)0
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.4.bb (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bb)8
8 files changed, 2 insertions, 66 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/0001-dixstruct.h-fix-segfaults-char-is-unsigned-for-ARM-a.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/0001-dixstruct.h-fix-segfaults-char-is-unsigned-for-ARM-a.patch
deleted file mode 100644
index 16f0489c85..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/0001-dixstruct.h-fix-segfaults-char-is-unsigned-for-ARM-a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From a095f5005be66c1b9747187e91e5332b0d8b106b Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Tue, 16 Apr 2013 13:47:22 +0200
4Subject: [xserver 1.14/master] dixstruct.h: fix segfaults - char is unsigned
5 for ARM and PowerPC architectures
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10see ARM related bug reports [1-3]
11
12Upstream-Status: Submitted [4]
13
14[1] https://github.com/archlinuxarm/PKGBUILDs/issues/446I
15[2] http://www.raspberrypi.org/phpBB3/viewtopic.php?t=38568&p=321673
16[3] http://lists.linuxtogo.org/pipermail/openembedded-core/2013-April/037805.html
17[4] http://lists.x.org/archives/xorg-devel/2013-April/036010.html
18
19Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
20---
21 include/dixstruct.h | 2 +-
22 1 files changed, 1 insertions(+), 1 deletions(-)
23
24diff --git a/include/dixstruct.h b/include/dixstruct.h
25index 6784819..aef822c 100644
26--- a/include/dixstruct.h
27+++ b/include/dixstruct.h
28@@ -96,7 +96,7 @@ typedef struct _Client {
29 unsigned int clientGone:1;
30 unsigned int closeDownMode:2;
31 unsigned int clientState:2;
32- char smart_priority;
33+ signed char smart_priority;
34 short noClientException; /* this client died or needs to be killed */
35 int priority;
36 ReplySwapPtr pSwapReplyFunc;
37--
381.7.6.5
39
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_ */
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/aarch64.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch
index 045e24a281..045e24a281 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/aarch64.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
index 2f98bb8c89..2f98bb8c89 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/crosscompile.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
index 2f629724c9..2f629724c9 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_open_max_preprocessor_error.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
index ec0eea6ca2..ec0eea6ca2 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/macro_tweak.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch
index 168368e6c3..168368e6c3 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/mips64-compiler.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.4.bb
index 8c573bdf30..22b1f82e89 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.4.bb
@@ -5,14 +5,10 @@ SRC_URI += "file://crosscompile.patch \
5 file://fix_open_max_preprocessor_error.patch \ 5 file://fix_open_max_preprocessor_error.patch \
6 file://mips64-compiler.patch \ 6 file://mips64-compiler.patch \
7 file://aarch64.patch \ 7 file://aarch64.patch \
8 file://fix_compilation_when_not_using_xinerama.patch \
9 file://0001-dixstruct.h-fix-segfaults-char-is-unsigned-for-ARM-a.patch \
10 " 8 "
11 9
12SRC_URI[md5sum] = "86110278b784e279381b7f6f2295c508" 10SRC_URI[md5sum] = "9d68a30258c67faa3c036a4a85e8bf97"
13SRC_URI[sha256sum] = "1f5107573252c26439fdd165481765a2c0964e02a2e9fab36e02414d08f30630" 11SRC_URI[sha256sum] = "608ccfaafb845f6e559884a30f946d365209172416710d687b190e9e1ff65dc3"
14
15PR = "${INC_PR}.1"
16 12
17# These extensions are now integrated into the server, so declare the migration 13# These extensions are now integrated into the server, so declare the migration
18# path for in-place upgrades. 14# path for in-place upgrades.