summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@cn.fujitsu.com>2019-11-28 01:12:27 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-04 12:30:58 +0000
commit888fbea05e119af294b52bc9d4a673ebfa03bd95 (patch)
tree135f7255ea8a8ccc61fee70680ac38aa5fd03b76 /meta/recipes-graphics/xorg-xserver
parentd40bb2b4d18af75f60480810d43bc59462078594 (diff)
downloadpoky-888fbea05e119af294b52bc9d4a673ebfa03bd95.tar.gz
xserver-xorg: 1.20.5 -> 1.20.6
(From OE-Core rev: da8533fcbb3595b14a24f14d6ee7bb7e4665143d) Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch63
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.5.bb)5
2 files changed, 2 insertions, 66 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch
deleted file mode 100644
index da9a4f2b25..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1From 2ba9510721b7a76cb7fe507449fa0ac997a4cce3 Mon Sep 17 00:00:00 2001
2From: Olivier Fourdan <ofourdan@redhat.com>
3Date: Mon, 1 Jul 2019 13:20:39 +0200
4Subject: [PATCH] compiler.h: Do not include sys/io.h on ARM with glibc
5
6<sys/io.h> on ARM hasn't worked for a long, long time, so it was removed
7it from glibc upstream.
8
9Remove the include to avoid a compilation failure on ARM with glibc.
10
11Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
12Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/840
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14
15Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/commit/fe4cd0e7f5c58fa94db36326aadc1bd4e6d73eba]
16---
17 hw/xfree86/common/compiler.h | 30 ------------------------------
18 1 file changed, 30 deletions(-)
19
20diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
21index 7144c6a..2b2008b 100644
22--- a/hw/xfree86/common/compiler.h
23+++ b/hw/xfree86/common/compiler.h
24@@ -758,36 +758,6 @@ inl(unsigned short port)
25 return xf86ReadMmio32Le((void *) ioBase, port);
26 }
27
28-#elif defined(__arm__) && defined(__linux__)
29-
30-/* for Linux on ARM, we use the LIBC inx/outx routines */
31-/* note that the appropriate setup via "ioperm" needs to be done */
32-/* *before* any inx/outx is done. */
33-
34-#include <sys/io.h>
35-
36-static __inline__ void
37-xf_outb(unsigned short port, unsigned char val)
38-{
39- outb(val, port);
40-}
41-
42-static __inline__ void
43-xf_outw(unsigned short port, unsigned short val)
44-{
45- outw(val, port);
46-}
47-
48-static __inline__ void
49-xf_outl(unsigned short port, unsigned int val)
50-{
51- outl(val, port);
52-}
53-
54-#define outb xf_outb
55-#define outw xf_outw
56-#define outl xf_outl
57-
58 #elif defined(__nds32__)
59
60 /*
61--
622.22.0
63
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.5.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb
index 3de6d22e57..9218b4f69d 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.5.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb
@@ -3,11 +3,10 @@ require xserver-xorg.inc
3SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ 3SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
4 file://pkgconfig.patch \ 4 file://pkgconfig.patch \
5 file://0001-test-xtest-Initialize-array-with-braces.patch \ 5 file://0001-test-xtest-Initialize-array-with-braces.patch \
6 file://0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch \
7 file://sdksyms-no-build-path.patch \ 6 file://sdksyms-no-build-path.patch \
8 " 7 "
9SRC_URI[md5sum] = "c9fc7e21e11286dbedd22c00df652130" 8SRC_URI[md5sum] = "a98170084f2c8fed480d2ff601f8a14b"
10SRC_URI[sha256sum] = "a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d" 9SRC_URI[sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1"
11 10
12# These extensions are now integrated into the server, so declare the migration 11# These extensions are now integrated into the server, so declare the migration
13# path for in-place upgrades. 12# path for in-place upgrades.