Make libheif an optional dependency for ext_gd

Author: mszabo-wikia

CMake/HHVMExtensionConfig.cmake

@@ -781,15 +781,13 @@ function (HHVM_EXTENSION_INTERNAL_HANDLE_LIBRARY_DEPENDENCY extensionID dependen
       HHVM_EXTENSION_INTERNAL_ADD_DEFINES("-DHAVE_LIBGMP")
     endif()
   elseif (${libraryName} STREQUAL "heif")
-    find_package(Libheif ${requiredVersion} REQUIRED)
-    if (NOT LIBHEIF_INCLUDE_DIR OR NOT LIBHEIF_LIBRARY)
-      HHVM_EXTENSION_INTERNAL_SET_FAILED_DEPENDENCY(${extensionID} ${dependencyName})
-      return()
-    endif()
+    find_package(libheif 1.19.8 CONFIG)
 
-    if (${addPaths})
-      HHVM_EXTENSION_INTERNAL_ADD_INCLUDE_DIRS(${LIBHEIF_INCLUDE_DIR})
-      HHVM_EXTENSION_INTERNAL_ADD_LINK_LIBRARIES(${LIBHEIF_LIBRARY})
+    if (libheif_FOUND AND ${addPaths})
+      get_target_property(DEPENDENCY_TARGET_INCLUDE_DIR heif INTERFACE_INCLUDE_DIRECTORIES)
+      HHVM_EXTENSION_INTERNAL_ADD_INCLUDE_DIRS("${DEPENDENCY_TARGET_INCLUDE_DIR}")
+      HHVM_EXTENSION_INTERNAL_ADD_LINK_LIBRARIES(heif)
+      HHVM_EXTENSION_INTERNAL_ADD_DEFINES("-DHAVE_LIBHEIF")
     endif()
   elseif (${libraryName} STREQUAL "iconv")
     find_package(Libiconv ${requiredVersion})

ci/ubuntu-24.04-noble/debian/control

@@ -36,7 +36,6 @@ Build-Depends:
   libgmp3-dev,
   libgoogle-glog-dev,
   libgoogle-perftools-dev,
-  libheif-dev,
   libiberty-dev,
   libiconv-hook-dev,
   libicu-dev,

hphp/runtime/ext/gd/ext_gd.cpp

@@ -42,7 +42,9 @@
 #include <folly/ScopeGuard.h>
 #include <folly/portability/Stdlib.h>
 #include <folly/portability/Unistd.h>
+#ifdef HAVE_LIBHEIF
 #include <libheif/heif.h>
+#endif
 
 /* Section Filters Declarations */
 /* IMPORTANT NOTE FOR NEW FILTER
@@ -1509,6 +1511,7 @@ static struct gfxinfo *php_handle_webp(const req::ptr<File>& stream) {
   return result;
 }
 
+#ifdef HAVE_LIBHEIF
 static int64_t heif_get_position(void* userdata) {
   auto stream = static_cast<File*>(userdata);
   return stream->tell();
@@ -1633,6 +1636,7 @@ static heif_brand2 php_get_heif(const req::ptr<File>& stream) {
   return heif_read_main_brand(reinterpret_cast<const uint8_t*>(
     fileType.c_str()), 12);
 }
+#endif
 
 /* Convert internal image_type to mime type */
 static const char *php_image_type_to_mime_type(int image_type) {
@@ -1756,13 +1760,16 @@ static int php_getimagetype(const req::ptr<File>& file) {
     return IMAGE_FILETYPE_JP2;
   }
 
+#ifdef HAVE_LIBHEIF
   /* AFTER ALL ABOVE FAILED */
   auto heifBrand = php_get_heif(file);
   if (heifBrand == heif_brand2_heic || heifBrand == heif_brand2_heix) {
     return IMAGE_FILETYPE_HEIC;
   } else if (heifBrand == heif_brand2_avif) {
     return IMAGE_FILETYPE_AVIF;
   }
+#endif
+
   if (php_get_wbmp(file, nullptr, 1)) {
     return IMAGE_FILETYPE_WBMP;
   }
@@ -1930,12 +1937,14 @@ Variant getImageSize(const req::ptr<File>& stream, Array& imageinfo) {
   case IMAGE_FILETYPE_WEBP:
     result = php_handle_webp(stream);
     break;
+#ifdef HAVE_LIBHEIF
   case IMAGE_FILETYPE_AVIF:
     result = php_handle_heif(stream);
     break;
   case IMAGE_FILETYPE_HEIC:
     result = php_handle_heif(stream);
     break;
+#endif
   default:
   case IMAGE_FILETYPE_UNKNOWN:
     break;