[libgd] update to 2.3.3 (#25748)

* [libgd] update to 2.3.3 * x-add-version * add license * x-add-version Co-authored-by: LilyWangLL <v-lilywang@microsoft.com>
2025-06-07 17:02:48 +08:00 · 2022-07-15 12:10:56 -07:00 · 2022-07-15 12:10:56 -07:00 · 62763f276b
commit 62763f276b
parent 1782b7edf2
8 changed files with 39 additions and 100 deletions
--- a/ports/libgd/0001-fix-cmake.patch
+++ b/ports/libgd/0001-fix-cmake.patch
@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 57cd95d..50d5b9a 100644
+index 6b3e5b3..cf80322 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -280,8 +280,10 @@ else (USE_EXT_GD)
+@@ -298,8 +298,10 @@ else (USE_EXT_GD)
 	add_subdirectory(src)
 endif (USE_EXT_GD)
 
@ -12,10 +12,10 @@ index 57cd95d..50d5b9a 100644
 +    add_subdirectory(tests)
 +    add_subdirectory(examples)
 +endif()
+ add_subdirectory(docs)
 
 add_custom_target(distclean ${GD_SOURCE_DIR}/cmake/distclean.sh)
- 
-@@ -298,7 +300,7 @@ else(WIN32)
+@@ -317,7 +319,7 @@ else(WIN32)
 	set(CPACK_GENERATOR TGZ)
 endif(WIN32)
 
@ -24,7 +24,7 @@ index 57cd95d..50d5b9a 100644
 INSTALL(FILES docs/INSTALL DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR})
 INSTALL(FILES docs/README.JPN DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR})
 INSTALL(FILES docs/README.CMAKE DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR})
