Date: Tue, 7 Nov 2023 00:22:07 GMT From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 26aa5aa9be0f - main - emulators/libretro-flycast: fix build on FreeBSD 12 Message-ID: <202311070022.3A70M7jX030029@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=26aa5aa9be0fd8c1fb936e0658fc78eb581aca2c commit 26aa5aa9be0fd8c1fb936e0658fc78eb581aca2c Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2023-11-06 20:07:23 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> 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 <cstring> // strcmp + ++/* avoid conflict with macros from sys/types.h */ ++#ifdef major ++# undef major ++#endif ++ ++#ifdef minor ++# undef minor ++#endif ++ + namespace VULKAN_HPP_NAMESPACE + { + //===============
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311070022.3A70M7jX030029>