openal-soft: bump version and dependencies

conan-io · Nov 18, 2023 · ebc8930 · ebc8930
1 parent d513925
commit ebc8930
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 103 deletions.
diff --git a/recipes/openal-soft/all/conandata.yml b/recipes/openal-soft/all/conandata.yml
@@ -1,13 +1,13 @@
 sources:
+  "1.23.1":
+    url: "https://openal-soft.org/openal-releases/openal-soft-1.23.1.tar.bz2"
+    sha256: "796f4b89134c4e57270b7f0d755f0fa3435b90da437b745160a49bd41c845b21"
   "1.22.2":
     url: "https://openal-soft.org/openal-releases/openal-soft-1.22.2.tar.bz2"
     sha256: "ae94cc95cda76b7cc6e92e38c2531af82148e76d3d88ce996e2928a1ea7c3d20"
   "1.21.1":
     url: "https://openal-soft.org/openal-releases/openal-soft-1.21.1.tar.bz2"
     sha256: "c8ad767e9a3230df66756a21cc8ebf218a9d47288f2514014832204e666af5d8"
-  "1.21.0":
-    url: "https://openal-soft.org/openal-releases/openal-soft-1.21.0.tar.bz2"
-    sha256: "2916b4fc24e23b0271ce0b3468832ad8b6d8441b1830215b28cc4fee6cc89297"
   "1.20.1":
     url: "https://openal-soft.org/openal-releases/openal-soft-1.20.1.tar.bz2"
     sha256: "b6ceb051325732c23f5c8b6d37dbd89534517e6439a87e970882b447c3025d6d"
@@ -17,12 +17,7 @@ sources:
 patches:
   "1.22.2":
     - patch_file: "patches/1.22.2-0001-fix-al-optional-in-if-compile-error.patch"
-  "1.21.0":
-    - patch_file: "patches/1.21.0-0001-c++14-does-not-have-std-aligned_alloc.patch"
-    - patch_file: "patches/1.21.0-0002-fix-windows-sdk.patch"
-      patch_description: "Avoid explicitly searching for the WindowsSDK"
-      patch_type: "portability"
-      patch_source: "https://github.com/kcat/openal-soft/commit/13698362f1726326ab60180b04a86df79b518614"
+      patch_source: "https://github.com/kcat/openal-soft/commit/650a6d49e9a511d005171940761f6dd6b440ee66"
   "1.20.1":
     - patch_file: "patches/1.20.1-0001-fix-windows-sdk.patch"
       patch_description: "Avoid explicitly searching for the WindowsSDK"

diff --git a/recipes/openal-soft/all/conanfile.py b/recipes/openal-soft/all/conanfile.py
@@ -66,8 +66,8 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        if self.settings.os == "Linux":
-            self.requires("libalsa/1.2.7.2")
+        if self.settings.os in ["Linux", "FreeBSD"]:
+            self.requires("libalsa/1.2.10")
 
     def validate(self):
         if self._openal_cxx_backend:

diff --git a/recipes/openal-soft/all/patches/1.21.0-0001-c++14-does-not-have-std-aligned_alloc.patch b/recipes/openal-soft/all/patches/1.21.0-0001-c++14-does-not-have-std-aligned_alloc.patch
diff --git a/recipes/openal-soft/all/patches/1.21.0-0002-fix-windows-sdk.patch b/recipes/openal-soft/all/patches/1.21.0-0002-fix-windows-sdk.patch
diff --git a/recipes/openal-soft/config.yml b/recipes/openal-soft/config.yml
@@ -1,10 +1,10 @@
 versions:
+  "1.23.1":
+    folder: all
   "1.22.2":
     folder: all
   "1.21.1":
     folder: all
-  "1.21.0":
-    folder: all
   "1.20.1":
     folder: all
   "1.19.1":