diff options
Diffstat (limited to 'x11-drivers')
8 files changed, 0 insertions, 243 deletions
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz Binary files differindex 0400d817515d..cb1ab81a8bc7 100644 --- a/x11-drivers/Manifest.gz +++ b/x11-drivers/Manifest.gz diff --git a/x11-drivers/xf86-video-qxl/Manifest b/x11-drivers/xf86-video-qxl/Manifest index f7686bb96ccc..970a7f4e80c5 100644 --- a/x11-drivers/xf86-video-qxl/Manifest +++ b/x11-drivers/xf86-video-qxl/Manifest @@ -1,7 +1,3 @@ -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 DIST xf86-video-qxl-0.1.6.tar.xz 438844 BLAKE2B 2236b8678975288e5a8d28689dc58c2808bfce6bc3d1a14fffd271695b3b5a4f322addb1cf43d96dfe636ef52d654574e45a5a877299a40debd8cfd26165f22e SHA512 f6a42355915d2e8f8a842dc24fe6d012d123aa6d23eedea1a4771fb08f88e0298d76741755b88304d76c66b3aae15f9fca74d062be395e499a82ee8f4507c7e0 -EBUILD xf86-video-qxl-0.1.5_p20200205-r1.ebuild 1052 BLAKE2B 5e36ca8af9154fd6ba9825b29ee49bd56624256562d3ecaf6f7ae03da1586e92cb794cdd274366398a28e2be70c1ff2fba4675e389ffb6460224832ae1313ad4 SHA512 d45d3c2842ddf35ae3c1080d145cce1bf811e8f6d56a6446a36ede53afc88ce6b1fea9d0c762d16e79d79ac733b1fff399d748984c5f5169a592489e4e6ed27a EBUILD xf86-video-qxl-0.1.6.ebuild 829 BLAKE2B 2e39582c2865ace8c6ad0010e307d2d9a43ea7de955fdbccef5d8286c5be5319724693109ef3950f2d04ee87d4e9c12e6704f5f35f10fdcd99ab31ba2bc4cb02 SHA512 198938e46549ecfa652cd840c095d95592774c6a2fa496a85b71c2830328229848a4ac8d97f710fc6d6bed49ad1d87881e3946c9bbc3c9b132d3ecd48ea52f07 MISC metadata.xml 460 BLAKE2B 395d82f906854991a084f443448f523b0c5ad2353890ca2c47d6b28277f6e998746aa6f6b4eae38321dbd6356d33b7a43e81d2aa9f895f17ea22e48d8b99b628 SHA512 47338f8d0334783b5f5e7d582347b7b41b72d9ce2256d83bc4b7a1913139a1dadd65b34304501326cf99e7d8cf642cfbdf09ddf6b9d537589b7cedb6704239f7 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?= - <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 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 -} diff --git a/x11-drivers/xf86-video-vmware/Manifest b/x11-drivers/xf86-video-vmware/Manifest index 32c04795fda5..2deeb872a365 100644 --- a/x11-drivers/xf86-video-vmware/Manifest +++ b/x11-drivers/xf86-video-vmware/Manifest @@ -1,6 +1,3 @@ -AUX xf86-video-vmware-13.3.0-fix-include-order-bool.patch 1420 BLAKE2B cd031748a1f87897e91925c7466925bf63f1255182d26b65745e0e210c6340a6e2cb7b15c7403ff46c816aea1a3f63f71d68f6ffe6482b9caabd5adebaa56970 SHA512 fd9719b5468bf38343a2c4010b559d30bba7e41c54315e9ebc50d36918216176566659f95636d54b63c3b4ca3e1e39aabe7c4afccdd558e502f5e5413f0795c7 -DIST xf86-video-vmware-13.3.0.tar.bz2 473527 BLAKE2B 8916c5d95d4347ff3e874d4131a32660777c0e3ab6808b537cbe668c30cf775ebfd2fb7900aa43f6a34d0578ceac4545614024498f6f0143e9b07035f6e99c3c SHA512 c318de893cae7b2b11e11c1b389ee47478b7c8d1f52c27099dbe453efec28f3e9da449217307a8c2251999eada66312f766996be1a6ead413b8b6dedc42c68ca DIST xf86-video-vmware-13.4.0.tar.xz 416296 BLAKE2B 37dc0b0fc8c4a44f64ff640aae8ee595b0d285ac2c85f531cf91f1cd059d165cd9937249c6739a566eca628950142f566d693f8b092cecdb5886142b6abe2c94 SHA512 7cacde21a490501dd9c2e9121040274c1f6ef64e6dc0ef49946b400f6297fab73a6e9548e45fe8930cee9028e65e45aaff9ba489dd69ac75a5133114726bf55d -EBUILD xf86-video-vmware-13.3.0-r1.ebuild 380 BLAKE2B f0f25c56efc842d3f2a05b903a509b1630247bb7e787fb2ac6ac4dbcabdc4065a5e461e7d929a31b69489e41d951e76887bf4e8e143c6976568b08cf5f9dad4a SHA512 2b079254fc3dcffb8ff63ec870286c2911ab6b32b97526e34507d31c6bd9cef9845f5e54457f35259517ccef9a354ba1891c34e8a8f543e61608f498e3e42e33 EBUILD xf86-video-vmware-13.4.0.ebuild 351 BLAKE2B 65beb1fa6a059c4b0bb11dc39f4912a40430ecd36910ee860d5394128dc3438f5d843031c039cd45d78a15212dcf5384cf7c14eed04ac504bbfc82d8cf213b12 SHA512 e0ba25450fcb94f3800be4004e48c04b1da047aaf381557bd8968e2beb5e72167732a963537903b304cba57dfad70516adde50ccddfc1a52943cd3a4dc7038d6 MISC metadata.xml 351 BLAKE2B cb92a40858fe3738597c7d60c3f9a1f1f6598d95886d15f731cf801f682555519b57b60b2b96b41627ae0942e5787c45aa45d7c3b846234cb4700afdf7f4febc SHA512 775eef1e84c0f07edaf87902e283a1f9fe526e2f21ddcefdd54960019422ac76c34e503d14e8a6ad3dd0f90cdf1a8de215016355e0dacbd8ab03f5a1cc60297f diff --git a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.3.0-fix-include-order-bool.patch b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.3.0-fix-include-order-bool.patch deleted file mode 100644 index 9ffa436a41e5..000000000000 --- a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.3.0-fix-include-order-bool.patch +++ /dev/null @@ -1,51 +0,0 @@ -https://gitlab.freedesktop.org/xorg/driver/xf86-video-vmware/-/commit/50ab008cb965dc9e47e0a84a1950e2485bbd3c44 -https://bugs.gentoo.org/829627 - -From: Martin Krastev <krastevm@vmware.com> -Date: Tue, 30 Nov 2021 11:47:39 -0800 -Subject: [PATCH] vmwgfx: Change header inclusion order to avoid xorg headers - catching stdbool.h - -libdrm commit e641e2a632d779f638ac2ba983b9fceb20b3fac4 added -stdbool.h to the library headers which conflicts with xorg headers. - -Signed-off-by: Martin Krastev <krastevm@vmware.com> -Reviewed-by: Zack Rusin <zackr@vmware.com> -Signed-off-by: Zack Rusin <zackr@vmware.com> ---- a/vmwgfx/vmwgfx_driver.h -+++ b/vmwgfx/vmwgfx_driver.h -@@ -36,15 +36,15 @@ - #include <stddef.h> - #include <stdint.h> - #include <errno.h> --#include <drm.h> --#include <xf86drm.h> --#include <xf86drmMode.h> - #include <xorg-server.h> - #include <xf86.h> - #include <xf86Crtc.h> - #include <xf86xv.h> - #include <xa_tracker.h> - #include <xf86Module.h> -+#include <drm.h> -+#include <xf86drm.h> -+#include <xf86drmMode.h> - - #include "../src/compat-api.h" - #ifdef DRI2 ---- a/vmwgfx/vmwgfx_saa.c -+++ b/vmwgfx/vmwgfx_saa.c -@@ -29,11 +29,11 @@ - #include <xorgVersion.h> - #include <mi.h> - #include <fb.h> --#include <xf86drmMode.h> - #include <xa_context.h> - #include "vmwgfx_saa.h" - #include "vmwgfx_drmi.h" - #include "vmwgfx_saa_priv.h" -+#include <xf86drmMode.h> - - /* - * Damage to be added as soon as we attach storage to the pixmap. -GitLab diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0-r1.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0-r1.ebuild deleted file mode 100644 index 4e0bea19c3c6..000000000000 --- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_DRI=always -inherit xorg-3 - -DESCRIPTION="VMware SVGA video driver" - -KEYWORDS="amd64 x86" - -RDEPEND=" - kernel_linux? ( - x11-libs/libdrm[video_cards_vmware] - media-libs/mesa[xa] - )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-fix-include-order-bool.patch -) |