From 39f112cc2a83f64d97f3e57ed48bd87a64ff3ad2 Mon Sep 17 00:00:00 2001 From: chunchao Date: Wed, 12 Mar 2025 21:19:38 +0800 Subject: [PATCH] fix sw_64 build error Project:TC2024110202 Signed-off-by: chunchao --- 0003-fix-CARD.patch | 24 ++++++++++++++++++++++++ xorg-x11-drv-qxl.spec | 7 ++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0003-fix-CARD.patch diff --git a/0003-fix-CARD.patch b/0003-fix-CARD.patch new file mode 100644 index 0000000..adbf7a4 --- /dev/null +++ b/0003-fix-CARD.patch @@ -0,0 +1,24 @@ +From dbae35405af8e350641e524a1140c670e5799c15 Mon Sep 17 00:00:00 2001 +From: mahailiang +Date: Mon, 25 Nov 2024 19:28:40 +0800 +Subject: [PATCH] fix CARD + +--- + src/qxl.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/qxl.h b/src/qxl.h +index bfc3b0d..fc5d889 100644 +--- a/src/qxl.h ++++ b/src/qxl.h +@@ -30,6 +30,7 @@ + #include + #endif + ++#include "X11/Xproto.h" + #include "compiler.h" + #include "xf86.h" + #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 +-- +2.20.1 + diff --git a/xorg-x11-drv-qxl.spec b/xorg-x11-drv-qxl.spec index a2f453e..598485f 100644 --- a/xorg-x11-drv-qxl.spec +++ b/xorg-x11-drv-qxl.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %global tarball xf86-video-qxl %global moduledir %(pkg-config xorg-server --variable=moduledir ) %global driverdir %{moduledir}/drivers @@ -21,6 +21,8 @@ Patch1: 0001-worst-hack-of-all-time-to-qxl-driver.patch Patch5: 0005-Xspice-Adjust-shebang-to-explicitly-mention-python3.patch Patch9: 0007-qx-libdrm.patch +Patch1001: 0003-fix-CARD.patch + License: MIT @@ -101,6 +103,9 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/spiceqxl.xorg.conf %changelog +* Wed Mar 12 2025 Chunchao Zhang - 0.1.6-2 +- fix sw_64 build error + * Fri Jan 27 2023 Funda Wang - 0.1.6-1 - New version 0.1.6 -- Gitee