aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Christensen <philc@microsoft.com>2018-12-05 12:16:09 -0800
committerGitHub <noreply@github.com>2018-12-05 12:16:09 -0800
commit540776b34132aa754496c7098adcf80717d5299f (patch)
tree30bbfd897c0b7d4a5f85e02bd874e5c765fb4ab7
parent35be0e7c2b3f408d043073140bbccf3a5dd71944 (diff)
parent93f2e956a9096c4d3ca2d98b7b5634ddf2198efb (diff)
downloadvcpkg-540776b34132aa754496c7098adcf80717d5299f.tar.gz
vcpkg-540776b34132aa754496c7098adcf80717d5299f.zip
Merge pull request #4860 from shaymagsumov/devil-tiff-feature
[devil] Fix 'tiff' option name.
-rw-r--r--ports/devil/CONTROL2
-rw-r--r--ports/devil/portfile.cmake6
2 files changed, 3 insertions, 5 deletions
diff --git a/ports/devil/CONTROL b/ports/devil/CONTROL
index cddc99222..18d263348 100644
--- a/ports/devil/CONTROL
+++ b/ports/devil/CONTROL
@@ -1,5 +1,5 @@
Source: devil
-Version: 1.8.0-2
+Version: 1.8.0-3
Build-Depends:
Description: A full featured cross-platform image library
Default-Features: libpng, tiff, libjpeg, openexr, jasper, lcms
diff --git a/ports/devil/portfile.cmake b/ports/devil/portfile.cmake
index e49507386..ff4e7ee0c 100644
--- a/ports/devil/portfile.cmake
+++ b/ports/devil/portfile.cmake
@@ -1,11 +1,9 @@
include(vcpkg_common_functions)
-set(DEVIL_VERSION 1.8.0)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO DentonW/DevIL
- REF v${DEVIL_VERSION}
+ REF v1.8.0
SHA512 4aed5e50a730ece8b1eb6b2f6204374c6fb6f5334cf7c880d84c0f79645ea7c6b5118f57a7868a487510fc59c452f51472b272215d4c852f265f58b5857e17c7
HEAD_REF master
PATCHES
@@ -20,7 +18,7 @@ if("libpng" IN_LIST FEATURES)
endif()
set(IL_NO_TIF 1)
-if("libtiff" IN_LIST FEATURES)
+if("tiff" IN_LIST FEATURES)
set(IL_NO_TIF 0)
endif()