diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
| commit | 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch) | |
| tree | b9791a06ab3284e27b568412c59316c66240c682 /x11-drivers/xf86-video-vmware | |
| parent | 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff) | |
gentoo resync : 22.12.2021
Diffstat (limited to 'x11-drivers/xf86-video-vmware')
3 files changed, 57 insertions, 1 deletions
diff --git a/x11-drivers/xf86-video-vmware/Manifest b/x11-drivers/xf86-video-vmware/Manifest index 960e6b789b9a..c1a238e1872e 100644 --- a/x11-drivers/xf86-video-vmware/Manifest +++ b/x11-drivers/xf86-video-vmware/Manifest @@ -1,3 +1,4 @@ +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 -EBUILD xf86-video-vmware-13.3.0.ebuild 345 BLAKE2B 8bc8a6804a7d9114d7732189eb9aa3d22d9e03d47a2f98c1140cdca020331d656d259006551620f31491407d3fe4a44d0967ddf2440d052ab59f9fc8e08bf6ca SHA512 a570e0831e74b08bb29ad5fd1a7c88ebd4b662daa49ce48ba24bc542f1bdecf215604b75f21771165eaada4448d73fb1d16a653f23d418b765bdc5bf627fae10 +EBUILD xf86-video-vmware-13.3.0.ebuild 407 BLAKE2B b1a56f26c1dea94e91d013c04713e3766510022fc64fdd9c9249ad7b60b7f4cf62e7f0625a5815bf323c660d3127ec5a8d710b48d9cf9d14b37ef481e2caf3d4 SHA512 a1892f49033000ba317f39a24bd98c1c1df9354eb22d901e18b5e8b7a8dc9655698e765c5f2948b2a3db49cd218ab9ece38ec38140feeff42beeccabc50e383d MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc 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 new file mode 100644 index 000000000000..9ffa436a41e5 --- /dev/null +++ b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.3.0-fix-include-order-bool.patch @@ -0,0 +1,51 @@ +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.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild index d08ada7668f2..ee472df8b0d6 100644 --- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild +++ b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild @@ -17,3 +17,7 @@ RDEPEND=" media-libs/mesa[xa] )" DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-fix-include-order-bool.patch +) |