From 96d5fb3de135b86d7222c53f2352ca92827a156b Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 26 Apr 2025 09:39:18 +0200 Subject: [PATCH] [sdl1,libwebp] Update features baseline (#45214) --- ports/libwebp/vcpkg.json | 17 +++-------------- ports/sdl1/vcpkg.json | 4 ++-- scripts/ci.baseline.txt | 3 --- scripts/ci.feature.baseline.txt | 19 ++++++++----------- versions/baseline.json | 4 ++-- versions/l-/libwebp.json | 5 +++++ versions/s-/sdl1.json | 5 +++++ 7 files changed, 25 insertions(+), 32 deletions(-) diff --git a/ports/libwebp/vcpkg.json b/ports/libwebp/vcpkg.json index 2d1c56b42f..3b43dd40ff 100644 --- a/ports/libwebp/vcpkg.json +++ b/ports/libwebp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libwebp", "version": "1.5.0", + "port-version": 1, "description": "WebP codec: library to encode and decode images in WebP format", "homepage": "https://github.com/webmproject/libwebp", "license": "BSD-3-Clause", @@ -67,7 +68,7 @@ "features": [ "vwebp-sdl" ], - "platform": "!osx & !static & !uwp" + "platform": "!android & !osx & !uwp & !(windows & static)" } ] }, @@ -158,18 +159,6 @@ "info": { "description": "Build the webpinfo command line tool." }, - "libbwebpmux": { - "description": "Obsolete, use feature libwebpmux instead.", - "dependencies": [ - { - "name": "libwebp", - "default-features": false, - "features": [ - "libwebpmux" - ] - } - ] - }, "libwebpmux": { "description": "Build the libwebpmux library" }, @@ -199,7 +188,7 @@ }, "vwebp": { "description": "Build the vwebp viewer tool.", - "supports": "!osx & !static", + "supports": "!osx & !(windows & static)", "dependencies": [ "freeglut", "opengl" diff --git a/ports/sdl1/vcpkg.json b/ports/sdl1/vcpkg.json index b4e4f13a70..1ef14b0492 100644 --- a/ports/sdl1/vcpkg.json +++ b/ports/sdl1/vcpkg.json @@ -1,11 +1,11 @@ { "name": "sdl1", "version": "1.2.15", - "port-version": 21, + "port-version": 22, "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", "license": "LGPL-2.1-or-later", - "supports": "!osx & !uwp", + "supports": "!android & !osx & !uwp", "dependencies": [ { "name": "vcpkg-msbuild", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5577017f57..b2d83adc99 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -918,9 +918,6 @@ sciter:x64-windows-static-md=skip sciter:x64-windows-static=skip sciter:x64-windows=skip sciter:x86-windows=skip -sdl1:arm-neon-android=fail -sdl1:arm64-android=fail -sdl1:x64-android=fail septag-sx:x64-android=fail sfml:arm-neon-android=fail sfml:arm64-android=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index d73dc1b6a5..96c990f9c0 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -269,6 +269,7 @@ libwandio:x64-windows-static-md=fail libwandio:x64-windows-static=fail libwandio:x64-windows=fail libwandio:x86-windows=fail +libwebp[core]:x64-android=combination-fails # Compiler crash without simd libxt:arm64-windows=fail # clang-cl ICEd licensepp:arm-uwp=fail licensepp:x64-uwp=fail @@ -1371,13 +1372,9 @@ libspatialite:x64-uwp = cascade libtorch:x86-windows = cascade libtorch[vulkan] = cascade # no vulkan sdk installed libtorch(uwp | (arm & windows) | (arm64 & osx)) = cascade -libwebp[all,unicode,vwebp-sdl,vwebp]:arm64-uwp = cascade -libwebp[all,vwebp-sdl,vwebp]:x64-uwp = cascade -libwebp[unicode]:arm64-windows = cascade -libwebp[vwebp-sdl]:arm64-osx = cascade -libwebp[vwebp-sdl]:x64-linux = cascade -libwebp[vwebp-sdl]:x64-windows-static = cascade -libwebp[vwebp-sdl]:x64-windows-static-md = cascade +libwebp[all,vwebp](uwp) = cascade +libwebp[vwebp](android) = cascade +libwebp[vwebp-sdl](android | osx | uwp | (windows & static)) = cascade libx11:arm64-uwp = cascade libx11:x64-uwp = cascade libxau:arm64-uwp = cascade @@ -1639,7 +1636,7 @@ openvpn3:x64-uwp = cascade osg[default-features]:arm64-osx = cascade osg[nvtt]:arm64-osx = cascade osg[nvtt]:arm64-windows = cascade -osg[sdl1]:arm64-osx = cascade +osg[sdl1](android | osx) = cascade osg-qt:arm64-osx = cascade osg-qt:arm64-uwp = cascade osg-qt:arm64-windows = cascade @@ -1988,9 +1985,8 @@ sdformat10:x64-windows-static = cascade sdformat13:x64-windows-static = cascade sdformat6:x64-windows-static = cascade sdformat9:x64-windows-static = cascade -sdl1-net:arm64-uwp = cascade -sdl1-net:x64-uwp = cascade -sdl1-net(osx) = cascade +sdl1-mixer(android) = cascade +sdl1-net(android | osx | uwp) = cascade sdl2-mixer[fluidsynth,libmodplug,opusfile](uwp) = cascade sdl2-mixer[wavpack](android) = cascade sdl2-mixer-ext[fluidsynth,libmodplug,opusfile](uwp) = cascade @@ -2240,6 +2236,7 @@ libpsl[libidn2,libicu] = options # "At least one of libidn2 and libicu should be libraw[openmp](osx) = feature-fails # requires openmp (works with right setup) libsbml[expat, libxml2] = options # have to select excatly one xml lib(they are features) libssh[core,openssl,mbedtls] = options # we have to select feature openssl or mbedtls +libwebp[anim,cwebp,dwebp,extras,gif2webp,img2webp,info,mux,libwebpmux,nearlossless,swap16bitcsp,unicode,vwebp]:x64-android = no-separate-feature-test # Compiler crash without simd libwebp[anim,cwebp,dwebp,extras,img2webp](uwp) = feature-fails # linker error. See https://github.com/microsoft/vcpkg/issues/33603 llvm[core,flang] = options # exclude flang from all since it is not compatible with enable enable-eh llvm[enable-mlir-python-bindings](osx) = feature-fails # Could NOT find Python3 (missing: Development Development.Module Development.Embed) (found version "3.12"). Same as https://github.com/microsoft/vcpkg/issues/34779 diff --git a/versions/baseline.json b/versions/baseline.json index 1d82dab273..dec60d301e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5490,7 +5490,7 @@ }, "libwebp": { "baseline": "1.5.0", - "port-version": 0 + "port-version": 1 }, "libwebsockets": { "baseline": "4.3.5", @@ -8454,7 +8454,7 @@ }, "sdl1": { "baseline": "1.2.15", - "port-version": 21 + "port-version": 22 }, "sdl1-mixer": { "baseline": "2023-03-25", diff --git a/versions/l-/libwebp.json b/versions/l-/libwebp.json index ee8a124dc7..0c145154bc 100644 --- a/versions/l-/libwebp.json +++ b/versions/l-/libwebp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4da57885ea948ff63857226aaf586d6c44b4c96d", + "version": "1.5.0", + "port-version": 1 + }, { "git-tree": "785bb5f8a86b4f67c4186cdb2c7ee09d344dcfff", "version": "1.5.0", diff --git a/versions/s-/sdl1.json b/versions/s-/sdl1.json index e298784d04..c225700460 100644 --- a/versions/s-/sdl1.json +++ b/versions/s-/sdl1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41898dff1a370c45aee480e8e525ab5a1a7e40ab", + "version": "1.2.15", + "port-version": 22 + }, { "git-tree": "9a56a739ee46255d64f35c8c07fd40165bbfdc5f", "version": "1.2.15",