diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-01-22 23:02:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 14:02:31 -0800 |
| commit | a66c5ec3859cf2f619fd41fb42389859f7edc848 (patch) | |
| tree | 639f8e132c4864d83f32200e5a5391fc95a200c8 | |
| parent | 3b433e5081f35a32331492d98a8b0c1c2477048e (diff) | |
| download | vcpkg-a66c5ec3859cf2f619fd41fb42389859f7edc848.tar.gz vcpkg-a66c5ec3859cf2f619fd41fb42389859f7edc848.zip | |
[tiff] add vcpkg_fixup_pkgconfig for tiff (#15734)
* [tiff] add vcpkg_fixup_pkgconfig for tiff
* add version
* fix tiff deps in *.pc file
* update version
| -rw-r--r-- | ports/tiff/CONTROL | 1 | ||||
| -rw-r--r-- | ports/tiff/portfile.cmake | 15 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/t-/tiff.json | 5 |
4 files changed, 22 insertions, 1 deletions
diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index f37049768..1eb69723c 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -1,5 +1,6 @@ Source: tiff Version: 4.1.0 +Port-Version: 1 Build-Depends: zlib, libjpeg-turbo, liblzma Homepage: https://download.osgeo.org/libtiff Description: A library that supports the manipulation of TIFF image files diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index ab610d328..7e94ac05a 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -41,7 +41,22 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libtiff-4.pc") +if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" "-ltiff" "-ltiffd") +endif() + +# Fix dependencies: +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libtiff-4.pc") +if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" "Version: 4.1.0" "Version: 4.1.0\nRequires.private: liblzma libjpeg") +endif() +set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libtiff-4.pc") +if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" "Version: 4.1.0" "Version: 4.1.0\nRequires.private: liblzma libjpeg") +endif() +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share diff --git a/versions/baseline.json b/versions/baseline.json index f24351b87..c6a99c7cb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5698,7 +5698,7 @@ }, "tiff": { "baseline": "4.1.0", - "port-version": 0 + "port-version": 1 }, "tinkerforge": { "baseline": "2.1.25", diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index 0a4bb5b3c..d3ad7ef0a 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "8bb1dc9606c9b3573f08bcf6befad16ac730f287", + "version-string": "4.1.0", + "port-version": 1 + }, + { "git-tree": "c2beac2991ae6df4dfeaf0a3b158092a78128214", "version-string": "4.1.0", "port-version": 0 |