summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch45
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.8.bb1
2 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
new file mode 100644
index 0000000000..4737040675
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
@@ -0,0 +1,45 @@
1From fc04acfd948ac99d04a5dc08c78f3b13bc0c5c41 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 17 Aug 2020 10:50:51 -0700
4Subject: [PATCH] Avoid duplicate definitions of IOPortBase
5
6This fixed build with gcc10/-fno-common
7
8Fixes
9compiler.h:528: multiple definition of `IOPortBase';
10
11Upstream-Status: Pending
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 hw/xfree86/common/compiler.h | 2 +-
15 hw/xfree86/os-support/linux/lnx_video.c | 1 +
16 2 files changed, 2 insertions(+), 1 deletion(-)
17
18diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
19index 2b2008b..c7d617e 100644
20--- a/hw/xfree86/common/compiler.h
21+++ b/hw/xfree86/common/compiler.h
22@@ -525,7 +525,7 @@ xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,
23 #define PORT_SIZE short
24 #endif
25
26-_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
27+extern _X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
28
29 static __inline__ void
30 outb(unsigned PORT_SIZE port, unsigned char val)
31diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
32index 04e4509..9dc7316 100644
33--- a/hw/xfree86/os-support/linux/lnx_video.c
34+++ b/hw/xfree86/os-support/linux/lnx_video.c
35@@ -78,6 +78,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
36 /***************************************************************************/
37 /* I/O Permissions section */
38 /***************************************************************************/
39+_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
40
41 #if defined(__powerpc__)
42 volatile unsigned char *ioBase = NULL;
43--
442.28.0
45
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.8.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.8.bb
index 26815feb33..8c19692ded 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.8.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.8.bb
@@ -5,6 +5,7 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat
5 file://0001-test-xtest-Initialize-array-with-braces.patch \ 5 file://0001-test-xtest-Initialize-array-with-braces.patch \
6 file://sdksyms-no-build-path.patch \ 6 file://sdksyms-no-build-path.patch \
7 file://0001-drmmode_display.c-add-missing-mi.h-include.patch \ 7 file://0001-drmmode_display.c-add-missing-mi.h-include.patch \
8 file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \
8 " 9 "
9SRC_URI[md5sum] = "a770aec600116444a953ff632f51f839" 10SRC_URI[md5sum] = "a770aec600116444a953ff632f51f839"
10SRC_URI[sha256sum] = "d17b646bee4ba0fb7850c1cc55b18e3e8513ed5c02bdf38da7e107f84e2d0146" 11SRC_URI[sha256sum] = "d17b646bee4ba0fb7850c1cc55b18e3e8513ed5c02bdf38da7e107f84e2d0146"