[openal-soft] Update to 1.22.0 (microsoft#25327)

* [openal-soft] Update to 1.22.0 * update version * add license * overwrite versions * update version * add patch * update version * add license * update version * update patch * overwrite version
SupSuper · Jun 28, 2022 · 17ee0b5 · 17ee0b5
1 parent d8b98ac
commit 17ee0b5
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 27 deletions.
diff --git a/ports/magnum/004-fix-FindOpenAL.patch b/ports/magnum/004-fix-FindOpenAL.patch
@@ -0,0 +1,12 @@
+diff --git a/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt b/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt
+index 64371a4..375ca58 100644
+--- a/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt
++++ b/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt
+@@ -24,6 +24,7 @@
+ #
+
+ find_package(Corrade REQUIRED PluginManager)
++find_package(OpenAL CONFIG REQUIRED)
+
+ if(BUILD_PLUGINS_STATIC)
+     set(MAGNUM_ANYAUDIOIMPORTER_BUILD_STATIC 1)
diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake
@@ -7,6 +7,7 @@ vcpkg_from_github(
     PATCHES
         002-sdl-includes.patch
         003-fix-FindGLFW.patch
+        004-fix-FindOpenAL.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)

diff --git a/ports/magnum/vcpkg.json b/ports/magnum/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "magnum",
   "version-string": "2020.06",
-  "port-version": 9,
+  "port-version": 10,
   "description": "C++11/C++14 graphics middleware for games and data visualization",
   "homepage": "https://magnum.graphics/",
+  "license": null,
   "dependencies": [
     {
       "name": "corrade",

diff --git a/ports/openal-soft/dont-export-symbols-in-static-build.patch b/ports/openal-soft/dont-export-symbols-in-static-build.patch
diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake
@@ -1,11 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO kcat/openal-soft
-    REF ae4eacf147e2c2340cc4e02a790df04c793ed0a9 # openal-soft-1.21.1
-    SHA512 6ba006d3dad6efe002f285ff509a59f02b499ec3f6065df12a89c52355464117b4dbabcd04ee9cbf22cc3b4125c8e456769b172f8c3e9ee215e760b2c51a0a8f
+    REF c1c63a27de66cd44ef756b190a73bfa8bc6dbbab # openal-soft-1.22.0
+    SHA512 3d403a2c292991976880254dd6374e7f501e6b56183bfd935f5f640f250fb935f95537faf49a3ef42d75c993475971f56da8118c54c8c6668e951d1a5e576139
     HEAD_REF master
-    PATCHES
-        dont-export-symbols-in-static-build.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
@@ -28,7 +26,7 @@ if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
     set(ALSOFT_REQUIRE_APPLE ON)
 endif()
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DLIBTYPE=${OPENAL_LIBTYPE}
@@ -70,8 +68,8 @@ vcpkg_configure_cmake(
         CMAKE_DISABLE_FIND_PACKAGE_WindowsSDK
 )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/OpenAL")
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/OpenAL")
 
 foreach(HEADER al.h alc.h)
     file(READ "${CURRENT_PACKAGES_DIR}/include/AL/${HEADER}" AL_H)

diff --git a/ports/openal-soft/vcpkg.json b/ports/openal-soft/vcpkg.json
@@ -1,8 +1,18 @@
 {
   "name": "openal-soft",
-  "version-semver": "1.21.1",
-  "port-version": 5,
+  "version-semver": "1.22.0",
   "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"
+  "license": "GPL-2.0-or-later",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4394,7 +4394,7 @@
     },
     "magnum": {
       "baseline": "2020.06",
-      "port-version": 9
+      "port-version": 10
     },
     "magnum-extras": {
       "baseline": "2020.06",
@@ -5101,8 +5101,8 @@
       "port-version": 1
     },
     "openal-soft": {
-      "baseline": "1.21.1",
-      "port-version": 5
+      "baseline": "1.22.0",
+      "port-version": 0
     },
     "openblas": {
       "baseline": "0.3.20",

diff --git a/versions/m-/magnum.json b/versions/m-/magnum.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "13edb110eb5bc10f3591616c0fb64e7bc4b2ce9f",
+      "version-string": "2020.06",
+      "port-version": 10
+    },
     {
       "git-tree": "bb2fc062b29313fd1d23a656464fb3dd2b983370",
       "version-string": "2020.06",

diff --git a/versions/o-/openal-soft.json b/versions/o-/openal-soft.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c3fd33b48248cdb7d2139e14d5ad324d122db4b3",
+      "version-semver": "1.22.0",
+      "port-version": 0
+    },
     {
       "git-tree": "cff63a457841bcacd168775e25794f8245d06cf0",
       "version-semver": "1.21.1",