aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhoebe <20694052+PhoebeHui@users.noreply.github.com>2021-06-16 01:31:05 +0800
committerGitHub <noreply@github.com>2021-06-15 10:31:05 -0700
commit0faf2ab829704eef529eedafed0405c4cd6289ce (patch)
tree895b419318acad1e686639b89e62ffaf4fc0cd93
parent315d0a112994c73cf9248d7005414189a867b7b7 (diff)
downloadvcpkg-0faf2ab829704eef529eedafed0405c4cd6289ce.tar.gz
vcpkg-0faf2ab829704eef529eedafed0405c4cd6289ce.zip
[devil] Fix ilut header (#18384)
* [devil Fix ilut header * Update baseline
-rw-r--r--ports/devil/0006-fix-ilut-header.patch12
-rw-r--r--ports/devil/CONTROL31
-rw-r--r--ports/devil/portfile.cmake1
-rw-r--r--ports/devil/vcpkg.json53
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/d-/devil.json5
6 files changed, 72 insertions, 32 deletions
diff --git a/ports/devil/0006-fix-ilut-header.patch b/ports/devil/0006-fix-ilut-header.patch
new file mode 100644
index 000000000..5af04e897
--- /dev/null
+++ b/ports/devil/0006-fix-ilut-header.patch
@@ -0,0 +1,12 @@
+diff --git a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt
+index 398d3c1..617c8d8 100644
+--- a/DevIL/src-ILUT/CMakeLists.txt
++++ b/DevIL/src-ILUT/CMakeLists.txt
+@@ -77,6 +77,7 @@ install (TARGETS ILUT
+ RUNTIME DESTINATION bin
+ )
+ install (FILES ../include/IL/ilut.h DESTINATION include/IL)
++install (FILES ../include/IL/ilut_config.h DESTINATION include/IL)
+
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/ILUT.pc
diff --git a/ports/devil/CONTROL b/ports/devil/CONTROL
deleted file mode 100644
index 980c91e1b..000000000
--- a/ports/devil/CONTROL
+++ /dev/null
@@ -1,31 +0,0 @@
-Source: devil
-Version: 1.8.0
-Port-Version: 7
-Build-Depends:
-Homepage: https://github.com/DentonW/DevIL
-Description: A full featured cross-platform image library
-Default-Features: libpng, tiff, libjpeg, openexr, jasper, lcms
-
-Feature: libpng
-Build-Depends: libpng
-Description: Use Libpng for .png (and some .ico)
-
-Feature: tiff
-Build-Depends: tiff
-Description: Use Libtiff for .tif support
-
-Feature: libjpeg
-Build-Depends: libjpeg-turbo
-Description: Use Libjpeg for .jpg (and some .blp) support
-
-Feature: openexr
-Build-Depends: openexr
-Description: Use openexr
-
-Feature: jasper
-Build-Depends: jasper
-Description: Use JasPer for .jp2 (and some .icns) support
-
-Feature: lcms
-Build-Depends: lcms
-Description: Use Little CMS for color profiles
diff --git a/ports/devil/portfile.cmake b/ports/devil/portfile.cmake
index 36a5dfccd..bb5d4357b 100644
--- a/ports/devil/portfile.cmake
+++ b/ports/devil/portfile.cmake
@@ -11,6 +11,7 @@ vcpkg_from_github(
enable-static.patch
0004_compatible-jasper-2-0-20.patch
0005-fix-pkgconfig.patch
+ 0006-fix-ilut-header.patch
)
file(REMOVE ${SOURCE_PATH}/DevIL/src-IL/cmake/FindOpenEXR.cmake)
diff --git a/ports/devil/vcpkg.json b/ports/devil/vcpkg.json
new file mode 100644
index 000000000..2d716cbe6
--- /dev/null
+++ b/ports/devil/vcpkg.json
@@ -0,0 +1,53 @@
+{
+ "name": "devil",
+ "version": "1.8.0",
+ "port-version": 8,
+ "description": "A full featured cross-platform image library",
+ "homepage": "https://github.com/DentonW/DevIL",
+ "default-features": [
+ "jasper",
+ "lcms",
+ "libjpeg",
+ "libpng",
+ "openexr",
+ "tiff"
+ ],
+ "features": {
+ "jasper": {
+ "description": "Use JasPer for .jp2 (and some .icns) support",
+ "dependencies": [
+ "jasper"
+ ]
+ },
+ "lcms": {
+ "description": "Use Little CMS for color profiles",
+ "dependencies": [
+ "lcms"
+ ]
+ },
+ "libjpeg": {
+ "description": "Use Libjpeg for .jpg (and some .blp) support",
+ "dependencies": [
+ "libjpeg-turbo"
+ ]
+ },
+ "libpng": {
+ "description": "Use Libpng for .png (and some .ico)",
+ "dependencies": [
+ "libpng"
+ ]
+ },
+ "openexr": {
+ "description": " Use openexr",
+ "dependencies": [
+ "openexr"
+ ]
+ },
+ "tiff": {
+ "description": "Use Libtiff for .tif support",
+ "dependencies": [
+ "tiff"
+ ]
+ }
+ }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 16e22897d..33ad28f17 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1654,7 +1654,7 @@
},
"devil": {
"baseline": "1.8.0",
- "port-version": 7
+ "port-version": 8
},
"dimcli": {
"baseline": "5.0.2",
diff --git a/versions/d-/devil.json b/versions/d-/devil.json
index 9a2d82abe..49de7f317 100644
--- a/versions/d-/devil.json
+++ b/versions/d-/devil.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "28588e0e08e57404b35e35ce1d2a69322a2ee6b8",
+ "version": "1.8.0",
+ "port-version": 8
+ },
+ {
"git-tree": "d3e52a6334ec5ccb93fba69e531ab4979b827522",
"version-string": "1.8.0",
"port-version": 7