[packages/xorg-driver-video-qxl] - fix building for xserver 21 - rel 4

baggins baggins at pld-linux.org
Wed Nov 3 23:57:29 CET 2021


commit 912f72fa19eb175d1cd38d43324ddddab848f28c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Nov 3 23:57:04 2021 +0100

    - fix building for xserver 21
    - rel 4

 xorg-driver-video-qxl.spec |  7 ++++++-
 xserver-21.patch           | 11 +++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-qxl.spec b/xorg-driver-video-qxl.spec
index 205a25e..240df54 100644
--- a/xorg-driver-video-qxl.spec
+++ b/xorg-driver-video-qxl.spec
@@ -10,11 +10,12 @@ Summary:	X.org video driver for QXL virtual GPU
 Summary(pl.UTF-8):	Sterownik obrazu X.org dla wirtualnych procesorów graficznych QXL
 Name:		xorg-driver-video-qxl
 Version:	0.1.5
-Release:	3
+Release:	4
 License:	MIT
 Group:		X11/Applications
 Source0:	https://xorg.freedesktop.org/releases/individual/driver/xf86-video-qxl-%{version}.tar.bz2
 # Source0-md5:	addb686fce597a452eecd8d8f9fddf15
+Patch0:		xserver-21.patch
 URL:		https://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -102,6 +103,10 @@ udostępnia wejście klawiatury i myszy oraz wyjście obrazu.
 
 %prep
 %setup -q -n xf86-video-qxl-%{version}
+%patch0 -p1
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python}\1,' \
+      scripts/Xspice
 
 %build
 %{__libtoolize}
diff --git a/xserver-21.patch b/xserver-21.patch
new file mode 100644
index 0000000..fccc15b
--- /dev/null
+++ b/xserver-21.patch
@@ -0,0 +1,11 @@
+--- xf86-video-qxl-0.1.5/src/qxl_option_helpers.c~	2015-10-12 18:31:14.000000000 +0200
++++ xf86-video-qxl-0.1.5/src/qxl_option_helpers.c	2021-11-03 23:54:07.606993033 +0100
+@@ -34,7 +34,7 @@
+     const char* value = getenv(env_name);
+ 
+     if (!value) {
+-        return options[option_index].value.bool;
++        return options[option_index].value.boolean;
+     }
+     if (strcmp(value, "0") == 0 ||
+         strcasecmp(value, "off") == 0 ||
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-qxl.git/commitdiff/912f72fa19eb175d1cd38d43324ddddab848f28c



More information about the pld-cvs-commit mailing list