-@@ -320,7 +322,7 @@ INSTALL(FILES examples/test_crop_threshold.png DESTINATION share/doc/gd-${GDLIB_
+@@ -339,7 +341,7 @@ INSTALL(FILES examples/test_crop_threshold.png DESTINATION share/doc/gd-${GDLIB_
 INSTALL(FILES examples/tgaread.c DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR})
 INSTALL(FILES examples/tiffread.c DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR})
 INSTALL(FILES examples/windows.c DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR})
@ -34,34 +34,36 @@ index 57cd95d..50d5b9a 100644
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 509c422..97a2976 100644
+index 3839bc7..f7dabf7 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -96,7 +96,6 @@ if (BUILD_STATIC_LIBS)
+@@ -76,7 +76,7 @@ if (BUILD_STATIC_LIBS)
 	if (UNIX)
 		set_target_properties(${GD_LIB_STATIC} PROPERTIES OUTPUT_NAME ${GD_LIB})
 	endif()
 -endif()
+
 
 if (NOT "${GD_PROGRAMS_LIB_SRC_FILES}" STREQUAL "")
 	add_library(gd_programs_lib STATIC ${GD_PROGRAMS_LIB_SRC_FILES})
-@@ -117,6 +116,7 @@ if (MINGW OR MSYS)
- 		set_target_properties(${GD_LIB_STATIC} PROPERTIES OUTPUT_NAME ${GD_LIB})
+@@ -90,6 +90,7 @@ if (WIN32 AND NOT MINGW AND NOT MSYS)
   endif()
- endif (MINGW OR MSYS)
+ 
+ ENDIF(WIN32 AND NOT MINGW AND NOT MSYS)
 +endif()
 
- INCLUDE_DIRECTORIES(BEFORE "${PROJECT_BINARY_DIR}" "${CMAKE_BINARY_DIR}" "${GD_SOURCE_DIR}/src")
- 
-@@ -148,6 +148,7 @@ SET(LIBS_PRIVATES
+ if (MINGW OR MSYS)
+ 	ADD_DEFINITIONS("-mms-bitfields")
+@@ -127,7 +128,7 @@ SET(LIBS_PRIVATES
+ 	${LIQ_LIBRARIES}
 	${WEBP_LIBRARIES}
 )
- 
+-
 +if(BUILD_PROGRAMS)
 set(GD_PROGRAMS gdcmpgif)
 
 if (PNG_FOUND)
-@@ -177,6 +178,9 @@ foreach(program ${GD_PROGRAMS})
+@@ -168,6 +169,9 @@ foreach(program ${GD_PROGRAMS})
 	endif()
 endforeach(program)
 
@ -71,12 +73,12 @@ index 509c422..97a2976 100644
 set(GD_INSTALL_TARGETS ${GD_PROGRAMS})
 if (BUILD_SHARED_LIBS)
 	set(GD_INSTALL_TARGETS ${GD_INSTALL_TARGETS} ${GD_LIB})
-@@ -189,7 +193,7 @@ install(TARGETS ${GD_INSTALL_TARGETS}
+@@ -180,7 +184,7 @@ install(TARGETS ${GD_INSTALL_TARGETS}
         RUNTIME DESTINATION bin
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 -install(PROGRAMS bdftogd DESTINATION bin)
 +
 install(FILES
- 	entities.h
 	gd.h
+ 	gd_color_map.h
--- a/ports/libgd/fix_msvc_build.patch
+++ b/ports/libgd/fix_msvc_build.patch
@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 17ddf6b..7fe1e6b 100644
+index 6b3e5b3..966ddb3 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -118,7 +118,7 @@ else (USE_EXT_GD)
+@@ -134,7 +134,7 @@ else (USE_EXT_GD)
 	endif (ENABLE_ICONV)
 
 	IF (ENABLE_WEBP)
@ -12,10 +12,10 @@ index 17ddf6b..7fe1e6b 100644
 
 	IF (ENABLE_HEIF)
 diff --git a/src/config.h.cmake b/src/config.h.cmake
-index 2b46a17..af98d23 100644
+index 0542942..e9cfde1 100644
 --- a/src/config.h.cmake
 +++ b/src/config.h.cmake
-@@ -139,3 +139,8 @@
+@@ -142,3 +142,8 @@
 
 /* Version number of package */
 #cmakedefine VERSION
@ -25,37 +25,3 @@ index 2b46a17..af98d23 100644
 +    #define SSIZE_MAX MAXSSIZE_T
 +#endif
 \ No newline at end of file
-diff --git a/src/gd_intern.h b/src/gd_intern.h
-index f8f3b5d..380f4db 100644
--- a/src/gd_intern.h
-+++ b/src/gd_intern.h
-@@ -29,6 +29,14 @@
- # endif
- #endif
- 
-+#ifdef _MSC_VER
-+#define  ssize_t SSIZE_T
-+#define MAXSIZE_T ((SIZE_T)~ ((SIZE_T)0))
-+#define MAXSSIZE_T ((SSIZE_T) (MAXSIZE_T >> 1))
-+#define MINSSIZE_T ((SSIZE_T)~MAXSSIZE_T)
-+#define SSIZE_MAX MAXSSIZE_T
-+#endif
-+
- #include "gd.h"
- 
- #define MIN(a,b) ((a)<(b)?(a):(b))
-diff --git a/src/getopt.c b/src/getopt.c
-index 8651b87..00bccde 100644
--- a/src/getopt.c
-+++ b/src/getopt.c
-@@ -33,7 +33,10 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+
-+#ifndef _WIN32
- #include <unistd.h>
-+#endif
- 
- int	opterr = 1,		/* if error message should be printed */
- 	optind = 1,		/* index into parent argv vector */
--- a/ports/libgd/intrin.patch
+++ b/ports/libgd/intrin.patch
@ -1,13 +0,0 @@
-diff --git a/src/gd_interpolation.c b/src/gd_interpolation.c
-index ce27220..8895072 100644
--- a/src/gd_interpolation.c
-+++ b/src/gd_interpolation.c
-@@ -75,7 +75,7 @@ TODO:
- 
- #ifdef _MSC_VER
- # pragma optimize("t", on)
-# include <emmintrin.h>
-+# include <intrin.h>
- #endif
- 
- static gdImagePtr gdImageScaleBilinear(gdImagePtr im,
--- a/ports/libgd/no-write-source-dir.patch
+++ b/ports/libgd/no-write-source-dir.patch
@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 50d5b9a..17ddf6b 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -248,7 +248,8 @@ else (USE_EXT_GD)
- 	CHECK_INCLUDE_FILE("stdint.h"	HAVE_STDINT_H)
- 	CHECK_INCLUDE_FILE("inttypes.h"	HAVE_INTTYPES_H)
- 
-	CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${GD_SOURCE_DIR}/src/config.h ESCAPE_QUOTES)
-+	CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config.h ESCAPE_QUOTES)
-+	include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
- 
- 	option(BUILD_SHARED_LIBS "Build shared libs" ON)
- 	option(BUILD_STATIC_LIBS "Build static libs" OFF)
--- a/ports/libgd/portfile.cmake
+++ b/ports/libgd/portfile.cmake
@ -1,13 +1,11 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO libgd/libgd
-    REF 2e40f55bfb460fc9d8cbcd290a0c9eb908d5af7e # gd-2.3.2
-    SHA512 c3f2db40f774b44e3fd3fbc743efe70916a71ecd948bf8cb4aeb8a9b9fefd9f17e02d82a9481bac6fcc3624f057b5a308925b4196fb612b65bb7304747d33ffa
+    REF b5319a41286107b53daa0e08e402aa1819764bdc # gd-2.3.3
+    SHA512 b4c6ca1d9575048de35a38b0db69e7380e160293133c1f72ae570f83ce614d4f2fd2615d217f7a0023e2265652c1089561b906beabca56c15e6ec0250e4394b2
    HEAD_REF master
    PATCHES
        0001-fix-cmake.patch
-        no-write-source-dir.patch
-        intrin.patch
        fix_msvc_build.patch
 )

@ -30,20 +28,15 @@ vcpkg_check_features(
        fontconfig   ENABLE_FONTCONFIG
 )

-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-  set(LIBGD_SHARED_LIBS ON)
-  set(LIBGD_STATIC_LIBS OFF)
-else()
-  set(LIBGD_SHARED_LIBS OFF)
-  set(LIBGD_STATIC_LIBS ON)
-endif()
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)

 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
        ${FEATURE_OPTIONS}
-        -DLIBGD_SHARED_LIBS=${LIBGD_SHARED_LIBS}
-        -DBUILD_STATIC_LIBS=${LIBGD_STATIC_LIBS}
+        -DLIBGD_SHARED_LIBS=${BUILD_SHARED}
+        -DBUILD_STATIC_LIBS=${BUILD_STATIC}
        -DBUILD_TEST=OFF
 )

--- a/ports/libgd/vcpkg.json
+++ b/ports/libgd/vcpkg.json
@ -1,9 +1,9 @@
 {
  "name": "libgd",
-  "version-semver": "2.3.2",
-  "port-version": 1,
+  "version-semver": "2.3.3",
  "description": "Open source code library for the dynamic creation of images by programmers.",
  "homepage": "https://github.com/libgd/libgd",
+  "license": "GD",
  "dependencies": [
    {
      "name": "vcpkg-cmake",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -3633,8 +3633,8 @@
      "port-version": 0
    },
    "libgd": {
-      "baseline": "2.3.2",
-      "port-version": 1
+      "baseline": "2.3.3",
+      "port-version": 0
    },
    "libgeotiff": {
      "baseline": "1.7.1",
--- a/versions/l-/libgd.json
+++ b/versions/l-/libgd.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "2de4ed776a149cb13e64876f1f8d7e241e3291db",
+      "version-semver": "2.3.3",
+      "port-version": 0
+    },
    {
      "git-tree": "998c59c287a0d8a172944f46fbfce71c8967394f",
      "version-semver": "2.3.2",