Skip to content

Commit

Permalink
[many ports] Don't depend on default features of tiff (#38049)
Browse files Browse the repository at this point in the history
This removes the transitive dependency of liblzma via tiff

- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [x] The "supports" clause reflects platforms that may be fixed by this
new version.
- [x] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [x] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.

---------

Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Co-authored-by: Alexander Neumann <you@example.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
  • Loading branch information
4 people authored May 2, 2024
1 parent c591ac6 commit 3a882b3
Show file tree
Hide file tree
Showing 53 changed files with 302 additions and 75 deletions.
7 changes: 5 additions & 2 deletions ports/dcmtk/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "dcmtk",
"version": "3.6.8",
"port-version": 4,
"port-version": 5,
"description": "This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.",
"homepage": "https://github.com/DCMTK/dcmtk",
"license": "BSD-3-Clause OR BSD-2-Clause OR libtiff OR MIT OR Zlib OR Libpng",
Expand Down Expand Up @@ -47,7 +47,10 @@
"tiff": {
"description": "Enable TIFF support",
"dependencies": [
"tiff"
{
"name": "tiff",
"default-features": false
}
]
},
"tools": {
Expand Down
7 changes: 5 additions & 2 deletions ports/devil/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "devil",
"version": "1.8.0",
"port-version": 12,
"port-version": 13,
"description": "A full featured cross-platform image library",
"homepage": "https://github.com/DentonW/DevIL",
"supports": "!uwp",
Expand Down Expand Up @@ -57,7 +57,10 @@
"tiff": {
"description": "Use Libtiff for .tif support",
"dependencies": [
"tiff"
{
"name": "tiff",
"default-features": false
}
]
}
}
Expand Down
6 changes: 5 additions & 1 deletion ports/graphicsmagick/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "graphicsmagick",
"version": "1.3.41",
"port-version": 1,
"description": "Image processing library",
"homepage": "https://sourceforge.net/projects/graphicsmagick/",
"dependencies": [
Expand All @@ -9,7 +10,10 @@
"libjpeg-turbo",
"libpng",
"libwebp",
"tiff",
{
"name": "tiff",
"default-features": false
},
{
"name": "vcpkg-cmake",
"host": true
Expand Down
6 changes: 5 additions & 1 deletion ports/itk/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "itk",
"version-string": "5.3rc02",
"port-version": 1,
"description": "Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.",
"homepage": "https://github.com/InsightSoftwareConsortium/ITK",
"license": "Apache-2.0",
Expand Down Expand Up @@ -28,7 +29,10 @@
"name": "openjpeg",
"default-features": false
},
"tiff",
{
"name": "tiff",
"default-features": false
},
{
"name": "vcpkg-cmake",
"host": true
Expand Down
7 changes: 5 additions & 2 deletions ports/libgd/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libgd",
"version-semver": "2.3.3",
"port-version": 2,
"port-version": 3,
"description": "Open source code library for the dynamic creation of images by programmers.",
"homepage": "https://github.com/libgd/libgd",
"license": "GD",
Expand Down Expand Up @@ -48,7 +48,10 @@
"tiff": {
"description": "Support for TIFF",
"dependencies": [
"tiff"
{
"name": "tiff",
"default-features": false
}
]
},
"tools": {
Expand Down
7 changes: 5 additions & 2 deletions ports/libgxps/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libgxps",
"version": "0.3.2",
"port-version": 2,
"port-version": 3,
"description": "libgxps is a GObject based library for handling and rendering XPS documents.",
"homepage": "https://wiki.gnome.org/Projects/libgxps",
"dependencies": [
Expand All @@ -12,7 +12,10 @@
"libjpeg-turbo",
"libpng",
"libxslt",
"tiff",
{
"name": "tiff",
"default-features": false
},
{
"name": "vcpkg-tool-meson",
"host": true
Expand Down
26 changes: 21 additions & 5 deletions ports/libwebp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "libwebp",
"version": "1.4.0",
"port-version": 1,
"description": "WebP codec: library to encode and decode images in WebP format",
"homepage": "https://github.com/webmproject/libwebp",
"license": "BSD-3-Clause",
Expand Down Expand Up @@ -85,31 +86,43 @@
"mux"
]
},
"tiff"
{
"name": "tiff",
"default-features": false
}
]
},
"cwebp": {
"description": "Build the cwebp command line tool.",
"dependencies": [
"libjpeg-turbo",
"libpng",
"tiff"
{
"name": "tiff",
"default-features": false
}
]
},
"dwebp": {
"description": "Build the dwebp command line tool.",
"dependencies": [
"libjpeg-turbo",
"libpng",
"tiff"
{
"name": "tiff",
"default-features": false
}
]
},
"extras": {
"description": "Build extras. (Doesn't include vwebp-sdl.)",
"dependencies": [
"libjpeg-turbo",
"libpng",
"tiff"
{
"name": "tiff",
"default-features": false
}
]
},
"gif2webp": {
Expand Down Expand Up @@ -137,7 +150,10 @@
"libwebpmux"
]
},
"tiff"
{
"name": "tiff",
"default-features": false
}
]
},
"info": {
Expand Down
7 changes: 5 additions & 2 deletions ports/mapnik/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mapnik",
"version-date": "2023-06-12",
"port-version": 3,
"port-version": 4,
"description": "Mapnik is an open source toolkit for developing mapping applications.",
"homepage": "https://github.com/mapnik/mapnik",
"license": "LGPL-2.1-only",
Expand Down Expand Up @@ -171,7 +171,10 @@
"tiff": {
"description": "add tiff support",
"dependencies": [
"tiff"
{
"name": "tiff",
"default-features": false
}
]
},
"utility-geometry-to-wkb": {
Expand Down
7 changes: 5 additions & 2 deletions ports/opencv2/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "opencv2",
"version": "2.4.13.7",
"port-version": 19,
"port-version": 20,
"description": "Open Source Computer Vision Library",
"homepage": "https://github.com/opencv/opencv",
"license": "BSD-3-Clause",
Expand Down Expand Up @@ -133,7 +133,10 @@
"tiff": {
"description": "TIFF support for opencv",
"dependencies": [
"tiff"
{
"name": "tiff",
"default-features": false
}
]
},
"world": {
Expand Down
7 changes: 5 additions & 2 deletions ports/opencv3/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "opencv3",
"version": "3.4.18",
"port-version": 13,
"port-version": 14,
"description": "Open Source Computer Vision Library",
"homepage": "https://github.com/opencv/opencv",
"license": "BSD-3-Clause",
Expand Down Expand Up @@ -285,7 +285,10 @@
"tiff": {
"description": "TIFF support for opencv",
"dependencies": [
"tiff"
{
"name": "tiff",
"default-features": false
}
]
},
"vtk": {
Expand Down
7 changes: 5 additions & 2 deletions ports/opencv4/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "opencv4",
"version": "4.8.0",
"port-version": 17,
"port-version": 18,
"description": "computer vision library",
"homepage": "https://github.com/opencv/opencv",
"license": "Apache-2.0",
Expand Down Expand Up @@ -357,7 +357,10 @@
"tiff": {
"description": "TIFF support for opencv",
"dependencies": [
"tiff"
{
"name": "tiff",
"default-features": false
}
]
},
"vtk": {
Expand Down
7 changes: 5 additions & 2 deletions ports/openimageio/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "openimageio",
"version": "2.5.8.0",
"port-version": 2,
"port-version": 3,
"description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.",
"homepage": "https://github.com/OpenImageIO/oiio",
"license": "BSD-3-Clause",
Expand All @@ -24,7 +24,10 @@
"libpng",
"openexr",
"robin-map",
"tiff",
{
"name": "tiff",
"default-features": false
},
{
"name": "vcpkg-cmake",
"host": true
Expand Down
6 changes: 5 additions & 1 deletion ports/openjpeg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "openjpeg",
"version": "2.5.2",
"port-version": 1,
"description": "OpenJPEG is an open-source JPEG 2000 codec written in C language. It has been developed in order to promote the use of JPEG 2000, a still-image compression standard from the Joint Photographic Experts Group (JPEG). Since April 2015, it is officially recognized by ISO/IEC and ITU-T as a JPEG 2000 Reference Software.",
"homepage": "https://github.com/uclouvain/openjpeg",
"license": "BSD-2-Clause",
Expand Down Expand Up @@ -32,7 +33,10 @@
},
"lcms",
"libpng",
"tiff",
{
"name": "tiff",
"default-features": false
},
"zlib"
]
}
Expand Down
7 changes: 5 additions & 2 deletions ports/openmvg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "openmvg",
"version": "2.0",
"port-version": 9,
"port-version": 10,
"description": "open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.",
"license": "MPL-2.0-no-copyleft-exception",
"supports": "(x86 | x64 | arm64) & !xbox",
Expand All @@ -22,7 +22,10 @@
"libjpeg-turbo",
"liblemon",
"libpng",
"tiff",
{
"name": "tiff",
"default-features": false
},
{
"name": "vcpkg-cmake",
"host": true
Expand Down
7 changes: 5 additions & 2 deletions ports/openmvs/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "openmvs",
"version": "2.1.0",
"port-version": 4,
"port-version": 5,
"description": "OpenMVS: open Multi-View Stereo reconstruction library",
"homepage": "https://cdcseacave.github.io/openMVS",
"license": "AGPL-3.0-only",
Expand All @@ -28,7 +28,10 @@
],
"platform": "!(windows & static)"
},
"tiff",
{
"name": "tiff",
"default-features": false
},
"vcglib",
{
"name": "vcpkg-cmake",
Expand Down
7 changes: 5 additions & 2 deletions ports/openslide/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "openslide",
"version": "3.4.1",
"port-version": 3,
"port-version": 4,
"description": "OpenSlide is a C library for reading whole slide image files (also known as virtual slides). It provides a consistent and simple API for reading files from multiple vendors.",
"homepage": "https://openslide.org/",
"license": "LGPL-2.1-or-later",
Expand All @@ -15,7 +15,10 @@
"libxml2",
"openjpeg",
"sqlite3",
"tiff",
{
"name": "tiff",
"default-features": false
},
{
"name": "vcpkg-tool-meson",
"host": true
Expand Down
Loading

0 comments on commit 3a882b3

Please sign in to comment.