Merge branch 'master' into DeviceEmulation-XboxControllerS

xemu-project · Dec 29, 2024 · 8356922 · 8356922
2 parents 1a84e83 + 2c08c76
commit 8356922
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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

diff --git 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):