[openal-soft] Update to 1.24.0

This commit is contained in:
Darryl Pogue 2024-11-16 14:21:29 -08:00
parent b2cb0da531
commit 93e69f5f84
No known key found for this signature in database
GPG Key ID: CB824715C3E6FD41
5 changed files with 9 additions and 61 deletions

View File

@ -1,54 +0,0 @@
From c12ada68951ea67a59bef7d4fcdf22334990c12a Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Tue, 4 Jul 2023 11:30:18 -0700
Subject: [PATCH] Don't use an import target for OpenSL
---
CMakeLists.txt | 3 ++-
cmake/FindOpenSL.cmake | 12 +++++-------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34fd33122..af25a96c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1183,7 +1183,8 @@ if(ALSOFT_BACKEND_OPENSL)
set(HAVE_OPENSL 1)
set(ALC_OBJS ${ALC_OBJS} alc/backends/opensl.cpp alc/backends/opensl.h)
set(BACKENDS "${BACKENDS} OpenSL,")
- set(EXTRA_LIBS "OpenSL::OpenSLES" ${EXTRA_LIBS})
+ set(EXTRA_LIBS ${OPENSL_LIBRARIES} ${EXTRA_LIBS})
+ set(INC_PATHS ${INC_PATHS} ${OPENSL_INCLUDE_DIRS})
endif()
endif()
if(ALSOFT_REQUIRE_OPENSL AND NOT HAVE_OPENSL)
diff --git a/cmake/FindOpenSL.cmake b/cmake/FindOpenSL.cmake
index 004287494..3df54d447 100644
--- a/cmake/FindOpenSL.cmake
+++ b/cmake/FindOpenSL.cmake
@@ -2,8 +2,9 @@
# Find the OpenSL libraries
#
# This module defines the following variables and targets:
-# OPENSL_FOUND - True if OPENSL was found
-# OpenSL::OpenSLES - The OpenSLES target
+# OPENSL_FOUND - True if OPENSL was found
+# OPENSL_INCLUDE_DIRS - The OpenSL include paths
+# OPENSL_LIBRARIES - The OpenSL libraries to link
#
#=============================================================================
@@ -53,11 +54,8 @@ find_package_handle_standard_args(OpenSL REQUIRED_VARS OPENSL_LIBRARY OPENSL_INC
OPENSL_ANDROID_INCLUDE_DIR)
if(OPENSL_FOUND)
- add_library(OpenSL::OpenSLES UNKNOWN IMPORTED)
- set_target_properties(OpenSL::OpenSLES PROPERTIES
- IMPORTED_LOCATION ${OPENSL_LIBRARY}
- INTERFACE_INCLUDE_DIRECTORIES ${OPENSL_INCLUDE_DIR}
- INTERFACE_INCLUDE_DIRECTORIES ${OPENSL_ANDROID_INCLUDE_DIR})
+ set(OPENSL_LIBRARIES ${OPENSL_LIBRARY})
+ set(OPENSL_INCLUDE_DIRS ${OPENSL_INCLUDE_DIR} ${OPENSL_ANDROID_INCLUDE_DIR})
endif()
mark_as_advanced(OPENSL_INCLUDE_DIR OPENSL_ANDROID_INCLUDE_DIR OPENSL_LIBRARY)

View File

@ -2,10 +2,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO kcat/openal-soft
REF ${VERSION}
SHA512 21f768484978e4321b733004988cb5ecf43d908e7e08f2d421a338633fcfb2ade722d035de73742470ff135ab538d6b9b56df14020976adb1d1e081dfb095c6b
SHA512 6fdb5e02f4d4e2d483bccf69121dda9b691170e88d301f53b5e3b3ab196541d7b0b23a868acdf85f6dacac9d8508079f67cb7d733e186a13a66ee70ecdd813f0
HEAD_REF master
PATCHES
c12ada68951ea67a59bef7d4fcdf22334990c12a.patch # Merged upstream, remove in next version
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

View File

@ -1,7 +1,6 @@
{
"name": "openal-soft",
"version": "1.23.1",
"port-version": 2,
"version": "1.24.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",
"license": "LGPL-2.0-or-later",

View File

@ -6613,8 +6613,8 @@
"port-version": 0
},
"openal-soft": {
"baseline": "1.23.1",
"port-version": 2
"baseline": "1.24.0",
"port-version": 0
},
"openblas": {
"baseline": "0.3.28",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2b482beb61cdbceccce64e1810264a1eae63cc2a",
"version": "1.24.0",
"port-version": 0
},
{
"git-tree": "f6ba0a57ee95816ceac7fc3b882bdcc6029591cb",
"version": "1.23.1",