From 3768cef9c204bb168c04b3ba7cb93b10a140a91d Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Mon, 27 Sep 2021 13:59:30 -0700
Subject: Add workaround suggested by Robert in #18098 (#20310)

---
 ports/openal-soft/portfile.cmake | 5 ++++-
 ports/openal-soft/vcpkg.json     | 2 +-
 versions/baseline.json           | 2 +-
 versions/o-/openal-soft.json     | 5 +++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake
index 79ea4a0c7..30c413ff4 100644
--- a/ports/openal-soft/portfile.cmake
+++ b/ports/openal-soft/portfile.cmake
@@ -80,7 +80,10 @@ foreach(HEADER al.h alc.h)
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
         string(REPLACE "defined(AL_LIBTYPE_STATIC)" "1" AL_H "${AL_H}")
     else()
-        string(REPLACE "defined(AL_LIBTYPE_STATIC)" "0" AL_H "${AL_H}")
+        # Normally we would say:
+        # string(REPLACE "defined(AL_LIBTYPE_STATIC)" "0" AL_H "${AL_H}")
+        # but we are leaving these undefined macros alone in support of
+        # https://github.com/microsoft/vcpkg/issues/18098
     endif()
     file(WRITE "${CURRENT_PACKAGES_DIR}/include/AL/${HEADER}" "${AL_H}")
 endforeach()
diff --git a/ports/openal-soft/vcpkg.json b/ports/openal-soft/vcpkg.json
index c96c68a3c..8f86e6bd5 100644
--- a/ports/openal-soft/vcpkg.json
+++ b/ports/openal-soft/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openal-soft",
   "version-semver": "1.21.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.",
   "homepage": "https://github.com/kcat/openal-soft",
   "supports": "!uwp"
diff --git a/versions/baseline.json b/versions/baseline.json
index 1c645daba..b126d2bfa 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4734,7 +4734,7 @@
     },
     "openal-soft": {
       "baseline": "1.21.1",
-      "port-version": 2
+      "port-version": 3
     },
     "openblas": {
       "baseline": "0.3.15",
diff --git a/versions/o-/openal-soft.json b/versions/o-/openal-soft.json
index 9a6e6a3ed..fe1afc014 100644
--- a/versions/o-/openal-soft.json
+++ b/versions/o-/openal-soft.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b6672158f9eda4512b07d89ba193c51ef2802641",
+      "version-semver": "1.21.1",
+      "port-version": 3
+    },
     {
       "git-tree": "9b1e7ccf10631bcb24825e8742bf18de9c561e71",
       "version-semver": "1.21.1",
-- 
cgit v1.2.3