aboutsummaryrefslogtreecommitdiff
path: root/ports/libgd
diff options
context:
space:
mode:
authorPhoebe <20694052+PhoebeHui@users.noreply.github.com>2021-09-15 03:01:57 +0800
committerGitHub <noreply@github.com>2021-09-14 12:01:57 -0700
commita35e2377cfb8a48aa5a5fdfb0d94b9e598c0b782 (patch)
treeb581fdece6a99cafaf1d2df96cbabd24ee4d701e /ports/libgd
parente201002b4f4827d7b7b672f0c5c672a77fc3b77d (diff)
downloadvcpkg-a35e2377cfb8a48aa5a5fdfb0d94b9e598c0b782.tar.gz
vcpkg-a35e2377cfb8a48aa5a5fdfb0d94b9e598c0b782.zip
[cimg/libgd/libfabric] Update to latest release version (#20068)
* [cimg/libgd/libfabric] Update to latest release version * Remove empty line * [libgd] Update the patch * Small changes * [libgd] Update to version semver
Diffstat (limited to 'ports/libgd')
-rw-r--r--ports/libgd/0001-fix-cmake.patch169
-rw-r--r--ports/libgd/fix_msvc_build.patch61
-rw-r--r--ports/libgd/intrin.patch4
-rw-r--r--ports/libgd/no-write-source-dir.patch28
-rw-r--r--ports/libgd/portfile.cmake81
-rw-r--r--ports/libgd/vcpkg.json9
6 files changed, 149 insertions, 203 deletions
diff --git a/ports/libgd/0001-fix-cmake.patch b/ports/libgd/0001-fix-cmake.patch
index a1a316639..4446eb60d 100644
--- a/ports/libgd/0001-fix-cmake.patch
+++ b/ports/libgd/0001-fix-cmake.patch
@@ -1,173 +1,77 @@
-From 26fdb0f43b2d994de9a3d62f85fc650e8c495f18 Mon Sep 17 00:00:00 2001
-From: Mikhail Paulyshka <me@mixaill.tk>
-Date: Sat, 1 Apr 2017 23:16:18 +0300
-Subject: [PATCH] fix cmake
-
----
- CMakeLists.txt | 53 +++++++++++++++++++++++----------------------
- src/CMakeLists.txt | 63 +++++++++++++++++++++++++++++-------------------------
- 2 files changed, 62 insertions(+), 54 deletions(-)
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 42934d0..796fa47 100644
+index 57cd95d..50d5b9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -223,8 +223,10 @@ else (USE_EXT_GD)
+@@ -280,8 +280,10 @@ else (USE_EXT_GD)
add_subdirectory(src)
endif (USE_EXT_GD)
-add_subdirectory(tests)
-add_subdirectory(examples)
+if(BUILD_TEST)
-+ add_subdirectory(tests)
-+ add_subdirectory(examples)
++ add_subdirectory(tests)
++ add_subdirectory(examples)
+endif()
add_custom_target(distclean ${GD_SOURCE_DIR}/cmake/distclean.sh)
-@@ -246,29 +248,30 @@ IF (ENABLE_LIQ AND LIQ_BUILD)
- ADD_DEPENDENCIES(${GD_LIB_STATIC} libimagequant)
- ENDIF(ENABLE_LIQ AND LIQ_BUILD)
+@@ -298,7 +300,7 @@ else(WIN32)
+ set(CPACK_GENERATOR TGZ)
+ endif(WIN32)
-
--INSTALL(FILES docs/INSTALL DESTINATION share/docs)
--INSTALL(FILES docs/README.JPN DESTINATION share/docs)
--INSTALL(FILES docs/README.CMAKE DESTINATION share/docs)
--INSTALL(FILES docs/README.TESTING DESTINATION share/docs)
--INSTALL(FILES docs/README.TXT DESTINATION share/docs)
++if(0)
+ 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_
+ 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})
-
--
--INSTALL(FILES examples/arc.c DESTINATION share/docs)
--INSTALL(FILES examples/copyrotated.c DESTINATION share/docs)
--INSTALL(FILES examples/crop.c DESTINATION share/docs)
--INSTALL(FILES examples/flip.c DESTINATION share/docs)
--INSTALL(FILES examples/gif.c DESTINATION share/docs)
--INSTALL(FILES examples/nnquant.c DESTINATION share/docs)
--INSTALL(FILES examples/noIcon.pic DESTINATION share/docs)
--INSTALL(FILES examples/noIcon.sgi DESTINATION share/docs)
--INSTALL(FILES examples/noIcon.tga DESTINATION share/docs)
--INSTALL(FILES examples/noIconAlpha.tga DESTINATION share/docs)
--INSTALL(FILES examples/test_crop_threshold.png DESTINATION share/docs)
--INSTALL(FILES examples/tgaread.c DESTINATION share/docs)
--INSTALL(FILES examples/tiffread.c DESTINATION share/docs)
--INSTALL(FILES examples/windows.c DESTINATION share/docs)
--
-+if(BUILD_DOCS)
-+ INSTALL(FILES docs/INSTALL DESTINATION share/docs)
-+ INSTALL(FILES docs/README.JPN DESTINATION share/docs)
-+ INSTALL(FILES docs/README.CMAKE DESTINATION share/docs)
-+ INSTALL(FILES docs/README.TESTING DESTINATION share/docs)
-+ INSTALL(FILES docs/README.TXT DESTINATION share/docs)
-+endif()
-+
-+if(BUILD_EXAMPLES)
-+ INSTALL(FILES examples/arc.c DESTINATION share/docs)
-+ INSTALL(FILES examples/copyrotated.c DESTINATION share/docs)
-+ INSTALL(FILES examples/crop.c DESTINATION share/docs)
-+ INSTALL(FILES examples/flip.c DESTINATION share/docs)
-+ INSTALL(FILES examples/gif.c DESTINATION share/docs)
-+ INSTALL(FILES examples/nnquant.c DESTINATION share/docs)
-+ INSTALL(FILES examples/noIcon.pic DESTINATION share/docs)
-+ INSTALL(FILES examples/noIcon.sgi DESTINATION share/docs)
-+ INSTALL(FILES examples/noIcon.tga DESTINATION share/docs)
-+ INSTALL(FILES examples/noIconAlpha.tga DESTINATION share/docs)
-+ INSTALL(FILES examples/test_crop_threshold.png DESTINATION share/docs)
-+ INSTALL(FILES examples/tgaread.c DESTINATION share/docs)
-+ INSTALL(FILES examples/tiffread.c DESTINATION share/docs)
-+ INSTALL(FILES examples/windows.c DESTINATION share/docs)
+endif()
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 08fd699..497dd93 100644
+index 509c422..97a2976 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -90,17 +90,17 @@ if (BUILD_STATIC_LIBS)
+@@ -96,7 +96,6 @@ if (BUILD_STATIC_LIBS)
if (UNIX)
set_target_properties(${GD_LIB_STATIC} PROPERTIES OUTPUT_NAME ${GD_LIB})
endif()
-endif()
--if (WIN32 AND NOT MINGW AND NOT MSYS)
-- # SET_TARGET_PROPERTIES(${GD_LIB} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:msvcrt.lib")
-- SET_PROPERTY(TARGET ${GD_LIB_STATIC} APPEND PROPERTY COMPILE_DEFINITIONS NONDLL=1)
--ENDIF(WIN32 AND NOT MINGW AND NOT MSYS)
-+ if (WIN32 AND NOT MINGW AND NOT MSYS)
-+ # SET_TARGET_PROPERTIES(${GD_LIB} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:msvcrt.lib")
-+ SET_PROPERTY(TARGET ${GD_LIB_STATIC} APPEND PROPERTY COMPILE_DEFINITIONS NONDLL=1)
-+ ENDIF(WIN32 AND NOT MINGW AND NOT MSYS)
-
--if (MINGW OR MSYS)
-- ADD_DEFINITIONS("-mms-bitfields")
-- set_target_properties(${GD_LIB_STATIC} PROPERTIES OUTPUT_NAME ${GD_LIB})
--endif (MINGW OR MSYS)
-+ if (MINGW OR MSYS)
-+ ADD_DEFINITIONS("-mms-bitfields")
-+ set_target_properties(${GD_LIB_STATIC} PROPERTIES OUTPUT_NAME ${GD_LIB})
-+ endif (MINGW OR MSYS)
+ 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})
+ endif()
+ endif (MINGW OR MSYS)
+endif()
INCLUDE_DIRECTORIES(BEFORE "${PROJECT_BINARY_DIR}" "${CMAKE_BINARY_DIR}" "${GD_SOURCE_DIR}/src")
-@@ -123,32 +123,37 @@ if (BUILD_STATIC_LIBS)
- target_link_libraries(${GD_LIB_STATIC} ${LIBGD_DEP_LIBS})
- endif()
-
--set(GD_PROGRAMS gdcmpgif)
+@@ -148,6 +148,7 @@ SET(LIBS_PRIVATES
+ ${WEBP_LIBRARIES}
+ )
--if (PNG_FOUND)
-- set(GD_PROGRAMS ${GD_PROGRAMS} gdtopng pngtogd webpng)
+if(BUILD_PROGRAMS)
-+ set(GD_PROGRAMS gdcmpgif)
-+
-+ if (PNG_FOUND)
-+ set(GD_PROGRAMS ${GD_PROGRAMS} gdtopng pngtogd webpng)
-+ if (ZLIB_FOUND)
-+ set(GD_PROGRAMS ${GD_PROGRAMS} gdparttopng gd2topng pngtogd2)
-+ endif()
-+ endif()
-+
-+ if (FREETYPE_FOUND)
-+ set(GD_PROGRAMS ${GD_PROGRAMS} annotate)
-+ endif()
-+
- if (ZLIB_FOUND)
-- set(GD_PROGRAMS ${GD_PROGRAMS} gdparttopng gd2topng pngtogd2)
-+ set(GD_PROGRAMS ${GD_PROGRAMS} gd2copypal gd2togif giftogd2)
- endif()
--endif()
-
--if (FREETYPE_FOUND)
-- set(GD_PROGRAMS ${GD_PROGRAMS} annotate)
--endif()
-+ foreach(program ${GD_PROGRAMS})
-+ add_executable(${program} ${program}.c)
-+ if (BUILD_SHARED_LIBS)
-+ target_link_libraries(${program} ${GD_LIB})
-+ else()
-+ target_link_libraries(${program} ${GD_LIB_STATIC})
-+ endif()
-+ endforeach(program)
+ set(GD_PROGRAMS gdcmpgif)
--if (ZLIB_FOUND)
-- set(GD_PROGRAMS ${GD_PROGRAMS} gd2copypal gd2togif giftogd2)
-+ install(PROGRAMS bdftogd DESTINATION bin)
- endif()
+ if (PNG_FOUND)
+@@ -177,6 +178,9 @@ foreach(program ${GD_PROGRAMS})
+ endif()
+ endforeach(program)
--foreach(program ${GD_PROGRAMS})
-- add_executable(${program} ${program}.c)
-- if (BUILD_SHARED_LIBS)
-- target_link_libraries(${program} ${GD_LIB})
-- else()
-- target_link_libraries(${program} ${GD_LIB_STATIC})
-- endif()
--endforeach(program)
--
++install(PROGRAMS bdftogd DESTINATION bin)
++endif()
++
set(GD_INSTALL_TARGETS ${GD_PROGRAMS})
if (BUILD_SHARED_LIBS)
set(GD_INSTALL_TARGETS ${GD_INSTALL_TARGETS} ${GD_LIB})
-@@ -161,7 +166,7 @@ install(TARGETS ${GD_INSTALL_TARGETS}
+@@ -189,7 +193,7 @@ install(TARGETS ${GD_INSTALL_TARGETS}
RUNTIME DESTINATION bin
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -176,6 +80,3 @@ index 08fd699..497dd93 100644
install(FILES
entities.h
gd.h
---
-2.11.0.windows.1
-
diff --git a/ports/libgd/fix_msvc_build.patch b/ports/libgd/fix_msvc_build.patch
new file mode 100644
index 000000000..e46a81f89
--- /dev/null
+++ b/ports/libgd/fix_msvc_build.patch
@@ -0,0 +1,61 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 17ddf6b..7fe1e6b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -118,7 +118,7 @@ else (USE_EXT_GD)
+ endif (ENABLE_ICONV)
+
+ IF (ENABLE_WEBP)
+- FIND_PACKAGE(WEBP REQUIRED)
++ FIND_PACKAGE(WebP CONFIG REQUIRED)
+ ENDIF (ENABLE_WEBP)
+
+ IF (ENABLE_HEIF)
+diff --git a/src/config.h.cmake b/src/config.h.cmake
+index 2b46a17..af98d23 100644
+--- a/src/config.h.cmake
++++ b/src/config.h.cmake
+@@ -139,3 +139,8 @@
+
+ /* Version number of package */
+ #cmakedefine VERSION
++
++#ifdef _MSC_VER
++ #define ssize_t SSIZE_T
++ #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 */
diff --git a/ports/libgd/intrin.patch b/ports/libgd/intrin.patch
index 1f1db8eb2..b228773f0 100644
--- a/ports/libgd/intrin.patch
+++ b/ports/libgd/intrin.patch
@@ -1,5 +1,5 @@
diff --git a/src/gd_interpolation.c b/src/gd_interpolation.c
-index b9a206551..f75469329 100644
+index ce27220..8895072 100644
--- a/src/gd_interpolation.c
+++ b/src/gd_interpolation.c
@@ -75,7 +75,7 @@ TODO:
@@ -10,4 +10,4 @@ index b9a206551..f75469329 100644
+# include <intrin.h>
#endif
- static gdImagePtr gdImageScaleBilinear(gdImagePtr im,
+ static gdImagePtr gdImageScaleBilinear(gdImagePtr im,
diff --git a/ports/libgd/no-write-source-dir.patch b/ports/libgd/no-write-source-dir.patch
index 3017e7ee4..4cc17dbef 100644
--- a/ports/libgd/no-write-source-dir.patch
+++ b/ports/libgd/no-write-source-dir.patch
@@ -1,14 +1,14 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b16d4a4..5126085 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -191,7 +191,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)
+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)
diff --git a/ports/libgd/portfile.cmake b/ports/libgd/portfile.cmake
index a297c54fb..aa5d9deb3 100644
--- a/ports/libgd/portfile.cmake
+++ b/ports/libgd/portfile.cmake
@@ -1,51 +1,34 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libgd/libgd
- REF gd-2.2.5
- SHA512 e4ee4c0d1064c93640c29b5741f710872297f42bcc883026a63124807b6ff23bd79ae66bb9148a30811907756c4566ba8f1c0560673ccafc20fee38d82ca838f
+ REF 2e40f55bfb460fc9d8cbcd290a0c9eb908d5af7e # gd-2.3.2
+ SHA512 c3f2db40f774b44e3fd3fbc743efe70916a71ecd948bf8cb4aeb8a9b9fefd9f17e02d82a9481bac6fcc3624f057b5a308925b4196fb612b65bb7304747d33ffa
HEAD_REF master
PATCHES
0001-fix-cmake.patch
no-write-source-dir.patch
intrin.patch
+ fix_msvc_build.patch
)
#delete CMake builtins modules
-file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/modules/CMakeParseArguments.cmake)
-file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/modules/FindFreetype.cmake)
-file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/modules/FindJPEG.cmake)
-file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/modules/FindPackageHandleStandardArgs.cmake)
-file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/modules/FindPNG.cmake)
-
-set(ENABLE_PNG OFF)
-if("png" IN_LIST FEATURES)
- set(ENABLE_PNG ON)
-endif()
-
-set(ENABLE_JPEG OFF)
-if("jpeg" IN_LIST FEATURES)
- set(ENABLE_JPEG ON)
-endif()
-
-set(ENABLE_TIFF OFF)
-if("tiff" IN_LIST FEATURES)
- set(ENABLE_TIFF ON)
-endif()
-
-set(ENABLE_FREETYPE OFF)
-if("freetype" IN_LIST FEATURES)
- set(ENABLE_FREETYPE ON)
-endif()
-
-set(ENABLE_WEBP OFF)
-if("webp" IN_LIST FEATURES)
- set(ENABLE_WEBP ON)
-endif()
-
-set(ENABLE_FONTCONFIG OFF)
-if("fontconfig" IN_LIST FEATURES)
- set(ENABLE_FONTCONFIG ON)
-endif()
+file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules/CMakeParseArguments.cmake")
+file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules/FindFreetype.cmake")
+file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules/FindJPEG.cmake")
+file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules/FindPackageHandleStandardArgs.cmake")
+file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules/FindPNG.cmake")
+file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules/FindWEBP.cmake")
+
+vcpkg_check_features(
+ OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+ FEATURES
+ png ENABLE_PNG
+ jpeg ENABLE_JPEG
+ tiff ENABLE_TIFF
+ freetype ENABLE_FREETYPE
+ webp ENABLE_WEBP
+ fontconfig ENABLE_FONTCONFIG
+)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(LIBGD_SHARED_LIBS ON)
@@ -55,22 +38,18 @@ else()
set(LIBGD_STATIC_LIBS ON)
endif()
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
- OPTIONS -DENABLE_PNG=${ENABLE_PNG}
- -DENABLE_JPEG=${ENABLE_JPEG}
- -DENABLE_TIFF=${ENABLE_TIFF}
- -DENABLE_FREETYPE=${ENABLE_FREETYPE}
- -DENABLE_WEBP=${ENABLE_WEBP}
- -DENABLE_FONTCONFIG=${ENABLE_FONTCONFIG}
- -DBUILD_STATIC_LIBS=${LIBGD_STATIC_LIBS}
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}"
+ OPTIONS
+ ${FEATURE_OPTIONS}
+ -DLIBGD_SHARED_LIBS=${LIBGD_SHARED_LIBS}
+ -DBUILD_STATIC_LIBS=${LIBGD_STATIC_LIBS}
+ -DBUILD_TEST=OFF
)
-vcpkg_install_cmake()
+vcpkg_cmake_install()
vcpkg_copy_pdbs()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libgd)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/libgd/COPYING ${CURRENT_PACKAGES_DIR}/share/libgd/copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/libgd/vcpkg.json b/ports/libgd/vcpkg.json
index 901a3eb62..e87ee5bc7 100644
--- a/ports/libgd/vcpkg.json
+++ b/ports/libgd/vcpkg.json
@@ -1,9 +1,14 @@
{
"name": "libgd",
- "version-string": "2.2.5",
- "port-version": 5,
+ "version-semver": "2.3.2",
"description": "Open source code library for the dynamic creation of images by programmers.",
"homepage": "https://github.com/libgd/libgd",
+ "dependencies": [
+ {
+ "name": "vcpkg-cmake",
+ "host": true
+ }
+ ],
"default-features": [
"fontconfig",
"freetype",