From nobody Thu Dec 2 14:10:01 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6349118BE0B9; Thu, 2 Dec 2021 14:10:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J4dBf13Nrz4qqD; Thu, 2 Dec 2021 14:10:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 047A41E94D; Thu, 2 Dec 2021 14:10:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B2EA1w5096931; Thu, 2 Dec 2021 14:10:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B2EA1V9096928; Thu, 2 Dec 2021 14:10:01 GMT (envelope-from git) Date: Thu, 2 Dec 2021 14:10:01 GMT Message-Id: <202112021410.1B2EA1V9096928@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 40e9ad50deb0 - main - x11-drivers/xf86-video-vmware: Fix build with latest libdrm List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40e9ad50deb01802e7c8ae1aed068d3e2ab78d69 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638454202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zhRV6VjYpEs9BpikUFahwuJGUzSkBOgm6xfX9VJeSWw=; b=RyAa5NW5g/C/TAy9ilhwgUJPH+Gh1rKBHu9CcP+H4yLQAodJom4GpC4c7LZ7UHpI72TfYX cNzEWUllnc6eKRCrHJnZAmlDdbuCog8r6ndHZhIBvDvf4olPxTslS290vHsW+yk7Qa6fmi jyQuy6taOUJ9VXHDLLL1EChssw3N2ji/kowwGfpMKVnLm7VEMbq6fR4+y7LUBsc6/mhxUH I5qaCF+Yp1vV5EV3vdYQFgpJ8lA4HpCmn3QfG9M+KEPWJL7PJS6AbCBOy2hUSYJMzvWLG1 WE0+QXxLlNUW0o4C/l3T+ft2CxIlQBhXljw04MKp33dnqvOCSo3JAYKSZIpuXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638454202; a=rsa-sha256; cv=none; b=QG8KS9w6TlHirO3VlZVuLDh3LRFnE/EO3beadKugEkKQDFspGrBC4Dvs19q5IBhFlxzjlZ yy3wmlvw85w3GNBKRS8BFbS8v23vnx2KFhD9mFBNJAv41XkrN0HNUkX2eFVPVUSxsb6jSx pt5rf7qiv2IH+K4SWVXHoHsXpUBEQbpM0oJGYPBB5G42pZOHJos0m8CFvyBoPwqvG0Zx5x zo4nFTSKHLW/B6PemiQYH1+6M8yRfJ6wINYT3oD1cfM0FzTZjE3k6KRwi0gS2DScWmSSgJ SisuSAKHuDvVL8z80GHGxUwMa5hqazQTegY2ApDtgKUXuwvN2G+01RGr6NEigg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=40e9ad50deb01802e7c8ae1aed068d3e2ab78d69 commit 40e9ad50deb01802e7c8ae1aed068d3e2ab78d69 Author: Emmanuel Vadot AuthorDate: 2021-12-02 13:56:56 +0000 Commit: Emmanuel Vadot CommitDate: 2021-12-02 14:09:36 +0000 x11-drivers/xf86-video-vmware: Fix build with latest libdrm libdrm includes stdbool.h but xorg redefines it in xf86Opt.h Simply undef our bool to fix this failure. PR: 259949 Sponsored by: Beckhoff Automation GmbH & Co. KG --- x11-drivers/xf86-video-vmware/files/patch-saa_saa.h | 10 ++++++++++ .../xf86-video-vmware/files/patch-vmwgfx_vmwgfx__driver.h | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/x11-drivers/xf86-video-vmware/files/patch-saa_saa.h b/x11-drivers/xf86-video-vmware/files/patch-saa_saa.h new file mode 100644 index 000000000000..f730407cefcf --- /dev/null +++ b/x11-drivers/xf86-video-vmware/files/patch-saa_saa.h @@ -0,0 +1,10 @@ +--- saa/saa.h.orig 2021-12-02 13:55:48 UTC ++++ saa/saa.h +@@ -40,6 +40,7 @@ + #else + #include + #endif ++#undef bool + #include + #include + #include diff --git a/x11-drivers/xf86-video-vmware/files/patch-vmwgfx_vmwgfx__driver.h b/x11-drivers/xf86-video-vmware/files/patch-vmwgfx_vmwgfx__driver.h new file mode 100644 index 000000000000..36a748b34756 --- /dev/null +++ b/x11-drivers/xf86-video-vmware/files/patch-vmwgfx_vmwgfx__driver.h @@ -0,0 +1,10 @@ +--- vmwgfx/vmwgfx_driver.h.orig 2021-12-02 13:55:36 UTC ++++ vmwgfx/vmwgfx_driver.h +@@ -40,6 +40,7 @@ + #include + #include + #include ++#undef bool + #include + #include + #include