mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
xserver-xorg: upgrade 21.1.12 -> 21.1.13
Changes: render: Avoid possible double-free in ProcRenderAddGlyphs() mi: fix rounding issues around zero in miPointerSetPosition (From OE-Core rev: 9c00034001c27a17658ae8ae6a75d0c115a1a16b) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 78dc14599a65075a40c26df4bf9d2bb33a237ca9) Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
committed by
Steve Sakoman
parent
2d5281492d
commit
331f68a585
@@ -1,4 +1,4 @@
|
||||
From ce3b8a230a3805c9b557c1f106795675bd034860 Mon Sep 17 00:00:00 2001
|
||||
From cedc797e1a0850039a25b7e387b342e54fffcc97 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 17 Aug 2020 10:50:51 -0700
|
||||
Subject: [PATCH] Avoid duplicate definitions of IOPortBase
|
||||
@@ -10,7 +10,6 @@ compiler.h:528: multiple definition of `IOPortBase';
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
---
|
||||
hw/xfree86/os-support/linux/lnx_video.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From d77cdc5e1eee26821ab98c947abea53fb7b18fe5 Mon Sep 17 00:00:00 2001
|
||||
From ad8967de36e6e2a185b71ce1d701448cda4ef3e2 Mon Sep 17 00:00:00 2001
|
||||
From: California Sullivan <california.l.sullivan@intel.com>
|
||||
Date: Fri, 16 Mar 2018 17:23:11 -0700
|
||||
Subject: [PATCH] xf86pciBus.c: use Intel ddx only for pre-gen4 hardware
|
||||
@@ -20,10 +20,10 @@ Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
|
||||
1 file changed, 17 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
|
||||
index e61ae0cd4..d70c99197 100644
|
||||
index aeeed8b..db705bf 100644
|
||||
--- a/hw/xfree86/common/xf86pciBus.c
|
||||
+++ b/hw/xfree86/common/xf86pciBus.c
|
||||
@@ -1173,7 +1173,23 @@ xf86VideoPtrToDriverList(struct pci_device *dev,
|
||||
@@ -1174,7 +1174,23 @@ xf86VideoPtrToDriverList(struct pci_device *dev, XF86MatchedDrivers *md)
|
||||
case 0x0bef:
|
||||
/* Use fbdev/vesa driver on Oaktrail, Medfield, CDV */
|
||||
break;
|
||||
@@ -48,6 +48,3 @@ index e61ae0cd4..d70c99197 100644
|
||||
driverList[0] = "intel";
|
||||
break;
|
||||
}
|
||||
--
|
||||
2.14.3
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ require xserver-xorg.inc
|
||||
SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
|
||||
file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "1e016e2be1b5ccdd65eac3ea08e54bd13ce8f4f6c3fb32ad6fdac4e71729a90f"
|
||||
SRC_URI[sha256sum] = "b45a02d5943f72236a360d3cc97e75134aa4f63039ff88c04686b508a3dc740c"
|
||||
|
||||
# These extensions are now integrated into the server, so declare the migration
|
||||
# path for in-place upgrades.
|
||||
Reference in New Issue
Block a user