From 330b098350dd32c0ca6ac11565a9b3b85e452921 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 9 Jan 2024 08:38:16 +0100 Subject: [PATCH] WIP [skip actions] --- ports/libdrm/portfile.cmake | 25 ++++++++++++++++++++++++ ports/libdrm/vcpkg.json | 8 ++++++++ ports/mesa/portfile.cmake | 2 +- ports/mesa/vcpkg.json | 39 +++++++++++++------------------------ scripts/ci.baseline.txt | 3 --- 5 files changed, 48 insertions(+), 29 deletions(-) create mode 100644 ports/libdrm/portfile.cmake create mode 100644 ports/libdrm/vcpkg.json diff --git a/ports/libdrm/portfile.cmake b/ports/libdrm/portfile.cmake new file mode 100644 index 00000000000000..5a08d0dfb43d14 --- /dev/null +++ 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 new file mode 100644 index 00000000000000..7d9a4fe0147225 --- /dev/null +++ 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 index 61ca1d59a999c6..5e53c5f7915526 100644 --- 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 index cda3381e4a0bec..a4dc01075efdc6 100644 --- 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 index 1c34876165db94..63a1c15199a9cb 100644 --- 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