[libheif] Fix error when libgdk-pixbuf2.0-dev installed in linux (#30999

) * [libheif] Fix error when libgdk-pixbuf2.0-dev installed in linux * Use -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON instead of patch
microsoft · Apr 26, 2023 · 5824411 · 5824411
1 parent 326968a
commit 5824411
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO  strukturag/libheif 
-    REF 06f6acfe735379b9c3bcf865285f6dba80611e90 #v1.15.1
-    SHA512 46666ff26c45ed51fdf454fd0be440ac78d6d17571dcf49dd202299248ee28078b1a500b3768b9a391a32e005f021f626e4d0956f9fab6731d17503020c31031
+    REF "v${VERSION}"
+    SHA512 966a95dacc12722d2dd37d449125c3df08f9e9be76ec2dc6762866bf285442c33836046df884b50cc14c799dfdcc1d5c9b16e4f9f36a2dbaf422df089756a234
     HEAD_REF master
     PATCHES
         gdk-pixbuf.patch
@@ -13,6 +13,7 @@ vcpkg_cmake_configure(
     OPTIONS
         -DWITH_EXAMPLES=OFF
         -DWITH_DAV1D=OFF
+        -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
@@ -38,4 +39,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/libheif" "${CURRENT_PACKAGES_DI
 
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif_version.h" "#define LIBHEIF_PLUGIN_DIRECTORY \"${CURRENT_PACKAGES_DIR}/lib/libheif\"" "")
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libheif",
   "version": "1.15.1",
+  "port-version": 1,
   "description": "Open h.265 video codec implementation.",
   "homepage": "http://www.libheif.org/",
   "license": "LGPL-3.0-only",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4058,7 +4058,7 @@
     },
     "libheif": {
       "baseline": "1.15.1",
-      "port-version": 0
+      "port-version": 1
     },
     "libhsplasma": {
       "baseline": "2022-05-19",

diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e2b6e5599374567a1f1f61821adc8064fcfaaa0f",
+      "version": "1.15.1",
+      "port-version": 1
+    },
     {
       "git-tree": "b1cec44f5cafb35417b528d35cad601c3b1c6952",
       "version": "1.15.1",