gentoo resync : 22.12.2021

4 files changed, 166 insertions, 0 deletions

diff --git a/x11-drivers/xf86-video-qxl/Manifest b/x11-drivers/xf86-video-qxl/Manifest
index 05e0c644c230..acac44c5c66e 100644
--- a/x11-drivers/xf86-video-qxl/Manifest
+++ b/x11-drivers/xf86-video-qxl/Manifest
@@ -1,3 +1,6 @@
+AUX xf86-video-qxl-0.1.5_p20200205-xorg-21.0-build-bool.patch 339 BLAKE2B eb34dfa4e2e91f8fe63db9317aa93530fbbddefa14d8d4c249d74080e67e1cba60a851b787f81a8508c6796fdef62ae2ee1e846e0ab4b0339d6e8a64a1b2ac86 SHA512 f0910ce72a12d5d33f5c81aefca97d5098204dde5e8b78759c139b3f1bf1426d7aa58f26f16387b57212217de066e781322ce68f8a645500df56745571e8e800
+AUX xf86-video-qxl-0.1.5_p20200205-xorg-21.0-build.patch 3197 BLAKE2B b2a03a9af5b0ab733288e1c484d057bedd065332c2ac05349b6ae4aeb439f8d8cee8ca1ff4a3de413b53ff2bcb1f989a91d8b373721209c452226b3a8ca7bcf8 SHA512 35bd57e0876d5ab18e629a8d24598b05f59424c842e6902d127a377cb76ed92f9af923b0e32f49044b67223a7b3f44dd4b3afbf971471509f50e4d31ee5fab2e
 DIST xf86-video-qxl-0.1.5_p20200205.tar.xz 137452 BLAKE2B 1639a393dadcba251a8fe761d52112d51c29e70960524785343379ec088e69c5e2cbd1a9710d72c749dc8b7303b3eceb545fbaec82d5d22613f8ebb0a4e7aca8 SHA512 9a2ba4aa7ef61d3ea0043ff1e3a8f312b7fe00f707045bcb4e4fc1189786b9aba2b6e44696f47e7c215485044f6c953f831ed4da48d4098cd7b62555c74a79f8
+EBUILD xf86-video-qxl-0.1.5_p20200205-r1.ebuild 1049 BLAKE2B a48003d612735b9bfaf453cc3b99b5c78f0a69b8811d2a074c7f5d6007f6d6b47597e7d09830df338f07330b7351256671b4f4707e92924c158c3a7906890794 SHA512 69e9cb484cc6b48634ed7fe15e0986f29cdd39f691f472b80ee72fc4798e192e3bb24a932983590564579f40ef69c25e456fae1ed8bf6cb1a0df35b5388dee8a
 EBUILD xf86-video-qxl-0.1.5_p20200205.ebuild 910 BLAKE2B 1788386f0dd74631283555897608fe893baba6c3921856987e89a2b1234e784ef147aff0e688a41bd0864b5e268999288ddc71f362b8afaca1db8ea7c712536b SHA512 a737c5ec8cd5f69ac672f17ccfab8cae9f3e77e84824137ea4aca425cb0e95cfa25da71c8ff60039f8b6f1bbc0ba7b465136f296e06607a8cf40cc12dcb39656
 MISC metadata.xml 353 BLAKE2B 069be65314e1a998fd531c1f26b09f78282983ed7e2bac3e0349b506cbce9293e7d80514a935ca1e4e74219656d0471ae329b694510a2fd30dd54508769ce6b3 SHA512 caf03baa6cf42a11adc3649fe17a0eab7b1eab66f2b0f44131de40d19f50e32202f245f767910b062ad7825a0263563922f8ec07f7584225839557f6d0668c2e
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
new file mode 100644
index 000000000000..74f2a0245698
--- /dev/null
+++ b/x11-drivers/xf86-video-qxl/files/xf86-video-qxl-0.1.5_p20200205-xorg-21.0-build-bool.patch
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 000000000000..b4f9024a1e4a
--- /dev/null
+++ b/x11-drivers/xf86-video-qxl/files/xf86-video-qxl-0.1.5_p20200205-xorg-21.0-build.patch
@@ -0,0 +1,93 @@
+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?=
+ <zboszor@gmail.com>
+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 <zboszor@gmail.com>
+--- 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
new file mode 100644
index 000000000000..461f34cf61c1
--- /dev/null
+++ b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..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
+}