From nobody Tue Nov 07 00:22:07 2023 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 4SPTRz48Hgz50py8; Tue, 7 Nov 2023 00:22:07 +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 4SPTRz2jl1z4b6p; Tue, 7 Nov 2023 00:22:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699316527; 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=SJIgpuKPbf0KhifsJ/7vhL+ZzPnK0n3+G4vn+K59ni0=; b=Z7yfWGNSniGgokdBsVTFIL5qwi+sT9avb8MP0t705klZL6ECPzvauZvaykrNWUtL2C5Whz e0s2JQZ9mbSAJjwDSqbPzIEceWmDAVSjmQZDc6gvLmKS2nz4ZuBWTUAjD2wNQX+nnTCSVs SzEqAdtYkA0jTvC5PpO00+Jwu6Kof7LEOy3MzMkajkfMZm0NMNAvNHPiDrdj6qeRsw8DRQ cEPmF9MqSz1rMm3rtx6kMQnLq0gJwQDgT+kSMEnqsaMEcCirv9ZGHxe0ggYtuD01LQ/B9p k0AOYbs5b80JofCiNvAduS3zjVFny2s8RW6MozGGMq/PWvokOxfJTdgEvPZ2jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699316527; 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=SJIgpuKPbf0KhifsJ/7vhL+ZzPnK0n3+G4vn+K59ni0=; b=K4GEMyghU5YmAc6oV0S3T7wtukPmVrPJk4vv1liUtXleIPGIk8KhiGXRi4A3p/0QbGZ0SP 8O8IrFZ+UouWWn2B3Syue4xghfMSoU6mQZRxbu5uySISezPjUeQdmCli2f0qufIR6VsGbD Zfw4wbA6b+nEkShy1MmDznpJrtNYkA4WC1rtRGnLbOuld7mVJsEXdYmaf1vN0hrdu+5lE2 2RHePW2WyRVO8cjGZm556VVMIwWyksZjDkZmm/04rHZSgD9gU+F8arZ1ewMFrAIVhO38Uu UuDu4yCj0yBseR3IXP3B1falK7WRDNQ00fgP6Wttw6T55dJpxCwDNcWVXzpbOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699316527; a=rsa-sha256; cv=none; b=XUVj2G7ZxEn0fol5dU04sR0MSBL6jc1ZeovRV3szOEMITzFdhXfSoj6bc6uhNbPopL0Wu+ UDnUY0ZcpdefQ5Rx7l0Hi8VuRGPTct0ME1JTyFyXsL3xhw4rgN22HNFb35xA+n5OGL0+JG 9rob42cdlLMvzEgNjiUueViBbIrV+jXdTkME2GDgWuLEjV7rIK2QhGkXNFTkt/dSk5doja bgRZiUOP/FzAdMLoNOFB1vvZLEJ7CVEg1GzgAVVCc1OaAz2bS9chsMNn5JTF8RBEEVi5vW e5sK3F1Jk3P8xsaWnORV2W14oWAAxW10YAxwH5f37qRXBnqQtl4TXmrJtbzCgA== 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 4SPTRz1qqWzTZG; Tue, 7 Nov 2023 00:22:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A70M7ij030038; Tue, 7 Nov 2023 00:22:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A70M7jX030029; Tue, 7 Nov 2023 00:22:07 GMT (envelope-from git) Date: Tue, 7 Nov 2023 00:22:07 GMT Message-Id: <202311070022.3A70M7jX030029@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 26aa5aa9be0f - main - emulators/libretro-flycast: fix build on FreeBSD 12 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26aa5aa9be0fd8c1fb936e0658fc78eb581aca2c Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=26aa5aa9be0fd8c1fb936e0658fc78eb581aca2c commit 26aa5aa9be0fd8c1fb936e0658fc78eb581aca2c Author: Robert Clausecker AuthorDate: 2023-11-06 20:07:23 +0000 Commit: Robert Clausecker CommitDate: 2023-11-07 00:17:29 +0000 emulators/libretro-flycast: fix build on FreeBSD 12 Work around the macros major() and minor() being exposed by sys/types.h. Approved by: portmgr (build fix blanket) PR: 274647 --- ...s_Vulkan-Headers_include_vulkan_vulkan__structs.hpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/emulators/libretro-flycast/files/patch-core_deps_Vulkan-Headers_include_vulkan_vulkan__structs.hpp b/emulators/libretro-flycast/files/patch-core_deps_Vulkan-Headers_include_vulkan_vulkan__structs.hpp new file mode 100644 index 000000000000..a5fcacb98294 --- /dev/null +++ b/emulators/libretro-flycast/files/patch-core_deps_Vulkan-Headers_include_vulkan_vulkan__structs.hpp @@ -0,0 +1,18 @@ +--- core/deps/Vulkan-Headers/include/vulkan/vulkan_structs.hpp.orig 2023-11-06 20:05:46 UTC ++++ core/deps/Vulkan-Headers/include/vulkan/vulkan_structs.hpp +@@ -10,6 +10,15 @@ + + #include // strcmp + ++/* avoid conflict with macros from sys/types.h */ ++#ifdef major ++# undef major ++#endif ++ ++#ifdef minor ++# undef minor ++#endif ++ + namespace VULKAN_HPP_NAMESPACE + { + //===============