diff options
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch | 35 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb | 1 |
2 files changed, 0 insertions, 36 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch deleted file mode 100644 index 045e24a281..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | Subject: Add AArch64 support to xserver-xorg | ||
2 | Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | ||
3 | |||
4 | lnx_video.c parts are not existing in 1.14 branch. | ||
5 | |||
6 | Xserver was checked in AArch64 fastmodel (commercial one with graphics support). | ||
7 | |||
8 | http://patchwork.freedesktop.org/patch/12785/ | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | --- | ||
13 | include/servermd.h | 7 +++++++ | ||
14 | 1 files changed, 7 insertions(+), 0 deletions(-) | ||
15 | |||
16 | --- xorg-server-1.13.1.orig/include/servermd.h | ||
17 | +++ xorg-server-1.13.1/include/servermd.h | ||
18 | @@ -243,10 +243,17 @@ SOFTWARE. | ||
19 | #define BITMAP_BIT_ORDER LSBFirst | ||
20 | #define GLYPHPADBYTES 4 | ||
21 | /* ???? */ | ||
22 | #endif /* AMD64 */ | ||
23 | |||
24 | +#if defined(__aarch64__) || defined(aarch64) || defined(__aarch64) | ||
25 | +#define IMAGE_BYTE_ORDER MSBFirst | ||
26 | +#define BITMAP_BIT_ORDER MSBFirst | ||
27 | +#define GLYPHPADBYTES 4 | ||
28 | +/* ???? */ | ||
29 | +#endif /* AArch64 */ | ||
30 | + | ||
31 | #if defined(SVR4) && (defined(__i386__) || defined(__i386) ) || \ | ||
32 | defined(__alpha__) || defined(__alpha) || \ | ||
33 | defined(__i386__) || \ | ||
34 | defined(__s390x__) || defined(__s390__) | ||
35 | |||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb index 22ac604433..e952e6096a 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb | |||
@@ -4,7 +4,6 @@ require xserver-xorg.inc | |||
4 | SRC_URI += "file://crosscompile.patch \ | 4 | 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 \ | ||
8 | file://xorg-CVE-2013-6424.patch \ | 7 | file://xorg-CVE-2013-6424.patch \ |
9 | file://xshmfence-option.patch \ | 8 | file://xshmfence-option.patch \ |
10 | " | 9 | " |