From 1b82182253a4442568286a1cdcadd1e0ceb3113b Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 5 Jan 2024 19:38:55 +0100 Subject: [PATCH] rebuilt by autoport with build requirements: xorg-server-devel>=21.1.3-1mamba [release 0.1.5-3mamba;Sat Feb 19 2022] --- xf86-video-qxl-0.1.5-xorg-server-21.1.3.patch | 101 ++++++++++++++++++ xf86-video-qxl.spec | 12 ++- 2 files changed, 109 insertions(+), 4 deletions(-) create mode 100644 xf86-video-qxl-0.1.5-xorg-server-21.1.3.patch diff --git a/xf86-video-qxl-0.1.5-xorg-server-21.1.3.patch b/xf86-video-qxl-0.1.5-xorg-server-21.1.3.patch new file mode 100644 index 0000000..b10ac91 --- /dev/null +++ b/xf86-video-qxl-0.1.5-xorg-server-21.1.3.patch @@ -0,0 +1,101 @@ +From 4e1963a812f2c1777ba5d56ea9e939a3e40a0496 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?= + +Date: Sat, 28 Aug 2021 15:38:40 +0200 +Subject: [PATCH] Fix a build error with Xorg master +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use xf86ReturnOptValBool() in get_bool_option() instead of +options[option_index].value.bool to fix a compiler error with +current Xorg xserver master branch. + +Also use xf86GetOptValInteger() in get_int_option() and +xf86GetOptValString() in get_str_option() for consistency. + +The change causes a slight performance drop during option parsing +because the passed-in index_value is no longer used as an index +into the options array. + +Instead, it's used as a token now for the standard option getter +functions which works since the index_value to the get_*_option() +functions are identical to the value of options[n].token in the +passed-in OptionInfoRec array. + +Also rename "int option_index" to "int token" for clarity in all +three functions. + +Signed-off-by: Zoltán Böszörményi +--- + src/qxl_option_helpers.c | 13 +++++++------ + src/qxl_option_helpers.h | 6 +++--- + 2 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/src/qxl_option_helpers.c b/src/qxl_option_helpers.c +index 2aba677..7707b7c 100644 +--- a/src/qxl_option_helpers.c ++++ b/src/qxl_option_helpers.c +@@ -10,31 +10,32 @@ + + #include "qxl_option_helpers.h" + +-int get_int_option(OptionInfoPtr options, int option_index, ++int get_int_option(OptionInfoPtr options, int token, + const char *env_name) + { ++ int value; + if (env_name && getenv(env_name)) { + return atoi(getenv(env_name)); + } +- return options[option_index].value.num; ++ return xf86GetOptValInteger(options, token, &value) ? value : 0; + } + +-const char *get_str_option(OptionInfoPtr options, int option_index, ++const char *get_str_option(OptionInfoPtr options, int token, + const char *env_name) + { + if (getenv(env_name)) { + return getenv(env_name); + } +- return options[option_index].value.str; ++ return xf86GetOptValString(options, token); + } + +-int get_bool_option(OptionInfoPtr options, int option_index, ++int get_bool_option(OptionInfoPtr options, int token, + const char *env_name) + { + const char* value = getenv(env_name); + + if (!value) { +- return options[option_index].value.bool; ++ return xf86ReturnOptValBool(options, token, FALSE); + } + if (strcmp(value, "0") == 0 || + strcasecmp(value, "off") == 0 || +diff --git a/src/qxl_option_helpers.h b/src/qxl_option_helpers.h +index 7c54c72..66d0a17 100644 +--- a/src/qxl_option_helpers.h ++++ b/src/qxl_option_helpers.h +@@ -4,13 +4,13 @@ + #include + #include + +-int get_int_option(OptionInfoPtr options, int option_index, ++int get_int_option(OptionInfoPtr options, int token, + const char *env_name); + +-const char *get_str_option(OptionInfoPtr options, int option_index, ++const char *get_str_option(OptionInfoPtr options, int token, + const char *env_name); + +-int get_bool_option(OptionInfoPtr options, int option_index, ++int get_bool_option(OptionInfoPtr options, int token, + const char *env_name); + + #endif // OPTION_HELPERS_H +-- +GitLab + diff --git a/xf86-video-qxl.spec b/xf86-video-qxl.spec index 3aa8414..fc93f84 100644 --- a/xf86-video-qxl.spec +++ b/xf86-video-qxl.spec @@ -1,25 +1,25 @@ %define xorg_ver %(pkg-config xorg-server --modversion|cut -d. -f 1-2) Name: xf86-video-qxl Version: 0.1.5 -Release: 2mamba +Release: 3mamba Summary: QXL video driver for X.org Group: System/X11 Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://x.org +URL: https://www.x.org/wiki/ Source: https://www.x.org/releases/individual/driver/xf86-video-qxl-%{version}.tar.bz2 +Patch0: xf86-video-qxl-0.1.5-xorg-server-21.1.3.patch License: MIT ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel BuildRequires: libudev-devel ## AUTOBUILDREQ-END -BuildRequires: xorg-server-devel >= 1.20.4 +BuildRequires: xorg-server-devel >= 21.1.3-1mamba BuildRequires: xorg-proto-devel Provides: xorgdrvvideo Requires: xorg-server >= %{xorg_ver} Requires: xorg-server <= %{xorg_ver}.255 -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description QXL video driver for X.org. @@ -28,6 +28,7 @@ QXL video driver for X.org. %prep %setup -q +%patch0 -p1 -b .xorg-server-21.1.3 %build %configure @@ -47,6 +48,9 @@ QXL video driver for X.org. %doc COPYING %changelog +* Sat Feb 19 2022 Automatic Build System 0.1.5-3mamba +- rebuilt by autoport with build requirements: xorg-server-devel>=21.1.3-1mamba + * Sun Mar 03 2019 Silvan Calarco 0.1.5-2mamba - rebuilt with xorg-server 1.20.4