[libjpeg-turbo] Update wrapper to correctly find debug/release variant (

#19319)

* Format manifest

* Fix cmake wrapper

* Drop windows debug lib renaming

* Fix build warnings

* x-add-version

* Consolidate azure-kinect-sensor-sdk patches

* Fix jpegturbo dependency

* x-add-version

* Fix wrapper message

* x-add-version

ports/azure-kinect-sensor-sdk/portfile.cmake

@@ -8,9 +8,7 @@ vcpkg_from_github(
     PATCHES
         fix-builds.patch
         fix-dependency-imgui.patch
-        add-MATROSKA_VERSION-define.patch
         fix-linux.patch
-        fix-uvc.patch
         fix-calibration-c.patch
 )
 

ports/azure-kinect-sensor-sdk/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "azure-kinect-sensor-sdk",
   "version": "1.4.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.",
   "homepage": "https://github.com/microsoft/Azure-Kinect-Sensor-SDK",
   "supports": "!osx",

ports/libjpeg-turbo/portfile.cmake

@@ -33,8 +33,9 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC)
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" WITH_CRT_DLL)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    jpeg7 WITH_JPEG7
-    jpeg8 WITH_JPEG8
+    FEATURES
+        jpeg7 WITH_JPEG7
+        jpeg8 WITH_JPEG8
 )
 
 vcpkg_configure_cmake(
@@ -48,7 +49,10 @@ vcpkg_configure_cmake(
         -DWITH_CRT_DLL=${WITH_CRT_DLL}
         ${FEATURE_OPTIONS}
         ${LIBJPEGTURBO_SIMD}
-    OPTIONS_DEBUG -DINSTALL_HEADERS=OFF
+    OPTIONS_DEBUG
+        -DINSTALL_HEADERS=OFF
+    MAYBE_UNUSED_VARIABLES
+        WITH_CRT_DLL
 )
 
 vcpkg_install_cmake()
@@ -60,23 +64,13 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
         file(RENAME "${CURRENT_PACKAGES_DIR}/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/turbojpeg.lib")
     endif()
     if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib")
 
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
     endif()
-else(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib")
-    endif()
 endif()
 
-set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libjpeg.pc")
-if(EXISTS "${_file}" AND VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_replace_string("${_file}" "-ljpeg" "-ljpegd")
-endif() 
-
 vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake

@@ -1,3 +1,14 @@
+find_path(JPEG_INCLUDE_DIR NAMES jpeglib.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH)
+find_library(JPEG_LIBRARY_RELEASE NAMES jpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH)
+find_library(JPEG_LIBRARY_DEBUG   NAMES jpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH)
+if(NOT JPEG_INCLUDE_DIR OR NOT JPEG_LIBRARY_RELEASE OR (NOT JPEG_LIBRARY_DEBUG AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib"))
+    message(FATAL_ERROR "Broken installation of vcpkg port libjpeg-turbo")
+endif()
+if(CMAKE_VERSION VERSION_LESS 3.12)
+    include(SelectLibraryConfigurations)
+    select_library_configurations(JPEG)
+    unset(JPEG_FOUND)
+endif()
 _find_package(${ARGS})
 if(JPEG_FOUND AND NOT TARGET JPEG::JPEG)
     # Backfill JPEG::JPEG to versions of cmake before 3.12

ports/libjpeg-turbo/vcpkg.json

@@ -0,0 +1,15 @@
+{
+  "name": "libjpeg-turbo",
+  "version": "2.0.6",
+  "port-version": 1,
+  "description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.",
+  "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo",
+  "features": {
+    "jpeg7": {
+      "description": "Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward-incompatible with libjpeg v6b!)"
+    },
+    "jpeg8": {
+      "description": "Emulate libjpeg v8 API/ABI (this makes libjpeg-turbo backward-incompatible with libjpeg v6b!)"
+    }
+  }
+}

versions/a-/azure-kinect-sensor-sdk.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "012a033caf02486f3079b0c42036a807f3a7c4d7",
+      "version": "1.4.1",
+      "port-version": 2
+    },
     {
       "git-tree": "dc7fdf585419fadcd96b13a800c4323b098256cd",
       "version": "1.4.1",

versions/baseline.json

@@ -290,7 +290,7 @@
     },
     "azure-kinect-sensor-sdk": {
       "baseline": "1.4.1",
-      "port-version": 1
+      "port-version": 2
     },
     "azure-macro-utils-c": {
       "baseline": "2020-06-17",
@@ -3362,7 +3362,7 @@
     },
     "libjpeg-turbo": {
       "baseline": "2.0.6",
-      "port-version": 0
+      "port-version": 1
     },
     "libjuice": {
       "baseline": "0.8.4",

versions/l-/libjpeg-turbo.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "88d4315ae4daa0619554d0465564beee0a688d71",
+      "version": "2.0.6",
+      "port-version": 1
+    },
     {
       "git-tree": "42aed1a37d04ecdc437a4f52c6dd71740339f478",
       "version-string": "2.0.6",