From 31ba06e8bafc1f889a094f338a0c2e98ccf110c0 Mon Sep 17 00:00:00 2001
From: Dirk Farin <dirk.farin@gmail.com>
Date: Wed, 5 Feb 2025 05:57:25 +0100
Subject: [PATCH] [libheif] add features for decoding AVIF, JPEG-2000, JPEG,
 ISO23001-17 (#43599)

---
 ports/libheif/portfile.cmake | 10 +++++++++-
 ports/libheif/vcpkg.json     | 27 ++++++++++++++++++++++++++-
 versions/baseline.json       |  2 +-
 versions/l-/libheif.json     |  5 +++++
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake
index 70a83e429542d8..29b88321820c1f 100644
--- a/ports/libheif/portfile.cmake
+++ b/ports/libheif/portfile.cmake
@@ -11,7 +11,14 @@ vcpkg_from_github(
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        hevc    WITH_X265
+        hevc        WITH_X265
+        aom         WITH_AOM_DECODER
+        aom         WITH_AOM_ENCODER
+        openjpeg    WITH_OpenJPEG_DECODER
+        openjpeg    WITH_OpenJPEG_ENCODER
+        jpeg        WITH_JPEG_DECODER
+        jpeg        WITH_JPEG_ENCODER
+        iso23001-17 WITH_UNCOMPRESSED_CODEC
 )
 
 vcpkg_cmake_configure(
@@ -20,6 +27,7 @@ vcpkg_cmake_configure(
         -DWITH_EXAMPLES=OFF
         -DWITH_DAV1D=OFF
         -DBUILD_TESTING=OFF
+        -DCMAKE_COMPILE_WARNING_AS_ERROR=OFF
         ${FEATURE_OPTIONS}
 )
 vcpkg_cmake_install()
diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json
index 5380d55837df12..165371c4ba9aee 100644
--- a/ports/libheif/vcpkg.json
+++ b/ports/libheif/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libheif",
   "version": "1.19.5",
-  "port-version": 2,
+  "port-version": 3,
   "description": "libheif is an HEIF and AVIF file format decoder and encoder.",
   "homepage": "http://www.libheif.org/",
   "license": "LGPL-3.0-only",
@@ -25,12 +25,37 @@
     "hevc"
   ],
   "features": {
+    "aom": {
+      "description": "AVIF decoding and encoding via aom",
+      "license": "BSD-2-Clause",
+      "dependencies": [
+        "aom"
+      ]
+    },
     "hevc": {
       "description": "HEVC encoding via x265",
       "license": "GPL-2.0-or-later",
       "dependencies": [
         "x265"
       ]
+    },
+    "iso23001-17": {
+      "description": "Support for ISO23001-17 (uncompressed) codec",
+      "license": "LGPL-3.0-only"
+    },
+    "jpeg": {
+      "description": "JPEG decoding and encoding via libjpeg-turbo",
+      "license": "BSD-3-Clause",
+      "dependencies": [
+        "libjpeg-turbo"
+      ]
+    },
+    "openjpeg": {
+      "description": "JPEG-2000 decoding and encoding via OpenJPEG",
+      "license": "BSD-2-Clause",
+      "dependencies": [
+        "openjpeg"
+      ]
     }
   }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 3023f5dc9df9f4..2519052b4ab8eb 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4642,7 +4642,7 @@
     },
     "libheif": {
       "baseline": "1.19.5",
-      "port-version": 2
+      "port-version": 3
     },
     "libhsplasma": {
       "baseline": "2024-03-07",
diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json
index 847deb29f869ea..e598fdec0495ca 100644
--- a/versions/l-/libheif.json
+++ b/versions/l-/libheif.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "750c6c2ee08befa80660b188b1a5862cfb5192d0",
+      "version": "1.19.5",
+      "port-version": 3
+    },
     {
       "git-tree": "ecd6b2d082b2b4c294587aaabb0c53b7e1d87f5c",
       "version": "1.19.5",