From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7B52E158086 for ; Sun, 19 Dec 2021 21:30:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B0752BC00A; Sun, 19 Dec 2021 21:30:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AA4262BC02D for ; Sun, 19 Dec 2021 21:30:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7354A342EBA for ; Sun, 19 Dec 2021 21:30:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EF29E23E for ; Sun, 19 Dec 2021 21:30:23 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1639949412.bd3fc7a8f0191de5f3a7ff225c4ff386d217cd46.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-vmware/files/, x11-drivers/xf86-video-vmware/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.3.0-fix-include-order-bool.patch x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild X-VCS-Directories: x11-drivers/xf86-video-vmware/ x11-drivers/xf86-video-vmware/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bd3fc7a8f0191de5f3a7ff225c4ff386d217cd46 X-VCS-Branch: master Date: Sun, 19 Dec 2021 21:30:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1e785220-b93d-49b9-9d51-95753737e69d X-Archives-Hash: 373ce87c9472035f87ee33bc8066fc5a commit: bd3fc7a8f0191de5f3a7ff225c4ff386d217cd46 Author: Sam James gentoo org> AuthorDate: Sun Dec 19 21:23:31 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Dec 19 21:30:12 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd3fc7a8 x11-drivers/xf86-video-vmware: fix build with newer xorg-server Closes: https://bugs.gentoo.org/829627 Signed-off-by: Sam James gentoo.org> ...ideo-vmware-13.3.0-fix-include-order-bool.patch | 51 ++++++++++++++++++++++ .../xf86-video-vmware-13.3.0.ebuild | 4 ++ 2 files changed, 55 insertions(+) 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 +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 +Reviewed-by: Zack Rusin +Signed-off-by: Zack Rusin +--- a/vmwgfx/vmwgfx_driver.h ++++ b/vmwgfx/vmwgfx_driver.h +@@ -36,15 +36,15 @@ + #include + #include + #include +-#include +-#include +-#include + #include + #include + #include + #include + #include + #include ++#include ++#include ++#include + + #include "../src/compat-api.h" + #ifdef DRI2 +--- a/vmwgfx/vmwgfx_saa.c ++++ b/vmwgfx/vmwgfx_saa.c +@@ -29,11 +29,11 @@ + #include + #include + #include +-#include + #include + #include "vmwgfx_saa.h" + #include "vmwgfx_drmi.h" + #include "vmwgfx_saa_priv.h" ++#include + + /* + * 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 +)