[mozjpeg] Update to latest commit (#20401)

* [mozjpeg] Update to latest commit

* update version

* Convert patch format

* update version

* Add double quotes

* update version

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

5 files changed, 32 insertions, 41 deletions

diff --git a/ports/mozjpeg/fix-install-error.patch b/ports/mozjpeg/fix-install-error.patch
index 0d0a28365..da8ecce9f 100644
--- a/ports/mozjpeg/fix-install-error.patch
+++ b/ports/mozjpeg/fix-install-error.patch
@@ -1,25 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ae07280..54dc4f3 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1369,13 +1369,13 @@
- ###############################################################################
- 
- set(EXE ${CMAKE_EXECUTABLE_SUFFIX})
- 
- if(WITH_TURBOJPEG)
-   if(ENABLE_SHARED)
--    install(TARGETS turbojpeg tjbench
-+    install(TARGETS turbojpeg #tjbench
-       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-     if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND
-       CMAKE_C_LINKER_SUPPORTS_PDB)
-       install(FILES "$<TARGET_PDB_FILE:turbojpeg>"
-@@ -1413,13 +1413,13 @@
-       DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME djpeg${EXE})
-     install(PROGRAMS ${DIR}/jpegtran-static${EXE}
-       DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME jpegtran${EXE})
+@@ -1487,7 +1487,7 @@ if(ENABLE_STATIC)
    endif()
  endif()
  
@@ -28,6 +11,3 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
  
  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg
    ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt
-   ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c
-   ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg.txt
-   ${CMAKE_CURRENT_SOURCE_DIR}/structure.txt
diff --git a/ports/mozjpeg/portfile.cmake b/ports/mozjpeg/portfile.cmake
index b5095a9ad..2cd6bbdf7 100644
--- a/ports/mozjpeg/portfile.cmake
+++ b/ports/mozjpeg/portfile.cmake
@@ -5,8 +5,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mozilla/mozjpeg
-    REF 6d95c51adf0c314017f541b6cb07e13cc1bce754
-    SHA512 a21c8b3a561b387933a27befaa1d05a8c63b0e203d72d73071a4c9b57c6b7d57b44836f211c4dcb80eee4b01876f0a0fb4c91a60c3ae867e906e5e4e27165627
+    REF 512a7c3a51071981e4b314c9bc029f1daa3fb72b    #2021-09-27
+    SHA512 bdada9757bec5e02533d976a988210e59e37a07aa9dd321d29f18161d4143a1398c004b210d05748aa61a9005411b46e9e0bfa37af2b45570e45020fbc28f551
     HEAD_REF master
     PATCHES
         fix-install-error.patch
@@ -20,16 +20,15 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC)
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" WITH_CRT_DLL)
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DENABLE_SHARED=${ENABLE_SHARED}
         -DENABLE_STATIC=${ENABLE_STATIC}
         -DWITH_CRT_DLL=${WITH_CRT_DLL}
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 # Rename libraries for static builds
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
@@ -42,20 +41,20 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
         file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib")
     endif()
 endif()
-
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mozjpeg)
 # Remove extra debug files
-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")
 
-vcpkg_copy_tools(TOOL_NAMES cjpeg djpeg jpegtran AUTO_CLEAN)
+vcpkg_copy_tools(TOOL_NAMES cjpeg djpeg jpegtran tjbench AUTO_CLEAN)
 vcpkg_fixup_pkgconfig()
+vcpkg_copy_pdbs()
 
 # Remove empty folders after static build
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-vcpkg_copy_pdbs()
\ No newline at end of file
+file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/mozjpeg/vcpkg.json b/ports/mozjpeg/vcpkg.json
index 605abca1c..cf7e96cf2 100644
--- a/ports/mozjpeg/vcpkg.json
+++ b/ports/mozjpeg/vcpkg.json
@@ -1,10 +1,17 @@
 {
   "name": "mozjpeg",
-  "version-string": "2020-06-02",
-  "port-version": 3,
+  "version-date": "2021-09-27",
   "description": "MozJPEG reduces file sizes of JPEG images while retaining quality and compatibility with the vast majority of the world's deployed decoders. It's compatible with libjpeg API and ABI, and can be used as a drop-in replacement for libjpeg.",
   "homepage": "https://github.com/mozilla/mozjpeg",
   "dependencies": [
-    "libpng"
+    "libpng",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index a499edc0c..a448eb1ba 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4361,8 +4361,8 @@
       "port-version": 0
     },
     "mozjpeg": {
-      "baseline": "2020-06-02",
-      "port-version": 3
+      "baseline": "2021-09-27",
+      "port-version": 0
     },
     "mp-units": {
       "baseline": "0.6.0",
diff --git a/versions/m-/mozjpeg.json b/versions/m-/mozjpeg.json
index 25217d569..cd92e4264 100644
--- a/versions/m-/mozjpeg.json
+++ b/versions/m-/mozjpeg.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "7713d74fddfa5b02228fdc489661c9ba15686cb6",
+      "version-date": "2021-09-27",
+      "port-version": 0
+    },
+    {
       "git-tree": "0d92e5b33e3b57bed654510b0562ac82c68019cf",
       "version-string": "2020-06-02",
       "port-version": 3