[openal-soft] Update to 1.21.1 (#15945)

* [openal-soft] Update to 1.21.1

* Run x-add-version openal-soft

8 files changed, 20 insertions, 93 deletions

diff --git a/ports/openal-soft/CONTROL b/ports/openal-soft/CONTROL
deleted file mode 100644
index 4bb4f27d3..000000000
--- a/ports/openal-soft/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: openal-soft
-Version: 1.20.1
-Port-Version: 6
-Homepage: https://github.com/kcat/openal-soft
-Description: OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.
-Supports: !uwp
diff --git a/ports/openal-soft/dont-export-symbols-in-static-build.patch b/ports/openal-soft/dont-export-symbols-in-static-build.patch
index b13b6936b..3ff82b0b8 100644
--- a/ports/openal-soft/dont-export-symbols-in-static-build.patch
+++ b/ports/openal-soft/dont-export-symbols-in-static-build.patch
@@ -1,5 +1,4 @@
 diff --git a/config.h.in b/config.h.in
-index 4a1e2b00..d5496972 100644
 --- a/config.h.in
 +++ b/config.h.in
 @@ -1,6 +1,8 @@
@@ -9,6 +8,6 @@ index 4a1e2b00..d5496972 100644
  #define ALC_API ${EXPORT_DECL}
 +#endif
 
- /* Define a restrict macro for non-aliased pointers */
- #define RESTRICT ${RESTRICT_DECL}
+ /* Define if HRTF data is embedded in the library */
+ #cmakedefine ALSOFT_EMBED_HRTF_DATA
  
\ No newline at end of file
diff --git a/ports/openal-soft/fix-arm-builds.patch b/ports/openal-soft/fix-arm-builds.patch
deleted file mode 100644
index 7b429c4fc..000000000
--- a/ports/openal-soft/fix-arm-builds.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 98f9ad49..50b4297f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1193,6 +1193,7 @@ SET_TARGET_PROPERTIES(common PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
- UNSET(HAS_ROUTER)
- SET(IMPL_TARGET OpenAL) # Either OpenAL or soft_oal.
- SET(SUBSYS_FLAG )
-+SET(COMMON_LIB )
-
- # Build main library
- IF(LIBTYPE STREQUAL "STATIC")
-@@ -1203,12 +1204,15 @@ IF(LIBTYPE STREQUAL "STATIC")
-     ADD_LIBRARY(${IMPL_TARGET} STATIC ${COMMON_OBJS} ${OPENAL_OBJS} ${ALC_OBJS})
-     TARGET_LINK_LIBRARIES(${IMPL_TARGET} PRIVATE ${LINKER_FLAGS} ${EXTRA_LIBS} ${MATH_LIB})
- ELSE()
-+    SET(COMMON_LIB common)
-+
-     IF(WIN32)
-         IF(MSVC)
-             SET(SUBSYS_FLAG ${SUBSYS_FLAG} "/SUBSYSTEM:WINDOWS")
-         ELSEIF(CMAKE_COMPILER_IS_GNUCC)
-             SET(SUBSYS_FLAG ${SUBSYS_FLAG} "-mwindows")
-         ENDIF()
-+        set(COMMON_LIB ${COMMON_LIB} shell32 ole32)
-     ENDIF()
-
-     SET(RC_CONFIG resources/openal32.rc)
-@@ -1223,7 +1227,7 @@ ELSE()
-         TARGET_COMPILE_DEFINITIONS(OpenAL
-             PRIVATE AL_BUILD_LIBRARY AL_ALEXT_PROTOTYPES ${CPP_DEFS})
-         TARGET_COMPILE_OPTIONS(OpenAL PRIVATE ${C_FLAGS})
--        TARGET_LINK_LIBRARIES(OpenAL PRIVATE common ${LINKER_FLAGS})
-+        TARGET_LINK_LIBRARIES(OpenAL PRIVATE ${COMMON_LIB} ${LINKER_FLAGS})
-         TARGET_INCLUDE_DIRECTORIES(OpenAL
-           PUBLIC
-             $<BUILD_INTERFACE:${OpenAL_SOURCE_DIR}/include>
-@@ -1248,7 +1252,7 @@ ELSE()
-     IF(WIN32)
-         SET_TARGET_PROPERTIES(${IMPL_TARGET} PROPERTIES PREFIX "")
-     ENDIF()
--    TARGET_LINK_LIBRARIES(${IMPL_TARGET} PRIVATE common ${LINKER_FLAGS} ${EXTRA_LIBS} ${MATH_LIB})
-+    TARGET_LINK_LIBRARIES(${IMPL_TARGET} PRIVATE ${COMMON_LIB} ${LINKER_FLAGS} ${EXTRA_LIBS} ${MATH_LIB})
- ENDIF()
-
- TARGET_INCLUDE_DIRECTORIES(${IMPL_TARGET}
-diff --git a/native-tools/CMakeLists.txt b/native-tools/CMakeLists.txt
-index 5e816bba..5d7919f6 100644
---- a/native-tools/CMakeLists.txt
-+++ b/native-tools/CMakeLists.txt
-@@ -24,6 +24,11 @@ set_target_properties(bsincgen PROPERTIES OUTPUT_NAME bsincgen)
- set_target_properties(bsincgen PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}")
- set_target_properties(bsincgen PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}")
- target_compile_definitions(bsincgen PRIVATE ${CPP_DEFS})
-+set(BSINCGEN_LIB )
- if(HAVE_LIBM)
--    target_link_libraries(bsincgen m)
-+    set(BSINCGEN_LIB ${BSINCGEN_LIB} m)
- endif(HAVE_LIBM)
-+if(WIN32)
-+    set(BSINCGEN_LIB ${BSINCGEN_LIB} shell32)
-+endif()
-+target_link_libraries(bsincgen ${BSINCGEN_LIB})
diff --git a/ports/openal-soft/fix-mingw-build.patch b/ports/openal-soft/fix-mingw-build.patch
deleted file mode 100644
index ffb2db303..000000000
--- a/ports/openal-soft/fix-mingw-build.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/common/alstring.h b/common/alstring.h
-index 194e54a1..5a5f87ed 100644
---- a/common/alstring.h
-+++ b/common/alstring.h
-@@ -4,6 +4,9 @@
- #include <cstddef>
- #include <string>
- 
-+// This fixes MinGW link errors. It defines strcasecmp and strncasecmp in string.h.
-+#include <string.h>
-+
- #include "almalloc.h"
- 
- 
diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake
index d66507f27..d5717f0a7 100644
--- a/ports/openal-soft/portfile.cmake
+++ b/ports/openal-soft/portfile.cmake
@@ -3,13 +3,11 @@ vcpkg_fail_port_install(ON_TARGET "UWP")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO kcat/openal-soft
-    REF f5e0eef34db3a3ab94b61a2f99f84f078ba947e7 # openal-soft-1.20.1
-    SHA512 3b05e67406e594215bc5a5e684feafa05ae3b6c898f5b91ab923c59688d7bc4f37f7a9f3bbc8ae252f8997d2588dc2766f44866eb095f0f53cb42030596d26a5
+    REF ae4eacf147e2c2340cc4e02a790df04c793ed0a9 # openal-soft-1.21.1
+    SHA512 6ba006d3dad6efe002f285ff509a59f02b499ec3f6065df12a89c52355464117b4dbabcd04ee9cbf22cc3b4125c8e456769b172f8c3e9ee215e760b2c51a0a8f
     HEAD_REF master
     PATCHES
         dont-export-symbols-in-static-build.patch
-        fix-arm-builds.patch
-        fix-mingw-build.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
@@ -74,7 +72,8 @@ foreach(HEADER al.h alc.h)
     file(WRITE ${CURRENT_PACKAGES_DIR}/include/AL/${HEADER} "${AL_H}")
 endforeach()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
 
diff --git a/ports/openal-soft/vcpkg.json b/ports/openal-soft/vcpkg.json
new file mode 100644
index 000000000..29378666b
--- /dev/null
+++ b/ports/openal-soft/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "openal-soft",
+  "version-string": "1.21.1",
+  "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 6fb69bf59..1456fbef2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4241,8 +4241,8 @@
       "port-version": 0
     },
     "openal-soft": {
-      "baseline": "1.20.1",
-      "port-version": 6
+      "baseline": "1.21.1",
+      "port-version": 0
     },
     "openblas": {
       "baseline": "0.3.10",
diff --git a/versions/o-/openal-soft.json b/versions/o-/openal-soft.json
index ac101a679..c89e17c01 100644
--- a/versions/o-/openal-soft.json
+++ b/versions/o-/openal-soft.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "735740a45f65f166bd693795a7bed3d2ef079baf",
+      "version-string": "1.21.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "d67d0e5d79043433b022177e902f397c4c285f4c",
       "version-string": "1.20.1",
       "port-version": 6