diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-01-20 07:30:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 22:30:34 -0800 |
| commit | 460f40992bf91a3afe5486092cb2ce3dad1a690b (patch) | |
| tree | 5af1d86b30721e6b1b6e4f1ff9a6f7df4a0e0649 | |
| parent | d7cd6f52be3423b7aed66e61dc297cef066f305d (diff) | |
| download | vcpkg-460f40992bf91a3afe5486092cb2ce3dad1a690b.tar.gz vcpkg-460f40992bf91a3afe5486092cb2ce3dad1a690b.zip | |
[libjepg-turbo] Fix *.pc files (#15735)
* [libjpeg-turbo] fix pkgconfig
* add version info
* Update ports/libjpeg-turbo/portfile.cmake
* update baseline
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
| -rw-r--r-- | port_versions/baseline.json | 2 | ||||
| -rw-r--r-- | port_versions/l-/libjpeg-turbo.json | 5 | ||||
| -rw-r--r-- | ports/libjpeg-turbo/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libjpeg-turbo/portfile.cmake | 7 |
4 files changed, 14 insertions, 2 deletions
diff --git a/port_versions/baseline.json b/port_versions/baseline.json index c44dd4772..8f547b823 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -3038,7 +3038,7 @@ }, "libjpeg-turbo": { "baseline": "2.0.5", - "port-version": 3 + "port-version": 4 }, "libjuice": { "baseline": "0.6.0", diff --git a/port_versions/l-/libjpeg-turbo.json b/port_versions/l-/libjpeg-turbo.json index 43f655396..46272052c 100644 --- a/port_versions/l-/libjpeg-turbo.json +++ b/port_versions/l-/libjpeg-turbo.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "0c5889f679a9404504230cb568df8f1f1263cbba", + "version-string": "2.0.5", + "port-version": 4 + }, + { "git-tree": "cf4b226059c3e824fc31962ba1afde783f7f1833", "version-string": "2.0.5", "port-version": 3 diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL index 581b62dd6..1e5ad60c6 100644 --- a/ports/libjpeg-turbo/CONTROL +++ b/ports/libjpeg-turbo/CONTROL @@ -1,6 +1,6 @@ Source: libjpeg-turbo Version: 2.0.5 -Port-Version: 3 +Port-Version: 4 Homepage: https://github.com/libjpeg-turbo/libjpeg-turbo Description: libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems. diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index b218a5f97..208d3ff6d 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -72,6 +72,13 @@ else(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endif() endif() +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libjpeg.pc") +if(EXISTS "${_file}" AND VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${_file}" "-ljpeg" "-ljpegd") +endif() + +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man) |