aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradrido <robots_only_adrido@gmx.com>2019-03-05 00:14:16 +0100
committerRobert Schumacher <roschuma@microsoft.com>2019-03-04 15:14:16 -0800
commitc7d4696a8857235ec8e3497e43f0d6fe3d4b5396 (patch)
treedf0b7776c9f17a601381965be52be6d728bef6d5
parent1e0300f54f439cf052e4f1df0ae0a97f5f9dd065 (diff)
downloadvcpkg-c7d4696a8857235ec8e3497e43f0d6fe3d4b5396.tar.gz
vcpkg-c7d4696a8857235ec8e3497e43f0d6fe3d4b5396.zip
[libgd] Update to 2.2.5 & Add Features (#5510)
* [libgd] Add Features * [libgd] Update to 2.2.5
-rw-r--r--ports/libgd/CONTROL28
-rw-r--r--ports/libgd/portfile.cmake46
2 files changed, 64 insertions, 10 deletions
diff --git a/ports/libgd/CONTROL b/ports/libgd/CONTROL
index d9eb37c75..a909508a2 100644
--- a/ports/libgd/CONTROL
+++ b/ports/libgd/CONTROL
@@ -1,4 +1,28 @@
Source: libgd
-Version: 2.2.4-5
+Version: 2.2.5
Description: Open source code library for the dynamic creation of images by programmers.
-Build-Depends: freetype, libjpeg-turbo, libpng, libwebp, tiff, fontconfig
+Default-Features: fontconfig, freetype, jpeg, png, tiff, webp
+
+Feature: fontconfig
+Description: Support for fontconfig
+Build-Depends: fontconfig
+
+Feature: freetype
+Description: Support for freetype
+Build-Depends: freetype
+
+Feature: jpeg
+Description: Support for jpeg
+Build-Depends: libjpeg-turbo
+
+Feature: png
+Description: Support for png
+Build-Depends: libpng
+
+Feature: tiff
+Description: Support for tiff
+Build-Depends: tiff
+
+Feature: webp
+Description: Support for webp
+Build-Depends: libwebp
diff --git a/ports/libgd/portfile.cmake b/ports/libgd/portfile.cmake
index 7e8051acc..23c1d360b 100644
--- a/ports/libgd/portfile.cmake
+++ b/ports/libgd/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libgd/libgd
- REF gd-2.2.4
- SHA512 02ce40c45f31cf1645ad1d3fd9b9b498323b2709d40b0681cd403c11072a1f2149f5af844a6bf9e695c29e3247013bb94c57c0225a54189d728f64caf0a938ee
+ REF gd-2.2.5
+ SHA512 e4ee4c0d1064c93640c29b5741f710872297f42bcc883026a63124807b6ff23bd79ae66bb9148a30811907756c4566ba8f1c0560673ccafc20fee38d82ca838f
HEAD_REF master
PATCHES
0001-fix-cmake.patch
@@ -18,6 +18,36 @@ 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()
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(LIBGD_SHARED_LIBS ON)
set(LIBGD_STATIC_LIBS OFF)
@@ -29,12 +59,12 @@ endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
- OPTIONS -DENABLE_PNG=ON
- -DENABLE_JPEG=ON
- -DENABLE_TIFF=ON
- -DENABLE_FREETYPE=ON
- -DENABLE_WEBP=ON
- -DENABLE_FONTCONFIG=ON
+ 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_SHARED_LIBS=${LIBGD_SHARED_LIBS}
-DBUILD_STATIC_LIBS=${LIBGD_STATIC_LIBS}
)