WIP [skip actions]

microsoft · Jan 9, 2024 · 330b098 · 330b098
1 parent d8670f1
commit 330b098
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 29 deletions.
diff --git a/ports/libdrm/portfile.cmake b/ports/libdrm/portfile.cmake
@@ -0,0 +1,25 @@
+vcpkg_check_linkage(ONLY_DYNAMIC_CRT)
+
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO mesa/drm
+    REF libdrm-${VERSION}
+    SHA512 620398e6e2d44c61f9ab90036d03a1f236213aa865623e96cae08960fcd43a4802a2c55cd9fd1a16c5a66f48373d30c6e70899895bdb3965208b28eefce29626
+    FILE_DISAMBIGUATOR 1
+    HEAD_REF main
+)
+
+vcpkg_configure_meson(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS 
+
+)
+vcpkg_install_meson()
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" [[
+Most source files are under a MIT-style license.
+]])
diff --git a/ports/libdrm/vcpkg.json b/ports/libdrm/vcpkg.json
@@ -0,0 +1,8 @@
+{
+  "name": "libdrm",
+  "version": "2.4.119",
+  "description": "Userspace library for accessing the direct rendering manager (DRM)",
+  "homepage": "https://www.mesa3d.org/",
+  "license": null,
+  "supports": "!apple & !ios & !windows"
+}
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

diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json
@@ -7,6 +7,10 @@
   "license": "MIT AND BSL-1.0 AND SGI-B-2.0",
   "supports": "!(windows & arm) & !staticcrt & !uwp",
   "dependencies": [
+    {
+      "name": "libdrm",
+      "platform": "android | freebsd | linux | openbsd"
+    },
     {
       "name": "vcpkg-get-python-packages",
       "host": true
@@ -19,31 +23,16 @@
     "zstd"
   ],
   "default-features": [
-    "default-features"
+    "gles1",
+    "gles2",
+    {
+      "name": "llvm",
+      "platform": "x64"
+    },
+    "opengl",
+    "vulkan"
   ],
   "features": {
-    "default-features": {
-      "description": "Platform dependent default features",
-      "dependencies": [
-        {
-          "name": "mesa",
-          "default-features": false,
-          "features": [
-            "gles1",
-            "gles2",
-            "opengl"
-          ]
-        },
-        {
-          "name": "mesa",
-          "default-features": false,
-          "features": [
-            "llvm"
-          ],
-          "platform": "x64"
-        }
-      ]
-    },
     "egl": {
       "description": "Build support for EGL platform",
       "dependencies": [
@@ -132,13 +121,13 @@
     "vulkan-drivers": {
       "description": "Build Vulkan drivers applicable to the target",
       "dependencies": [
-        "vulkan-headers",
         {
           "name": "glslang",
           "features": [
             "tools"
           ]
-        }
+        },
+        "vulkan-headers"
       ]
     }
   }

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