[vcpkg baseline][libheif] fix CI errors if gdk-pixbuf can be found (#17593)

* fix libheif gdk-pixbuf error.

* version stuff

* add trace expand to get more info what happens in ci

* use pkg_get_variable instead of execute process

* fix patch

* update version stuff

* remove trace expand

* version again

6 files changed, 47 insertions, 6 deletions

diff --git a/ports/libheif/CONTROL b/ports/libheif/CONTROL
deleted file mode 100644
index 009d94c72..000000000
--- a/ports/libheif/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: libheif
-Version: 1.10.0
-Homepage: http://www.libheif.org/
-Description: Open h.265 video codec implementation. 
-Build-Depends: x265, libde265
diff --git a/ports/libheif/gdk-pixbuf.patch b/ports/libheif/gdk-pixbuf.patch
new file mode 100644
index 000000000..ad2c1e5ae
--- /dev/null
+++ b/ports/libheif/gdk-pixbuf.patch
@@ -0,0 +1,25 @@
+diff --git a/gdk-pixbuf/CMakeLists.txt b/gdk-pixbuf/CMakeLists.txt
+index 85ad59708..d6aa4a5f9 100644
+--- a/gdk-pixbuf/CMakeLists.txt
++++ b/gdk-pixbuf/CMakeLists.txt
+@@ -1,9 +1,9 @@
+ if(UNIX)
+   find_package(PkgConfig)
+   find_package(Threads)
+-  pkg_check_modules(GDKPIXBUF2 gdk-pixbuf-2.0)
++  pkg_check_modules(GDKPIXBUF2 gdk-pixbuf-2.0 IMPORTED_TARGET)
+ 
+   if(GDKPIXBUF2_FOUND)
+-    execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} gdk-pixbuf-2.0 --variable gdk_pixbuf_moduledir --define-variable=prefix=${CMAKE_INSTALL_PREFIX} OUTPUT_VARIABLE GDKPIXBUF2_MODULE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
++    pkg_get_variable(GDKPIXBUF2_MODULE_DIR gdk-pixbuf-2.0 gdk_pixbuf_moduledir)
+ 
+     add_library(pixbufloader-heif MODULE pixbufloader-heif.c)
+@@ -13,7 +13,7 @@ if(UNIX)
+                                    ${GDKPIXBUF2_INCLUDE_DIRS}
+                                    ${libheif_BINARY_DIR}
+                                    ${libheif_SOURCE_DIR})
+-    target_link_libraries(pixbufloader-heif PUBLIC ${GDKPIXBUF2_LIBRARIES} heif)
++    target_link_libraries(pixbufloader-heif PUBLIC PkgConfig::GDKPIXBUF2 heif)
+ 
+     install(TARGETS pixbufloader-heif LIBRARY DESTINATION ${GDKPIXBUF2_MODULE_DIR})
+   endif()
diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake
index 599eeccc6..ec334dd48 100644
--- a/ports/libheif/portfile.cmake
+++ b/ports/libheif/portfile.cmake
@@ -4,6 +4,7 @@ vcpkg_from_github(
     REF 667eeabb553ce73094eb29faea3f31fb8610fec2 #v1.10.0
     SHA512 937290310ec6dda8840262d4bad5e3628033fa2caa6e9cc4a0df7a372cacf38c9b55cf29d2cb7ea2183641e263298fc2e87167c1b0f04f8697023f123d78aa9d
     HEAD_REF master
+    PATCHES gdk-pixbuf.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json
new file mode 100644
index 000000000..d39317e1c
--- /dev/null
+++ b/ports/libheif/vcpkg.json
@@ -0,0 +1,15 @@
+{
+  "name": "libheif",
+  "version": "1.10.0",
+  "port-version": 1,
+  "description": "Open h.265 video codec implementation.",
+  "homepage": "http://www.libheif.org/",
+  "dependencies": [
+    {
+      "name": "gdk-pixbuf",
+      "platform": "!windows"
+    },
+    "libde265",
+    "x265"
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index df1eef888..18a4341b2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3154,7 +3154,7 @@
     },
     "libheif": {
       "baseline": "1.10.0",
-      "port-version": 0
+      "port-version": 1
     },
     "libhsplasma": {
       "baseline": "2020.08.30",
diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json
index 3994ae678..2d09ea40d 100644
--- a/versions/l-/libheif.json
+++ b/versions/l-/libheif.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "3d3c59db389efc750f06aa0347eb5ed851b2a37d",
+      "version": "1.10.0",
+      "port-version": 1
+    },
+    {
       "git-tree": "c36a0bd1bad8a5b97df02274ec717586ec4729c9",
       "version-string": "1.10.0",
       "port-version": 0