From 2a6371b01420d8820d158b4707e79931feba27aa Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Fri, 8 Dec 2023 17:30:37 +0800 Subject: [PATCH] [sdl2,sdl2-*] allow disabling transitive dependencies (#35394) --- ports/sdl2-gfx/vcpkg.json | 7 +++++-- ports/sdl2-image/vcpkg.json | 6 +++++- ports/sdl2-mixer-ext/vcpkg.json | 6 +++++- ports/sdl2-mixer/vcpkg.json | 7 +++++-- ports/sdl2-net/vcpkg.json | 7 +++++-- ports/sdl2-ttf/vcpkg.json | 6 +++++- ports/sdl2/vcpkg.json | 2 ++ ports/sdl2pp/vcpkg.json | 7 +++++-- versions/baseline.json | 16 ++++++++-------- versions/s-/sdl2-gfx.json | 5 +++++ versions/s-/sdl2-image.json | 5 +++++ versions/s-/sdl2-mixer-ext.json | 5 +++++ versions/s-/sdl2-mixer.json | 5 +++++ versions/s-/sdl2-net.json | 5 +++++ versions/s-/sdl2-ttf.json | 5 +++++ versions/s-/sdl2.json | 5 +++++ versions/s-/sdl2pp.json | 5 +++++ 17 files changed, 85 insertions(+), 19 deletions(-) diff --git a/ports/sdl2-gfx/vcpkg.json b/ports/sdl2-gfx/vcpkg.json index a6b0345c71..4e48c75f32 100644 --- a/ports/sdl2-gfx/vcpkg.json +++ b/ports/sdl2-gfx/vcpkg.json @@ -1,10 +1,13 @@ { "name": "sdl2-gfx", "version": "1.0.4", - "port-version": 10, + "port-version": 11, "description": "Graphics primitives (line, circle, rectangle etc.) with AA support, rotozoomer and other drawing related support functions wrapped up in a C based add-on library for the Simple Direct Media (SDL) cross-platform API layer.", "dependencies": [ - "sdl2", + { + "name": "sdl2", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/sdl2-image/vcpkg.json b/ports/sdl2-image/vcpkg.json index 8198bbd180..bcec81ee07 100644 --- a/ports/sdl2-image/vcpkg.json +++ b/ports/sdl2-image/vcpkg.json @@ -1,12 +1,16 @@ { "name": "sdl2-image", "version": "2.6.3", + "port-version": 1, "description": "SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV", "homepage": "https://github.com/libsdl-org/SDL_image", "license": "Zlib", "dependencies": [ "libpng", - "sdl2", + { + "name": "sdl2", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/sdl2-mixer-ext/vcpkg.json b/ports/sdl2-mixer-ext/vcpkg.json index d45124ea3b..bf61b0923e 100644 --- a/ports/sdl2-mixer-ext/vcpkg.json +++ b/ports/sdl2-mixer-ext/vcpkg.json @@ -1,11 +1,15 @@ { "name": "sdl2-mixer-ext", "version": "2.6.0", + "port-version": 1, "description": "An audio mixer library based on the SDL library, a fork of SDL_mixer", "homepage": "https://wohlsoft.github.io/SDL-Mixer-X", "license": "Zlib OR LGPL-2.1-or-later OR GPL-2.0-or-later OR GPL-3.0-or-later", "dependencies": [ - "sdl2", + { + "name": "sdl2", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/sdl2-mixer/vcpkg.json b/ports/sdl2-mixer/vcpkg.json index 63226e7c87..ba390032cc 100644 --- a/ports/sdl2-mixer/vcpkg.json +++ b/ports/sdl2-mixer/vcpkg.json @@ -1,13 +1,16 @@ { "name": "sdl2-mixer", "version": "2.6.3", - "port-version": 1, + "port-version": 2, "description": "Multi-channel audio mixer library for SDL.", "homepage": "https://github.com/libsdl-org/SDL_mixer", "license": "Zlib", "dependencies": [ "libvorbis", - "sdl2", + { + "name": "sdl2", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/sdl2-net/vcpkg.json b/ports/sdl2-net/vcpkg.json index 941ca075e4..72a7076ec3 100644 --- a/ports/sdl2-net/vcpkg.json +++ b/ports/sdl2-net/vcpkg.json @@ -1,12 +1,15 @@ { "name": "sdl2-net", "version": "2.2.0", - "port-version": 2, + "port-version": 3, "description": "Networking library for SDL", "homepage": "https://github.com/libsdl-org/SDL_net", "license": "Zlib", "dependencies": [ - "sdl2", + { + "name": "sdl2", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/sdl2-ttf/vcpkg.json b/ports/sdl2-ttf/vcpkg.json index 526313c012..7594a5d818 100644 --- a/ports/sdl2-ttf/vcpkg.json +++ b/ports/sdl2-ttf/vcpkg.json @@ -1,12 +1,16 @@ { "name": "sdl2-ttf", "version": "2.20.2", + "port-version": 1, "description": "A library for rendering TrueType fonts with SDL", "homepage": "https://www.libsdl.org/projects/SDL_ttf/", "license": "Zlib", "dependencies": [ "freetype", - "sdl2", + { + "name": "sdl2", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index b5e96c4bac..7a38084094 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,12 +1,14 @@ { "name": "sdl2", "version": "2.28.5", + "port-version": 1, "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org/download-2.0.php", "license": "Zlib", "dependencies": [ { "name": "dbus", + "default-features": false, "platform": "linux" }, { diff --git a/ports/sdl2pp/vcpkg.json b/ports/sdl2pp/vcpkg.json index fd8683d9bf..cca338e876 100644 --- a/ports/sdl2pp/vcpkg.json +++ b/ports/sdl2pp/vcpkg.json @@ -1,12 +1,15 @@ { "name": "sdl2pp", "version": "0.16.1", - "port-version": 7, + "port-version": 8, "description": "C++11 bindings/wrapper for SDL2", "homepage": "https://sdl2pp.amdmi3.ru", "license": "Zlib", "dependencies": [ - "sdl2", + { + "name": "sdl2", + "default-features": false + }, "sdl2-image", "sdl2-mixer", "sdl2-ttf", diff --git a/versions/baseline.json b/versions/baseline.json index 672099f98a..ccace07ec4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7734,35 +7734,35 @@ }, "sdl2": { "baseline": "2.28.5", - "port-version": 0 + "port-version": 1 }, "sdl2-gfx": { "baseline": "1.0.4", - "port-version": 10 + "port-version": 11 }, "sdl2-image": { "baseline": "2.6.3", - "port-version": 0 + "port-version": 1 }, "sdl2-mixer": { "baseline": "2.6.3", - "port-version": 1 + "port-version": 2 }, "sdl2-mixer-ext": { "baseline": "2.6.0", - "port-version": 0 + "port-version": 1 }, "sdl2-net": { "baseline": "2.2.0", - "port-version": 2 + "port-version": 3 }, "sdl2-ttf": { "baseline": "2.20.2", - "port-version": 0 + "port-version": 1 }, "sdl2pp": { "baseline": "0.16.1", - "port-version": 7 + "port-version": 8 }, "seacas": { "baseline": "2022-11-22", diff --git a/versions/s-/sdl2-gfx.json b/versions/s-/sdl2-gfx.json index 0e29a98178..db923c68b7 100644 --- a/versions/s-/sdl2-gfx.json +++ b/versions/s-/sdl2-gfx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47c97b80725181cf21b62229de6194b92d74f0fa", + "version": "1.0.4", + "port-version": 11 + }, { "git-tree": "6799c7e90f7c606835a0544db0852f31dbf99cbb", "version": "1.0.4", diff --git a/versions/s-/sdl2-image.json b/versions/s-/sdl2-image.json index 38f9a2a45f..5292e9b68a 100644 --- a/versions/s-/sdl2-image.json +++ b/versions/s-/sdl2-image.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "641c3eeecdd7f109ac777e1a2792dd2b755f07fc", + "version": "2.6.3", + "port-version": 1 + }, { "git-tree": "cea786776b9bf5d0af613153194d58fa74aaf011", "version": "2.6.3", diff --git a/versions/s-/sdl2-mixer-ext.json b/versions/s-/sdl2-mixer-ext.json index 9c12d86166..4d116f1f56 100644 --- a/versions/s-/sdl2-mixer-ext.json +++ b/versions/s-/sdl2-mixer-ext.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84e15f8ee51675059344358a920f2c9f4d3caa36", + "version": "2.6.0", + "port-version": 1 + }, { "git-tree": "4585bc468e6fbd0b8315dfa4dddbc2501945fbf8", "version": "2.6.0", diff --git a/versions/s-/sdl2-mixer.json b/versions/s-/sdl2-mixer.json index 1f24d00eda..f311d989b0 100644 --- a/versions/s-/sdl2-mixer.json +++ b/versions/s-/sdl2-mixer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf530acd7b5169aaea8a4a7ec8c8d9a1987f7164", + "version": "2.6.3", + "port-version": 2 + }, { "git-tree": "4c169dd178363fec7d46194a45dc250b604b1f2e", "version": "2.6.3", diff --git a/versions/s-/sdl2-net.json b/versions/s-/sdl2-net.json index 0452f1331e..1a4e1c3c1e 100644 --- a/versions/s-/sdl2-net.json +++ b/versions/s-/sdl2-net.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f735d9ac81c56778c5a317db55d1c1f2cce78e87", + "version": "2.2.0", + "port-version": 3 + }, { "git-tree": "755d96f16afae7c5b7cae15eb97fe5da85951a72", "version": "2.2.0", diff --git a/versions/s-/sdl2-ttf.json b/versions/s-/sdl2-ttf.json index 3441119d6e..7d1a1116a4 100644 --- a/versions/s-/sdl2-ttf.json +++ b/versions/s-/sdl2-ttf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5727e1037aeb6698eda35ad791157d78d22b1a93", + "version": "2.20.2", + "port-version": 1 + }, { "git-tree": "8ea231424114356e940ea3ac40fdc7da27ea95ad", "version": "2.20.2", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index 5c450683eb..da2c1c4796 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46ab8ddbed64fe98dab84eb0d95b8bb6e6d2d531", + "version": "2.28.5", + "port-version": 1 + }, { "git-tree": "06cf4722fa0f5f8467136faebe34cef0e85e1a4c", "version": "2.28.5", diff --git a/versions/s-/sdl2pp.json b/versions/s-/sdl2pp.json index f5603adc58..9bdb0f8af2 100644 --- a/versions/s-/sdl2pp.json +++ b/versions/s-/sdl2pp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77e56d86771c6c97f8d9c7d8fa121dc2312ef509", + "version": "0.16.1", + "port-version": 8 + }, { "git-tree": "bad32a45cda4bfc70197d99e62b840794bd0b747", "version": "0.16.1",