[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>
microsoft · Jan 20, 2021 · 460f409 · 460f409
1 parent d7cd6f5
commit 460f409
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git 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
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0c5889f679a9404504230cb568df8f1f1263cbba",
+      "version-string": "2.0.5",
+      "port-version": 4
+    },
     {
       "git-tree": "cf4b226059c3e824fc31962ba1afde783f7f1833",
       "version-string": "2.0.5",

diff --git 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
@@ -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)