[openexr] fixup pkgconfig (#18123)

* [openexr] fixup pkgconfig

* [openexr] x-add-version

* [openexr] drop _d library suffix for debug builds (ensures correct .pc file)

* [openexr] x-add-version

* [openexr] rename patches in order, add pkg-config debug suffix patch

* [openexr] x-add-version

* [openexr] update patch to match upstream PR

* [openexr] x-add-version

8 files changed, 66 insertions, 5 deletions

diff --git a/ports/openexr/remove_find_package_macro.patch b/ports/openexr/0001-remove_find_package_macro.patch
index 967e89a83..967e89a83 100644
--- a/ports/openexr/remove_find_package_macro.patch
+++ b/ports/openexr/0001-remove_find_package_macro.patch
diff --git a/ports/openexr/fixup_cmake_exports_path.patch b/ports/openexr/0002-fixup_cmake_exports_path.patch
index e39bd3792..e39bd3792 100644
--- a/ports/openexr/fixup_cmake_exports_path.patch
+++ b/ports/openexr/0002-fixup_cmake_exports_path.patch
diff --git a/ports/openexr/remove_symlinks.patch b/ports/openexr/0003-remove_symlinks.patch
index 89b9c53f3..89b9c53f3 100644
--- a/ports/openexr/remove_symlinks.patch
+++ b/ports/openexr/0003-remove_symlinks.patch
diff --git a/ports/openexr/0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch b/ports/openexr/0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch
new file mode 100644
index 000000000..83ab73a21
--- /dev/null
+++ b/ports/openexr/0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch
@@ -0,0 +1,54 @@
+From 6cd6b32af052563e4cd5114a1d279736d1d8653a Mon Sep 17 00:00:00 2001
+From: "Matthias C. M. Troffaes" <matthias.troffaes@gmail.com>
+Date: Tue, 1 Jun 2021 08:06:45 +0100
+Subject: [PATCH] Use CMAKE_<CONFIG>_POSTFIX for .pc file lib suffix.
+
+Signed-off-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
+---
+ IlmBase/config/CMakeLists.txt   | 3 ++-
+ OpenEXR/config/CMakeLists.txt   | 3 ++-
+ PyIlmBase/config/CMakeLists.txt | 3 ++-
+ 3 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt
+index d9c5ae449..dfebb43bd 100644
+--- a/IlmBase/config/CMakeLists.txt
++++ b/IlmBase/config/CMakeLists.txt
+@@ -78,7 +78,8 @@ if(ILMBASE_INSTALL_PKG_CONFIG)
+     set(exec_prefix "\${prefix}")
+     set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
+     set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+-    set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX})
++    string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
++    set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX})
+     if(TARGET Threads::Threads)
+       # hrm, can't use properties as they end up as generator expressions
+       # which don't seem to evaluate
+diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt
+index 8386e3a0e..039190cd9 100644
+--- a/OpenEXR/config/CMakeLists.txt
++++ b/OpenEXR/config/CMakeLists.txt
+@@ -77,7 +77,8 @@ if(OPENEXR_INSTALL_PKG_CONFIG)
+     set(exec_prefix "\${prefix}")
+     set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
+     set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+-    set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX})
++    string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
++    set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX})
+     if(TARGET Threads::Threads)
+       # hrm, can't use properties as they end up as generator expressions
+       # which don't seem to evaluate
+diff --git a/PyIlmBase/config/CMakeLists.txt b/PyIlmBase/config/CMakeLists.txt
+index 1872c89e7..a4139bcfd 100644
+--- a/PyIlmBase/config/CMakeLists.txt
++++ b/PyIlmBase/config/CMakeLists.txt
+@@ -18,7 +18,8 @@ if(PYILMBASE_INSTALL_PKG_CONFIG)
+     set(exec_prefix ${CMAKE_INSTALL_BINDIR})
+     set(libdir ${CMAKE_INSTALL_LIBDIR})
+     set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
+-    set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX})
++    string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
++    set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX})
+     string(REPLACE ".in" "" pcout ${pcinfile})
+     configure_file(${pcinfile} ${CMAKE_CURRENT_BINARY_DIR}/${pcout} @ONLY)
+     install(
diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake
index d73520cea..aac8fea55 100644
--- a/ports/openexr/portfile.cmake
+++ b/ports/openexr/portfile.cmake
@@ -9,9 +9,10 @@ vcpkg_from_github(
   SHA512 549d37ed1ef4d1ff7e732d583f7213ee15c7f92625aea9fd65345e4c5b854902c02e5940d0692b1af5ae0a02abf46aaefea2662db2389d1b2fb4264a373baac2
   HEAD_REF master
   PATCHES
-    remove_find_package_macro.patch
-    fixup_cmake_exports_path.patch
-    remove_symlinks.patch
+    0001-remove_find_package_macro.patch
+    0002-fixup_cmake_exports_path.patch
+    0003-remove_symlinks.patch
+    0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch  # https://github.com/AcademySoftwareFoundation/openexr/pull/1032
 )
 
 vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH}
@@ -25,6 +26,7 @@ vcpkg_install_cmake()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/ilmbase TARGET_PATH share/ilmbase)
 vcpkg_fixup_cmake_targets()
+vcpkg_fixup_pkgconfig()
 
 file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrenvmap${VCPKG_HOST_EXECUTABLE_SUFFIX})
 file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrheader${VCPKG_HOST_EXECUTABLE_SUFFIX})
diff --git a/ports/openexr/vcpkg.json b/ports/openexr/vcpkg.json
index 1d7f178bf..b293e7047 100644
--- a/ports/openexr/vcpkg.json
+++ b/ports/openexr/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openexr",
   "version-string": "2.5.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications",
   "homepage": "https://www.openexr.com/",
   "supports": "!uwp",
diff --git a/versions/baseline.json b/versions/baseline.json
index 51c4ce874..576a78280 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4538,7 +4538,7 @@
     },
     "openexr": {
       "baseline": "2.5.0",
-      "port-version": 2
+      "port-version": 3
     },
     "opengl": {
       "baseline": "0.0",
diff --git a/versions/o-/openexr.json b/versions/o-/openexr.json
index c846a69c6..06c0f7620 100644
--- a/versions/o-/openexr.json
+++ b/versions/o-/openexr.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "7589d3f1641e6e63450303e424d966221375109f",
+      "version-string": "2.5.0",
+      "port-version": 3
+    },
+    {
       "git-tree": "42bec4d0daed751ad449a504b7fa43d57eec9000",
       "version-string": "2.5.0",
       "port-version": 2