!13 [sync] PR-12: update xorg-x11-drv-vesa to 2.6.0

From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng

0001-Disable-shadow-by-default-on-known-virtual-GPUs.patch

@@ -1,63 +0,0 @@
-From 57301015f16e26f12caf6f6cb4d730e7793cb2c3 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 30 May 2018 11:46:46 -0400
-Subject: [PATCH xf86-video-vesa] Disable shadow by default on known-virtual
- GPUs
-
-Device memory is the same domain as host memory, in this case, so the
-shadow just introduces more memcpy.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- src/vesa.c | 35 ++++++++++++++++++++++++++++++++---
- 1 file changed, 32 insertions(+), 3 deletions(-)
-
-diff --git a/src/vesa.c b/src/vesa.c
-index 2300f4e..7d2bf94 100644
---- a/src/vesa.c
-+++ b/src/vesa.c
-@@ -844,9 +844,38 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
-     memcpy(pVesa->Options, VESAOptions, sizeof(VESAOptions));
-     xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pVesa->Options);
- 
--    /* Use shadow by default */
--    pVesa->shadowFB = xf86ReturnOptValBool(pVesa->Options, OPTION_SHADOW_FB,
--                                           TRUE);
-+    /* Use shadow by default, for non-virt hardware */
-+    if (!xf86GetOptValBool(pVesa->Options, OPTION_SHADOW_FB, &pVesa->shadowFB))
-+    {
-+	switch (pVesa->pciInfo->vendor_id) {
-+	    case 0x1234: /* bochs vga (not in pci.ids) */
-+	    case 0x15ad: /* vmware */
-+	    case 0x1b36: /* qemu qxl */
-+	    case 0x80ee: /* virtualbox */
-+	    case 0xaaaa: /* parallels (not in pci.ids) */
-+		pVesa->shadowFB = FALSE;
-+		break;
-+
-+	    case 0x1013: /* qemu's cirrus emulation */
-+		if (pVesa->pciInfo->subvendor_id == 0x1af4)
-+		    pVesa->shadowFB = FALSE;
-+		else
-+		    pVesa->shadowFB = TRUE;
-+		break;
-+
-+	    case 0x1414: /* microsoft hyper-v */
-+		if (pVesa->pciInfo->device_id == 0x5353)
-+		    pVesa->shadowFB = FALSE;
-+		else
-+		    pVesa->shadowFB = TRUE;
-+		break;
-+
-+	    default:
-+		pVesa->shadowFB = TRUE;
-+		break;
-+	}
-+    }
-+
-     /*  Use default refresh by default. Too many VBE 3.0
-      *   BIOSes are incorrectly implemented.
-      */
--- 
-2.17.0
-

xorg-x11-drv-vesa.spec

@@ -4,19 +4,17 @@
 %undefine _hardened_build
 
 Name:           xorg-x11-drv-vesa
-Version:        2.4.0
+Version:        2.6.0
 Release:        1
 Summary:        Xorg X11 vesa video driver
 License:        MIT
 URL:            https://www.x.org
-Source0:        https://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-%{version}.tar.bz2
+Source0:        https://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-%{version}.tar.xz
-
-Patch1:         0001-Disable-shadow-by-default-on-known-virtual-GPUs.patch
 
 ExclusiveArch:  %{ix86} x86_64
 
 BuildRequires:  xorg-x11-server-devel >= 1.10.99.902
-BuildRequires:  autoconf automake libtool
+BuildRequires:  autoconf automake libtool make
 
 Requires:       Xorg %([ -e /usr/bin/xserver-sdk-abi-requires ] && xserver-sdk-abi-requires ansic)
 Requires:       Xorg %([ -e /usr/bin/xserver-sdk-abi-requires ] && xserver-sdk-abi-requires videodrv)
@@ -47,9 +45,30 @@ autoreconf -v --install || exit 1
 
 %files help
 %defattr(-,root,root)
-%doc README ChangeLog
+%doc README.md ChangeLog
 %{_mandir}/man4/vesa.4*
 
 %changelog
+* Mon Jan 30 2023 zhouyihang <zhouyihang3@h-partners.com> - 2.6.0-1
+- Type:requirements
+- ID:NA
+- SUG:NA
+- DESC:update xorg-x11-drv-vesa to 2.6.0
+
+* Mon Oct 24 2022 zhouyihang <zhouyihang3@h-partners.com> - 2.5.0-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:Fix spelling wording issues
+
+* Sat Jan 30 2021 xihaochen <xihaochen@huawei.com> - 2.5.0-1
+- Type:requirements                                                                                                                                  
+- Id:NA
+- SUG:NA
+- DESC:update xorg-x11-drv-vesa to 2.5.0
+
+* Sat Mar 21 2020 fengtao <fengtao40@huawei.com> - 2.4.0-2
+- Refuse vesa on UEFI
+
 * Tue Mar 10 2020 hexiujun <hexiujun1@huawei.com> - 2.4.0-1
 - Package init

xorg-x11-drv-vesa.yaml

@@ -0,0 +1,4 @@
+version_control: git
+src_repo: https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa.git
+tag_prefix: xf86-video-vesa-
+seperator: .