[Many ports] fix invalid character in feature name (#12306)

10 files changed, 44 insertions, 69 deletions

diff --git a/ports/capstone/CONTROL b/ports/capstone/CONTROL
index 4c94c89a1..60e2a2a53 100644
--- a/ports/capstone/CONTROL
+++ b/ports/capstone/CONTROL
@@ -1,5 +1,6 @@
 Source: capstone
 Version: 4.0.2
+Port-Version: 1
 Homepage: https://github.com/aquynh/capstone
 Description: Multi-architecture disassembly framework
 
@@ -36,8 +37,9 @@ Description: Capstone disassembly support for TMS320C64X
 Feature: x86
 Description: Capstone disassembly support for x86
 
-Feature: x86_reduce
+Feature: x86-reduce
 Description: Capstone disassembly support for x86 without support for less used instructions
+Build-Depends: capstone[x86]
 
 Feature: xcore
 Description: Capstone disassembly support for XCore
diff --git a/ports/capstone/portfile.cmake b/ports/capstone/portfile.cmake
index f0fa68868..3e01523df 100644
--- a/ports/capstone/portfile.cmake
+++ b/ports/capstone/portfile.cmake
@@ -9,35 +9,23 @@ vcpkg_from_github(
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CS_BUILD_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CS_BUILD_SHARED)
 
-
-function(check_feature name var)
-    set(${var} OFF PARENT_SCOPE)
-    if (${name} IN_LIST FEATURES)
-        set(${var} ON PARENT_SCOPE)
-    endif ()
-endfunction ()
-
-
-check_feature("arm"         WITH_ARM_SUPPORT)
-check_feature("arm64"       WITH_ARM64_SUPPORT)
-check_feature("evm"         WITH_EVM_SUPPORT)
-check_feature("m680x"       WITH_M680X_SUPPORT)
-check_feature("m68k"        WITH_M68K_SUPPORT)
-check_feature("mips"        WITH_MIPS_SUPPORT)
-check_feature("osxkernel"   WITH_OSXKERNEL_SUPPORT)
-check_feature("ppc"         WITH_PPC_SUPPORT)
-check_feature("sparc"       WITH_SPARC_SUPPORT)
-check_feature("sysz"        WITH_SYSZ_SUPPORT)
-check_feature("tms320c64x"  WITH_C64X_SUPPORT)
-check_feature("x86"         WITH_X86_SUPPORT)
-check_feature("x86_reduce"  WITH_X86_REDUCE)
-check_feature("xcore"       WITH_XCORE_SUPPORT)
-
-check_feature("diet"  CS_BUILD_DIET)
-
-if (WITH_X86_REDUCE AND NOT WITH_X86_SUPPORT)
-    set(WITH_X86_SUPPORT ON)
-endif ()
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    "arm"         CAPSTONE_ARM_SUPPORT
+    "arm64"       CAPSTONE_ARM64_SUPPORT
+    "evm"         CAPSTONE_EVM_SUPPORT
+    "m680x"       CAPSTONE_M680X_SUPPORT
+    "m68k"        CAPSTONE_M68K_SUPPORT
+    "mips"        CAPSTONE_MIPS_SUPPORT
+    "osxkernel"   CAPSTONE_OSXKERNEL_SUPPORT
+    "ppc"         CAPSTONE_PPC_SUPPORT
+    "sparc"       CAPSTONE_SPARC_SUPPORT
+    "sysz"        CAPSTONE_SYSZ_SUPPORT
+    "tms320c64x"  CAPSTONE_TMS320C64X_SUPPORT
+    "x86"         CAPSTONE_X86_SUPPORT
+    "x86-reduce"  CAPSTONE_X86_REDUCE
+    "xcore"       CAPSTONE_XCORE_SUPPORT
+    "diet"        CAPSTONE_BUILD_DIET
+)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
@@ -45,27 +33,11 @@ vcpkg_configure_cmake(
     OPTIONS
         -DCAPSTONE_BUILD_STATIC=${CS_BUILD_STATIC}
         -DCAPSTONE_BUILD_SHARED=${CS_BUILD_SHARED}
-        -DCAPSTONE_BUILD_DIET=${CS_BUILD_DIET}
         -DCAPSTONE_BUILD_TESTS=OFF
         -DCAPSTONE_BUILD_CSTOOL=OFF
         -DCAPSTONE_BUILD_STATIC_RUNTIME=OFF
-
-        -DCAPSTONE_ARM_SUPPORT=${WITH_ARM_SUPPORT}
-        -DCAPSTONE_ARM64_SUPPORT=${WITH_ARM64_SUPPORT}
-        -DCAPSTONE_EVM_SUPPORT=${WITH_EVM_SUPPORT}
-        -DCAPSTONE_M680X_SUPPORT=${WITH_M680X_SUPPORT}
-        -DCAPSTONE_M68K_SUPPORT=${WITH_M68K_SUPPORT}
-        -DCAPSTONE_MIPS_SUPPORT=${WITH_MIPS_SUPPORT}
-        -DCAPSTONE_OSXKERNEL_SUPPORT=${WITH_OSXKERNEL_SUPPORT}
-        -DCAPSTONE_PPC_SUPPORT=${WITH_PPC_SUPPORT}
-        -DCAPSTONE_SPARC_SUPPORT=${WITH_SPARC_SUPPORT}
-        -DCAPSTONE_SYSZ_SUPPORT=${WITH_SYSZ_SUPPORT}
-        -DCAPSTONE_TMS320C64X_SUPPORT=${WITH_C64X_SUPPORT}
-        -DCAPSTONE_X86_SUPPORT=${WITH_X86_SUPPORT}
-        -DCAPSTONE_XCORE_SUPPORT=${WITH_XCORE_SUPPORT}
-
-        -DCAPSTONE_X86_REDUCE=${WITH_X86_REDUCE}
         -DCAPSTONE_X86_ONLY=OFF
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_install_cmake()
@@ -80,7 +52,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
 
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.TXT
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/capstone
-    RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/faad2/CONTROL b/ports/faad2/CONTROL
index 3b258ef1b..65b02f103 100644
--- a/ports/faad2/CONTROL
+++ b/ports/faad2/CONTROL
@@ -1,7 +1,8 @@
 Source: faad2
-Version: 2.9.1-1
+Version: 2.9.1
+Port-Version: 2
 Homepage: https://sourceforge.net/projects/faac/
 Description: Freeware Advanced Audio (AAC) Decoder
 
-Feature: build_decoder
+Feature: build-decoder
 Description: Build the embedded decoder executable
diff --git a/ports/faad2/portfile.cmake b/ports/faad2/portfile.cmake
index 2cbec1ba7..9daa8d492 100644
--- a/ports/faad2/portfile.cmake
+++ b/ports/faad2/portfile.cmake
@@ -15,7 +15,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
   FEATURES
-    build_decoder   FAAD_BUILD_BINARIES
+    build-decoder   FAAD_BUILD_BINARIES
 )
 
 vcpkg_configure_cmake(
@@ -26,7 +26,8 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/faad2 RENAME copyright)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/libwebp/CONTROL b/ports/libwebp/CONTROL
index b96114f05..a96f6c40c 100644
--- a/ports/libwebp/CONTROL
+++ b/ports/libwebp/CONTROL
@@ -1,5 +1,6 @@
 Source: libwebp
 Version: 1.1.0
