From: Alexander Kanavin <[email protected]> Changes:
render: Avoid possible double-free in ProcRenderAddGlyphs() mi: fix rounding issues around zero in miPointerSetPosition Signed-off-by: Alexander Kanavin <[email protected]> Signed-off-by: Alexandre Belloni <[email protected]> Signed-off-by: Richard Purdie <[email protected]> (cherry picked from commit 78dc14599a65075a40c26df4bf9d2bb33a237ca9) Signed-off-by: Steve Sakoman <[email protected]> --- .../0001-Avoid-duplicate-definitions-of-IOPortBase.patch | 3 +-- ...ciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch | 9 +++------ .../{xserver-xorg_21.1.12.bb => xserver-xorg_21.1.13.bb} | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_21.1.12.bb => xserver-xorg_21.1.13.bb} (92%) 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 index 11d5546537..e9cbc9b4da 100644 --- 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 @@ -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 <[email protected]> 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 <[email protected]> - --- hw/xfree86/os-support/linux/lnx_video.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch index d05eec5bb9..d1516c2f52 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch @@ -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 <[email protected]> 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 <[email protected]> 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 - diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.12.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.13.bb similarity index 92% rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.12.bb rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.13.bb index 570e08d5ae..1f18c22fa8 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.12.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.13.bb @@ -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. -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#202350): https://lists.openembedded.org/g/openembedded-core/message/202350 Mute This Topic: https://lists.openembedded.org/mt/107504027/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
