Timo Aaltonen pushed to branch debian-unstable at X Strike Force / driver / xserver-xorg-video-qxl
Commits: f60a2143 by Timo Aaltonen at 2022-02-09T13:00:16+02:00 Fix build against xserver 21.1. - - - - - 655d1221 by Timo Aaltonen at 2022-02-09T13:00:51+02:00 control: Bump debhelper-compat to 13, policy to 4.6.0. - - - - - 744c6d5b by Timo Aaltonen at 2022-02-09T13:52:08+02:00 watch: Update upstream git url. - - - - - 365adff2 by Timo Aaltonen at 2022-02-09T13:52:43+02:00 close a bug - - - - - 055fc230 by Timo Aaltonen at 2022-02-09T13:57:32+02:00 release to sid - - - - - 5 changed files: - debian/changelog - debian/control - + debian/patches/Fix-a-build-error-with-Xorg-master.patch - debian/patches/series - debian/watch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +xserver-xorg-video-qxl (0.1.5+git20200331-2) unstable; urgency=medium + + * Fix build against xserver 21.1. (Closes: #1002143) + * control: Bump debhelper-compat to 13, policy to 4.6.0. + * watch: Update upstream git url. + + -- Timo Aaltonen <[email protected]> Wed, 09 Feb 2022 13:57:17 +0200 + xserver-xorg-video-qxl (0.1.5+git20200331-1) unstable; urgency=medium [ Laurent Bigonville ] ===================================== debian/control ===================================== @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> Build-Depends: - debhelper-compat (= 12), + debhelper-compat (= 13), pkg-config, dh-python, xserver-xorg-dev (>= 2:1.9.4), @@ -17,7 +17,7 @@ Build-Depends: libxext-dev, libxfont-dev, python3:any, -Standards-Version: 4.5.0 +Standards-Version: 4.6.0 Homepage: https://www.spice-space.org/ Vcs-Git: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-qxl.git Vcs-Browser: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-qxl ===================================== debian/patches/Fix-a-build-error-with-Xorg-master.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?= + <[email protected]> +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 <[email protected]> +--- + 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 <xf86Crtc.h> + #include <xf86Opt.h> + +-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 +-- +2.34.1 + ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ python3.diff +Fix-a-build-error-with-Xorg-master.patch ===================================== debian/watch ===================================== @@ -1,4 +1,4 @@ -#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-qxl +#git=https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl version=3 opts="pgpsigurlmangle=s/$/.sig/" \ https://xorg.freedesktop.org/releases/individual/driver/ xf86-video-qxl-(.*)\.tar\.bz2 View it on GitLab: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-qxl/-/compare/818424dcdfc106e4c77dd371e5b3ae351fad3926...055fc23087ded3a0a48b991569ae769b7f58cbfa -- View it on GitLab: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-qxl/-/compare/818424dcdfc106e4c77dd371e5b3ae351fad3926...055fc23087ded3a0a48b991569ae769b7f58cbfa You're receiving this email because of your account on salsa.debian.org.
