summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch64
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/aarch64.patch35
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/crosscompile.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/crosscompile.patch)0
-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-1.14.0/fix_open_max_preprocessor_error.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/fix_open_max_preprocessor_error.patch)0
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/macro_tweak.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/macro_tweak.patch)0
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/mips64-compiler.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/mips64-compiler.patch)0
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bb (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb)5
8 files changed, 59 insertions, 66 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch
deleted file mode 100644
index 8a4f3e33fe..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch
+++ /dev/null
@@ -1,64 +0,0 @@
1Subject: Add AArch64 support to xserver-xorg
2Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
3
4lnx_video.c parts are not existing in 1.14 branch.
5
6Xserver was checked in AArch64 fastmodel (commercial one with graphics support).
7
8http://patchwork.freedesktop.org/patch/12785/
9
10Upstream-status: Pending
11
12---
13 hw/xfree86/os-support/linux/lnx_video.c | 4 ++--
14 include/servermd.h | 7 +++++++
15 2 files changed, 9 insertions(+), 2 deletions(-)
16
17--- xorg-server-1.13.1.orig/hw/xfree86/os-support/linux/lnx_video.c
18+++ xorg-server-1.13.1/hw/xfree86/os-support/linux/lnx_video.c
19@@ -509,11 +509,11 @@ xf86EnableIO(void)
20 return FALSE;
21 }
22 #endif
23 }
24 close(fd);
25-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
26+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__) && !defined(__aarch64__)
27 if (ioperm(0, 1024, 1) || iopl(3)) {
28 if (errno == ENODEV)
29 ErrorF("xf86EnableIOPorts: no I/O ports found\n");
30 else
31 FatalError("xf86EnableIOPorts: failed to set IOPL"
32@@ -538,11 +538,11 @@ xf86DisableIO(void)
33 if (!ExtendedEnabled)
34 return;
35 #if defined(__powerpc__)
36 munmap(ioBase, 0x20000);
37 ioBase = NULL;
38-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__)
39+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__) && !defined(__aarch64__)
40 iopl(0);
41 ioperm(0, 1024, 0);
42 #endif
43 ExtendedEnabled = FALSE;
44
45--- xorg-server-1.13.1.orig/include/servermd.h
46+++ xorg-server-1.13.1/include/servermd.h
47@@ -243,10 +243,17 @@ SOFTWARE.
48 #define BITMAP_BIT_ORDER LSBFirst
49 #define GLYPHPADBYTES 4
50 /* ???? */
51 #endif /* AMD64 */
52
53+#if defined(__aarch64__) || defined(aarch64) || defined(__aarch64)
54+#define IMAGE_BYTE_ORDER MSBFirst
55+#define BITMAP_BIT_ORDER MSBFirst
56+#define GLYPHPADBYTES 4
57+/* ???? */
58+#endif /* AArch64 */
59+
60 #if defined(SVR4) && (defined(__i386__) || defined(__i386) ) || \
61 defined(__alpha__) || defined(__alpha) || \
62 defined(__i386__) || \
63 defined(__s390x__) || defined(__s390__)
64
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/aarch64.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/aarch64.patch
new file mode 100644
index 0000000000..7882ebe7ae
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/aarch64.patch
@@ -0,0 +1,35 @@
1Subject: Add AArch64 support to xserver-xorg
2Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
3
4lnx_video.c parts are not existing in 1.14 branch.
5
6Xserver was checked in AArch64 fastmodel (commercial one with graphics support).
7
8http://patchwork.freedesktop.org/patch/12785/
9
10Upstream-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.13.1/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/crosscompile.patch
index 2f98bb8c89..2f98bb8c89 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/crosscompile.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/crosscompile.patch
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
new file mode 100644
index 0000000000..f0c165d26c
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_compilation_when_not_using_xinerama.patch
@@ -0,0 +1,21 @@
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.13.1/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_open_max_preprocessor_error.patch
index 2f629724c9..2f629724c9 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/fix_open_max_preprocessor_error.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/fix_open_max_preprocessor_error.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/macro_tweak.patch
index ec0eea6ca2..ec0eea6ca2 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/macro_tweak.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/macro_tweak.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/mips64-compiler.patch
index 168368e6c3..168368e6c3 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/mips64-compiler.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.14.0/mips64-compiler.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bb
index 50b3117da5..83b80494ea 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bb
@@ -5,10 +5,11 @@ 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 \
8 " 9 "
9 10
10SRC_URI[md5sum] = "a13d8876e3e804189392119638a07a1f" 11SRC_URI[md5sum] = "86110278b784e279381b7f6f2295c508"
11SRC_URI[sha256sum] = "c93540e2799df4655c6f1b67dc7d8d6db96df4f08ef1702fffbc5df843a43d00" 12SRC_URI[sha256sum] = "1f5107573252c26439fdd165481765a2c0964e02a2e9fab36e02414d08f30630"
12 13
13PR = "${INC_PR}.0" 14PR = "${INC_PR}.0"
14 15
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-07 15:24:40 +0000