commit: 5f6d73409cec855e1be9b53ec21dbf6f53829f7e Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Mon Mar 13 19:48:55 2023 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Mon Mar 13 20:07:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f6d7340
x11-drivers/xf86-video-qxl: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-drivers/xf86-video-qxl/Manifest | 1 - ...-qxl-0.1.5_p20200205-xorg-21.0-build-bool.patch | 17 ---- ...video-qxl-0.1.5_p20200205-xorg-21.0-build.patch | 93 ---------------------- .../xf86-video-qxl-0.1.5_p20200205-r1.ebuild | 53 ------------ 4 files changed, 164 deletions(-) diff --git a/x11-drivers/xf86-video-qxl/Manifest b/x11-drivers/xf86-video-qxl/Manifest index 36c9889bd779..140dd9e56019 100644 --- a/x11-drivers/xf86-video-qxl/Manifest +++ b/x11-drivers/xf86-video-qxl/Manifest @@ -1,2 +1 @@ -DIST xf86-video-qxl-0.1.5_p20200205.tar.xz 137452 BLAKE2B 1639a393dadcba251a8fe761d52112d51c29e70960524785343379ec088e69c5e2cbd1a9710d72c749dc8b7303b3eceb545fbaec82d5d22613f8ebb0a4e7aca8 SHA512 9a2ba4aa7ef61d3ea0043ff1e3a8f312b7fe00f707045bcb4e4fc1189786b9aba2b6e44696f47e7c215485044f6c953f831ed4da48d4098cd7b62555c74a79f8 DIST xf86-video-qxl-0.1.6.tar.xz 438844 BLAKE2B 2236b8678975288e5a8d28689dc58c2808bfce6bc3d1a14fffd271695b3b5a4f322addb1cf43d96dfe636ef52d654574e45a5a877299a40debd8cfd26165f22e SHA512 f6a42355915d2e8f8a842dc24fe6d012d123aa6d23eedea1a4771fb08f88e0298d76741755b88304d76c66b3aae15f9fca74d062be395e499a82ee8f4507c7e0 diff --git a/x11-drivers/xf86-video-qxl/files/xf86-video-qxl-0.1.5_p20200205-xorg-21.0-build-bool.patch b/x11-drivers/xf86-video-qxl/files/xf86-video-qxl-0.1.5_p20200205-xorg-21.0-build-bool.patch deleted file mode 100644 index 74f2a0245698..000000000000 --- a/x11-drivers/xf86-video-qxl/files/xf86-video-qxl-0.1.5_p20200205-xorg-21.0-build-bool.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.gentoo.org/829628 ---- a/src/qxl_drmmode.h -+++ b/src/qxl_drmmode.h -@@ -29,11 +29,11 @@ - - #ifdef XF86DRM_MODE - --#include "xf86drm.h" --#include "xf86drmMode.h" - #include "xf86str.h" - #include "randrstr.h" - #include "xf86Crtc.h" -+#include "xf86drm.h" -+#include "xf86drmMode.h" - #ifdef HAVE_LIBUDEV - #include "libudev.h" - #endif diff --git a/x11-drivers/xf86-video-qxl/files/xf86-video-qxl-0.1.5_p20200205-xorg-21.0-build.patch b/x11-drivers/xf86-video-qxl/files/xf86-video-qxl-0.1.5_p20200205-xorg-21.0-build.patch deleted file mode 100644 index b4f9024a1e4a..000000000000 --- a/x11-drivers/xf86-video-qxl/files/xf86-video-qxl-0.1.5_p20200205-xorg-21.0-build.patch +++ /dev/null @@ -1,93 +0,0 @@ -https://bugs.gentoo.org/827652 -https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl/-/merge_requests/6 - -From 4b083ede3c4a827a84295ff223e34ee3c2e581b2 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]> ---- 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 || ---- 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 -GitLab diff --git a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205-r1.ebuild b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205-r1.ebuild deleted file mode 100644 index 779433cb09ba..000000000000 --- a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..10} ) - -inherit autotools python-single-r1 xorg-3 - -DESCRIPTION="QEMU QXL paravirt video driver" -SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz"; -S="${WORKDIR}" - -KEYWORDS="amd64 x86" -IUSE="xspice" -REQUIRED_USE="xspice? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - xspice? ( - app-emulation/spice - ${PYTHON_DEPS} - ) - x11-base/xorg-server[-minimal] - >=x11-libs/libdrm-2.4.46" -DEPEND=" - ${RDEPEND} - >=app-emulation/spice-protocol-0.12.0 - x11-base/xorg-proto" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-0.1.5_p20200205-xorg-21.0-build.patch - "${FILESDIR}"/${PN}-0.1.5_p20200205-xorg-21.0-build-bool.patch -) - -pkg_setup() { - use xspice && python-single-r1_pkg_setup - xorg-3_pkg_setup -} - -src_prepare() { - xorg-3_src_prepare - eautoreconf - - use xspice && python_fix_shebang scripts -} - -src_configure() { - local XORG_CONFIGURE_OPTIONS=( - $(use_enable xspice) - ) - xorg-3_src_configure -}
