Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[mesa] fix inter feature deps #31117

Merged
merged 1 commit into from
Apr 26, 2023
Merged

[mesa] fix inter feature deps #31117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ports/mesa/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,8 @@ if(VCPKG_TARGET_IS_WINDOWS)
endif()
endif()

if(FEATURES STREQUAL "core")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
endif()

vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/docs/license.rst")
12 changes: 11 additions & 1 deletion ports/mesa/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "mesa",
"version": "23.0.1",
"port-version": 1,
"description": "Mesa - The 3D Graphics Library",
"homepage": "https://www.mesa3d.org/",
"license": "MIT AND BSL-1.0 AND SGI-B-2.0",
Expand Down Expand Up @@ -111,7 +112,16 @@
]
},
"offscreen": {
"description": "Build with support for offscreen rendering (OSMesa)"
"description": "Build with support for offscreen rendering (OSMesa)",
"dependencies": [
{
"name": "mesa",
"default-features": false,
"features": [
"opengl"
]
}
]
},
"opengl": {
"description": "Build support for OpenGL (all versions)",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5102,7 +5102,7 @@
},
"mesa": {
"baseline": "23.0.1",
"port-version": 0
"port-version": 1
},
"meschach": {
"baseline": "1.2b",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/mesa.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d76e69afa98f38f1b3102572a8a5516ce088b9ca",
"version": "23.0.1",
"port-version": 1
},
{
"git-tree": "87fb0741a264517b99f37f4ff2ba43264cdfe0f9",
"version": "23.0.1",
Expand Down