From 0308baa4b09b8541ac260c952e082b6414330145 Mon Sep 17 00:00:00 2001 From: Matt Borgerson Date: Fri, 27 Dec 2024 00:47:44 -0700 Subject: [PATCH 1/2] download-macos-libs.py: Skip mesa, llvm --- scripts/download-macos-libs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/download-macos-libs.py b/scripts/download-macos-libs.py index dd1f913dd60..e75d886c026 100755 --- a/scripts/download-macos-libs.py +++ b/scripts/download-macos-libs.py @@ -92,7 +92,7 @@ def verify_pkg(self, pkg_path, sig_path): shell=True, check=True) def is_pkg_skipped(self, pkg_name): - return any(pkg_name.startswith(n) for n in ('python', 'ncurses')) + return any(pkg_name.startswith(n) for n in ('python', 'ncurses', 'mesa', 'llvm')) def install_pkg(self, pkg_name): if self.is_pkg_installed(pkg_name): From 2c08c76b095748eb28a1c26157ddf67e5541ca44 Mon Sep 17 00:00:00 2001 From: antangelo Date: Thu, 26 Dec 2024 22:55:22 -0500 Subject: [PATCH 2/2] .clang-format: Set SortIncludes to Never --- .clang-format | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.clang-format b/.clang-format index 56804459cbc..8750a94dc87 100644 --- a/.clang-format +++ b/.clang-format @@ -82,7 +82,7 @@ MaxEmptyLinesToKeep: 2 #PenaltyReturnTypeOnItsOwnLine: 60 PointerAlignment: Right ReflowComments: true -SortIncludes: true +SortIncludes: Never SpaceAfterCStyleCast: false SpaceBeforeAssignmentOperators: true SpaceBeforeParens: ControlStatements