[simage] Re-process the features, add feature avienc and gdiplus (#20378)

* [simage] Re-handle the features, add feature avienc and gdiplus

* version

* Add double quotes

* version

4 files changed, 56 insertions, 22 deletions

diff --git a/ports/simage/portfile.cmake b/ports/simage/portfile.cmake
index 6868fb16e..247018842 100644
--- a/ports/simage/portfile.cmake
+++ b/ports/simage/portfile.cmake
@@ -18,35 +18,31 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" SIMAGE_USE_MSVC_STATIC_RUNT
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
+        avienc      SIMAGE_USE_AVIENC
+        gdiplus     SIMAGE_USE_GDIPLUS
         oggvorbis   SIMAGE_OGGVORBIS_SUPPORT
         sndfile     SIMAGE_LIBSNDFILE_SUPPORT
+        giflib      SIMAGE_GIF_SUPPORT
+        jpeg        SIMAGE_JPEG_SUPPORT
+        png         SIMAGE_PNG_SUPPORT
+        tiff        SIMAGE_TIFF_SUPPORT
+        zlib        SIMAGE_ZLIB_SUPPORT
 )
 
 # Depends on the platform
-if(VCPKG_TARGET_IS_WINDOWS)
-    set(SIMAGE_ON_WIN ON)
-    set(SIMAGE_ON_NON_WIN OFF)
-else()
-    set(SIMAGE_ON_WIN OFF)
-    set(SIMAGE_ON_NON_WIN ON)
+if(VCPKG_TARGET_IS_WINDOWS AND "gdiplus" IN_LIST FEATURES)
+    message(WARNING "Feature 'gdiplus' will disable feature 'zlib', 'giflib', 'jpeg', 'png' and 'tiff' automaticly.")
+elseif ((VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
+         AND ("gdiplus" IN_LIST FEATURES OR "avienc" IN_LIST FEATURES))
+    message(FATAL_ERROR "Feature 'avienc' and 'gdiplus' only support Windows.")
 endif()
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
     OPTIONS ${FEATURE_OPTIONS}
         -DSIMAGE_BUILD_SHARED_LIBS:BOOL=${SIMAGE_BUILD_SHARED_LIBS}
         -DSIMAGE_USE_STATIC_LIBS:BOOL=${SIMAGE_USE_STATIC_LIBS}
         -DSIMAGE_USE_MSVC_STATIC_RUNTIME:BOOL=${SIMAGE_USE_MSVC_STATIC_RUNTIME}
-        -DSIMAGE_USE_AVIENC=${SIMAGE_ON_WIN}
-        -DSIMAGE_USE_GDIPLUS=${SIMAGE_ON_WIN}
-        # Available on Linux, OSX and Windows without gdiplus
-        -DSIMAGE_ZLIB_SUPPORT=${SIMAGE_ON_NON_WIN}
-        -DSIMAGE_GIF_SUPPORT=${SIMAGE_ON_NON_WIN}
-        -DSIMAGE_JPEG_SUPPORT=${SIMAGE_ON_NON_WIN}
-        -DSIMAGE_PNG_SUPPORT=${SIMAGE_ON_NON_WIN}
-        -DSIMAGE_TIFF_SUPPORT=${SIMAGE_ON_NON_WIN}
-        #
         -DSIMAGE_USE_CGIMAGE=OFF
         -DSIMAGE_USE_QIMAGE=OFF
         -DSIMAGE_USE_QT6=OFF
@@ -65,15 +61,15 @@ vcpkg_configure_cmake(
         -DSIMAGE_BUILD_DOCUMENTATION=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/simage-${SIMAGE_VERSION})
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/simage-${SIMAGE_VERSION})
 
 if (NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW)
     vcpkg_copy_tools(TOOL_NAMES simage-config AUTO_CLEAN)
 endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/simage/vcpkg.json b/ports/simage/vcpkg.json
index 2b50a2c6d..e302ce701 100644
--- a/ports/simage/vcpkg.json
+++ b/ports/simage/vcpkg.json
@@ -1,9 +1,20 @@
 {
   "name": "simage",
   "version-semver": "1.8.1",
+  "port-version": 1,
   "description": "Image file format library abstraction layer",
   "homepage": "https://github.com/coin3d/simage",
   "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
   "default-features": [
     "all"
   ],
@@ -29,6 +40,22 @@
           "name": "simage",
           "default-features": false,
           "features": [
+            "avienc"
+          ],
+          "platform": "windows"
+        },
+        {
+          "name": "simage",
+          "default-features": false,
+          "features": [
+            "gdiplus"
+          ],
+          "platform": "windows"
+        },
+        {
+          "name": "simage",
+          "default-features": false,
+          "features": [
             "giflib"
           ],
           "platform": "!windows"
@@ -67,6 +94,12 @@
         }
       ]
     },
+    "avienc": {
+      "description": "Use Video for Windows for AVI encoding"
+    },
+    "gdiplus": {
+      "description": "Use GDI+ on Windows to load/save images"
+    },
     "giflib": {
       "description": "Enable support for GIF images",
       "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 20049abc2..626c66dbb 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6078,7 +6078,7 @@
     },
     "simage": {
       "baseline": "1.8.1",
-      "port-version": 0
+      "port-version": 1
     },
     "simde": {
       "baseline": "0.7.0",
diff --git a/versions/s-/simage.json b/versions/s-/simage.json
index d20b1cd90..3f603aff7 100644
--- a/versions/s-/simage.json
+++ b/versions/s-/simage.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "f9b941ad6737569ae7c400625b6fc8aac8140683",
+      "version-semver": "1.8.1",
+      "port-version": 1
+    },
+    {
       "git-tree": "429f5758def1d9514aa6f3f2bbcb98d8a3f19cd1",
       "version-semver": "1.8.1",
       "port-version": 0