diff --git a/ports/libheif/gdk-pixbuf.patch b/ports/libheif/gdk-pixbuf.patch index 257b466694..d6b901413d 100644 --- a/ports/libheif/gdk-pixbuf.patch +++ b/ports/libheif/gdk-pixbuf.patch @@ -3,7 +3,8 @@ index eeb2727..20a6b16 100644 --- "a/gdk-pixbuf/CMakeLists.txt" +++ "b/gdk-pixbuf/CMakeLists.txt" @@ -1,12 +1,9 @@ - if(UNIX OR MINGW) +-if(UNIX OR MINGW) ++if(WITH_GDKPIXBUF2 AND (UNIX OR MINGW)) find_package(PkgConfig) - pkg_check_modules(GDKPIXBUF2 gdk-pixbuf-2.0) + pkg_check_modules(GDKPIXBUF2 gdk-pixbuf-2.0 IMPORTED_TARGET) diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index 2110c69547..f372128bf8 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS jpeg WITH_JPEG_DECODER jpeg WITH_JPEG_ENCODER iso23001-17 WITH_UNCOMPRESSED_CODEC + gdk-pixbuf WITH_GDKPIXBUF2 ) vcpkg_cmake_configure( diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json index 7306643764..083b0e84f7 100644 --- a/ports/libheif/vcpkg.json +++ b/ports/libheif/vcpkg.json @@ -1,15 +1,12 @@ { "name": "libheif", "version": "1.19.8", + "port-version": 1, "description": "libheif is an HEIF and AVIF file format decoder and encoder.", "homepage": "http://www.libheif.org/", "license": "LGPL-3.0-only", "supports": "!xbox", "dependencies": [ - { - "name": "gdk-pixbuf", - "platform": "!windows" - }, "libde265", { "name": "vcpkg-cmake", @@ -31,6 +28,13 @@ "aom" ] }, + "gdk-pixbuf": { + "description": "Plugin for gdk-pixbuf", + "supports": "!windows", + "dependencies": [ + "gdk-pixbuf" + ] + }, "hevc": { "description": "HEVC encoding via x265", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index f437e12979..51e89289d1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4770,7 +4770,7 @@ }, "libheif": { "baseline": "1.19.8", - "port-version": 0 + "port-version": 1 }, "libhsplasma": { "baseline": "2024-03-07", diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json index e3b4c26a5d..bd1f5ff94f 100644 --- a/versions/l-/libheif.json +++ b/versions/l-/libheif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3818c7a07a9299759d1de597f0091d9f127b3d95", + "version": "1.19.8", + "port-version": 1 + }, { "git-tree": "12fbe980a14a9a302122f8b5df3916365c413fc7", "version": "1.19.8",