[mesa] Fix linux and osx

microsoft · Jan 11, 2024 · 0fe7ccd · 0fe7ccd
1 parent ef050e8
commit 0fe7ccd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake
@@ -10,7 +10,7 @@ vcpkg_from_gitlab(
     REF mesa-${VERSION}
     SHA512 96f7602c98d532a269116bd5d3f9cbe87ca4425b309467cc19f83277a0faaa9804edea72dcaeb6f7774cac17790d5d76b58c357ef639cb6064e7480d93b861bf
     FILE_DISAMBIGUATOR 1
-    HEAD_REF master
+    HEAD_REF main
     PATCHES
         gallium-fix-build-with-llvm-17.patch
         clover-llvm-move-to-modern-pass-manager.patch
@@ -99,8 +99,9 @@ vcpkg_configure_meson(
         -Dglx=disabled
         -Dlibunwind=disabled
         -Dlmsensors=disabled
-        -Dshared-llvm=auto
+        -Dshared-llvm=disabled  # disable autodetection - fails; llvm is ONLY_STATIC_LIBRARY
         -Dvalgrind=disabled
+        -Dvulkan-drivers=[]     # disable autodetection - drivers have deps
         -Dzstd=enabled
         ${MESA_OPTIONS}
     )

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -692,9 +692,6 @@ mecab:x86-windows        = skip
 memorymodule:arm-neon-android=fail
 memorymodule:arm64-android=fail
 memorymodule:x64-android=fail
-# Missing dependent libraries.
-mesa:x64-linux=fail
-mesa:x64-osx=fail
 mfx-dispatch:arm-neon-android=fail
 mfx-dispatch:arm64-android=fail
 mfx-dispatch:x64-android=fail

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5530,7 +5530,7 @@
     },
     "mesa": {
       "baseline": "23.2.1",
-      "port-version": 0
+      "port-version": 1
     },
     "meschach": {
       "baseline": "1.2b",

diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c6dccea5b7e557b43441dbb2f10316bc8f88554a",
+      "version": "23.2.1",
+      "port-version": 1
+    },
     {
       "git-tree": "3f318339b0c26814bbd53fce78471f1a95fdfe0d",
       "version": "23.2.1",