Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/platforms/Windows.cmake

@@ -139,8 +139,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(HAVE_STATFS FALSE)
   set(HAVE_STATVFS FALSE)
   set(HAVE_STD_SYSLOG FALSE)
-  set(HAVE_STDDEF_H TRUE)
-  set(HAVE_STDINT_H TRUE)
+  set(HAVE_STDDEF_H TRUE) # Defined by check_type_size().
+  set(HAVE_STDINT_H TRUE) # Defined by check_type_size().
   set(HAVE_STRCASESTR FALSE)
   set(HAVE_STRINGS_H FALSE)
   set(HAVE_STRLCAT FALSE)

cmake/cmake/toolchains/template.cmake

@@ -66,13 +66,11 @@ set(PHP_SAPI_FPM_PROC_MEM_FILE mem)
 
 # Set the exit code for the check whether the external gd library has support
 # for the given format.
-set(HAVE_GD_AVIF_EXITCODE 1)
-set(HAVE_GD_BMP_EXITCODE 1)
-set(HAVE_GD_JPG_EXITCODE 1)
-set(HAVE_GD_PNG_EXITCODE 1)
-set(HAVE_GD_TGA_EXITCODE 1)
-set(HAVE_GD_WEBP_EXITCODE 1)
-set(HAVE_GD_XPM_EXITCODE 1)
+set(PHP_EXT_GD_HAVE_GD_AVIF_EXITCODE 1)
+set(PHP_EXT_GD_HAVE_GD_JPG_EXITCODE 1)
+set(PHP_EXT_GD_HAVE_GD_PNG_EXITCODE 1)
+set(PHP_EXT_GD_HAVE_GD_WEBP_EXITCODE 1)
+set(PHP_EXT_GD_HAVE_GD_XPM_EXITCODE 1)
 
 ################################################################################
 # ext/iconv

cmake/ext/gd/CMakeLists.txt

@@ -286,11 +286,6 @@ if(NOT PHP_EXT_GD_EXTERNAL)
 
   set(HAVE_GD_BUNDLED TRUE)
 
-  # With bundled GD library these are always available.
-  set(HAVE_GD_PNG TRUE)
-  set(HAVE_GD_BMP TRUE)
-  set(HAVE_GD_TGA TRUE)
-
   php_search_libraries(
     floorf
     HEADERS math.h
@@ -332,6 +327,7 @@ if(NOT PHP_EXT_GD_EXTERNAL)
   target_link_libraries(php_ext_gd PRIVATE PNG::PNG)
 
   set(HAVE_LIBPNG TRUE)
+  set(HAVE_GD_PNG TRUE)
 
   if(PHP_EXT_GD_AVIF)
     find_package(libavif 0.8.2)
@@ -474,18 +470,18 @@ else()
             (void)p;
 
             return 0;
-          }" ${result})
-
+          }" PHP_EXT_GD_${result})
       cmake_pop_check_state()
+
+      set(${result} ${PHP_EXT_GD_${result}})
+      return(PROPAGATE ${result})
     endfunction()
 
     php_ext_gd_check_format(Png HAVE_GD_PNG)
     php_ext_gd_check_format(Avif HAVE_GD_AVIF)
     php_ext_gd_check_format(Webp HAVE_GD_WEBP)
     php_ext_gd_check_format(Jpeg HAVE_GD_JPG)
     php_ext_gd_check_format(Xpm HAVE_GD_XPM)
-    php_ext_gd_check_format(Bmp HAVE_GD_BMP)
-    php_ext_gd_check_format(Tga HAVE_GD_TGA)
 
     cmake_push_check_state(RESET)
       set(CMAKE_REQUIRED_LIBRARIES GD::GD)

cmake/ext/gd/cmake/config.h.in

@@ -1,8 +1,9 @@
 /* Define to 1 if gd extension has AVIF support. */
 #cmakedefine HAVE_GD_AVIF 1
 
-/* Define to 1 if gd extension has BMP support. */
-#cmakedefine HAVE_GD_BMP 1
+/* Define to 1 if gd extension has BMP support (always available and built-in
+   as of libgd 2.1.0). */
+#define HAVE_GD_BMP 1
 
 /* Define to 1 if gd extension uses GD library bundled in PHP. */
 #cmakedefine HAVE_GD_BUNDLED 1
@@ -23,8 +24,9 @@
 /* Define to 1 if gd extension has PNG support. */
 #cmakedefine HAVE_GD_PNG 1
 
-/* Define to 1 if gd extension has TGA support. */
-#cmakedefine HAVE_GD_TGA 1
+/* Define to 1 if gd extension has TGA support (always available and built-in
+   as of libgd 2.1.0). */
+#define HAVE_GD_TGA 1
 
 /* Define to 1 if gd extension has WebP support. */
 #cmakedefine HAVE_GD_WEBP 1