+Port-Version: 1
 Homepage: https://github.com/webmproject/libwebp
 Description: WebP codec: library to encode and decode images in WebP format
 Default-Features: simd, nearlossless
@@ -21,7 +22,7 @@ Feature: vwebp
 Description: Build the vwebp viewer tool.
 Build-Depends: opengl, freeglut (!osx)
 
-Feature: vwebp_sdl
+Feature: vwebp-sdl
 Description: Build the vwebp viewer tool.
 Build-Depends: libwebp[vwebp], sdl1 (windows)
 
@@ -55,4 +56,4 @@ Description: Enable byte swap for 16 bit colorspaces.
 
 Feature: all
 Description: enable all features except for swap16bitcsp
-Build-Depends: libwebp[anim, gif2webp, img2webp, info, mux, nearlossless, simd, cwebp, dwebp], libwebp[vwebp_sdl] (!osx), libwebp[extras] (!osx)
+Build-Depends: libwebp[anim, gif2webp, img2webp, info, mux, nearlossless, simd, cwebp, dwebp], libwebp[vwebp-sdl] (!osx), libwebp[extras] (!osx)
diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake
index 81040ad05..9bea70aec 100644
--- a/ports/libwebp/portfile.cmake
+++ b/ports/libwebp/portfile.cmake
@@ -16,11 +16,12 @@ vcpkg_from_github(
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-   FEATURES # <- Keyword FEATURES is required because INVERTED_FEATURES are being used
+   FEATURES
      anim         WEBP_BUILD_ANIM_UTILS
      gif2webp     WEBP_BUILD_GIF2WEBP
      img2webp     WEBP_BUILD_IMG2WEBP
      vwebp        WEBP_BUILD_VWEBP
+     vwebp-sdl    WEBP_HAVE_SDL
      info         WEBP_BUILD_WEBPINFO
      mux          WEBP_BUILD_WEBPMUX
      extras       WEBP_BUILD_EXTRAS
@@ -85,4 +86,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
   file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libwebp" RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/tesseract/CONTROL b/ports/tesseract/CONTROL
index b5eea7183..7f646fdaf 100644
--- a/ports/tesseract/CONTROL
+++ b/ports/tesseract/CONTROL
@@ -1,12 +1,13 @@
 Source: tesseract
 Version: 4.1.1
+Port-Version: 1
 Homepage: https://github.com/tesseract-ocr/tesseract
 Description: An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.
 Build-Depends: leptonica
 
-Feature: training_tools
+Feature: training-tools
 Description: build training tools
 Build-Depends: icu, pango, cairo, fontconfig
 
-Feature: cpu_independed
+Feature: cpu-independed
 Description: build on any cpu extension commands support
diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake
index d0a202a7d..925b19afb 100644
--- a/ports/tesseract/portfile.cmake
+++ b/ports/tesseract/portfile.cmake
@@ -19,12 +19,12 @@ if(VCPKG_LIBRARY_LINKAGE EQUAL "static")
 endif()
 
 # Handle CONTROL
-if("training_tools" IN_LIST FEATURES)
+if("training-tools" IN_LIST FEATURES)
     list(APPEND OPTIONS_LIST -DBUILD_TRAINING_TOOLS=ON)
 else()
     list(APPEND OPTIONS_LIST -DBUILD_TRAINING_TOOLS=OFF)
 endif()
-if("cpu_independed" IN_LIST FEATURES)
+if("cpu-independed" IN_LIST FEATURES)
     list(APPEND OPTIONS_LIST -DTARGET_ARCHITECTURE=none)
 else()
     list(APPEND OPTIONS_LIST -DTARGET_ARCHITECTURE=auto)
diff --git a/ports/vxl/CONTROL b/ports/vxl/CONTROL
index cc7e731a2..d95016ac0 100644
--- a/ports/vxl/CONTROL
+++ b/ports/vxl/CONTROL
@@ -1,8 +1,9 @@
 Source: vxl
 Version: 2.0.2
+Port-Version: 1
 Build-Depends: bzip2, expat, libgeotiff, libjpeg-turbo, libpng, shapelib, tiff, zlib
 # Build-Depends: bzip2, dcmtk, expat, libgeotiff, libjpeg-turbo, openjpeg, libpng, shapelib, tiff, zlib
 Description: A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding.
 
-Feature: core_imaging
-Description: core_imaging support for vxl
+Feature: core-imaging
+Description: core-imaging support for vxl
diff --git a/ports/vxl/portfile.cmake b/ports/vxl/portfile.cmake
index 55581183d..232cfa3a5 100644
--- a/ports/vxl/portfile.cmake
+++ b/ports/vxl/portfile.cmake
@@ -1,7 +1,5 @@
-include(vcpkg_common_functions)
-
 set(BUILD_CORE_IMAGING OFF)
-if("core_imaging" IN_LIST FEATURES)
+if("core-imaging" IN_LIST FEATURES)
   set(BUILD_CORE_IMAGING ON)
   if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openjpeg.h")
     set(BUILD_CORE_IMAGING OFF)