From 6bb5aa3b978a97051fce74af29ce2cf436066674 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Tue, 18 Jan 2022 22:07:13 +0100
Subject: [PATCH] [guetzli] fix mac build (#22588)

---
 ports/guetzli/CMakeLists.txt |  2 ++
 ports/guetzli/portfile.cmake | 13 ++++++-------
 ports/guetzli/vcpkg.json     | 10 +++++++---
 scripts/ci.baseline.txt      |  1 -
 versions/baseline.json       |  2 +-
 versions/g-/guetzli.json     |  5 +++++
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/ports/guetzli/CMakeLists.txt b/ports/guetzli/CMakeLists.txt
index d24b2326dc..af5eea6c7c 100644
--- a/ports/guetzli/CMakeLists.txt
+++ b/ports/guetzli/CMakeLists.txt
@@ -17,6 +17,8 @@ list(REMOVE_ITEM guetzli_srcs "guetzli/guetzli.cc")
 
 add_library(guetzli_lib ${guetzli_srcs})
 
+target_compile_features(guetzli_lib PUBLIC cxx_std_11)
+
 add_executable(guetzli guetzli/guetzli.cc)
 
 target_link_libraries(guetzli_lib ${butteraugli_library} ${PNG_LIBRARIES})
diff --git a/ports/guetzli/portfile.cmake b/ports/guetzli/portfile.cmake
index d226024184..8287307013 100644
--- a/ports/guetzli/portfile.cmake
+++ b/ports/guetzli/portfile.cmake
@@ -9,17 +9,16 @@ vcpkg_from_github(
     PATCHES butteraugli.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/guetzli)
+vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/guetzli")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/guetzli RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/guetzli" RENAME copyright)
diff --git a/ports/guetzli/vcpkg.json b/ports/guetzli/vcpkg.json
index 6322896776..05da33a62d 100644
--- a/ports/guetzli/vcpkg.json
+++ b/ports/guetzli/vcpkg.json
@@ -1,11 +1,15 @@
 {
   "name": "guetzli",
-  "version-string": "2020-09-14",
-  "port-version": 1,
+  "version-date": "2020-09-14",
+  "port-version": 2,
   "description": "Perceptual JPEG encoder",
   "homepage": "https://github.com/google/guetzli",
   "dependencies": [
     "butteraugli",
-    "libpng"
+    "libpng",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
   ]
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index a3e7db906f..7c7f523292 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -408,7 +408,6 @@ gstreamer:x64-osx=fail
 gtk:x64-windows-static=fail
 gtk:x64-windows-static-md=fail
 gts:x64-osx=fail
-guetzli:x64-osx=fail
 halide:x64-windows-static=fail
 hdf5:arm64-windows=fail
 hdf5:arm-uwp=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index 6f56f7eaad..06b8f87fbb 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2626,7 +2626,7 @@
     },
     "guetzli": {
       "baseline": "2020-09-14",
-      "port-version": 1
+      "port-version": 2
     },
     "guilite": {
       "baseline": "2021-07-31",
diff --git a/versions/g-/guetzli.json b/versions/g-/guetzli.json
index dd15734c63..49eb0255c1 100644
--- a/versions/g-/guetzli.json
+++ b/versions/g-/guetzli.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a7da0a5fa0b5bdb568edcbde81b314c3f7089cb0",
+      "version-date": "2020-09-14",
+      "port-version": 2
+    },
     {
       "git-tree": "2adfb6dcd5eab92b258f45aaf4a494bed18eb687",
       "version-string": "2020-09-14",