Skip to content

Commit

Permalink
deps: update openal to 1.24.2
Browse files Browse the repository at this point in the history
  • Loading branch information
alexey-lysiuk committed Jan 12, 2025
1 parent 56fa196 commit e0f442d
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 16 deletions.
5 changes: 5 additions & 0 deletions deps/openal/include/AL/alext.h
Original file line number Diff line number Diff line change
Expand Up @@ -1079,6 +1079,11 @@ ALenum AL_APIENTRY EAXGetBufferModeDirect(ALCcontext *context, ALuint buffer, AL
#endif
#endif

#ifndef AL_SOFT_bformat_hoa
#define AL_SOFT_bformat_hoa
#define AL_UNPACK_AMBISONIC_ORDER_SOFT 0x199D
#endif

#ifdef __cplusplus
}
#endif
Expand Down
2 changes: 1 addition & 1 deletion deps/openal/lib/cmake/OpenAL/OpenALConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ set(OPENAL_FOUND ON)
set(OPENAL_INCLUDE_DIR $<TARGET_PROPERTY:OpenAL::OpenAL,INTERFACE_INCLUDE_DIRECTORIES>)
set(OPENAL_LIBRARY $<LINK_ONLY:OpenAL::OpenAL>)
set(OPENAL_DEFINITIONS $<TARGET_PROPERTY:OpenAL::OpenAL,INTERFACE_COMPILE_DEFINITIONS>)
set(OPENAL_VERSION_STRING 1.24.1)
set(OPENAL_VERSION_STRING 1.24.2)
28 changes: 14 additions & 14 deletions deps/openal/lib/cmake/OpenAL/OpenALTargets.cmake
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Generated by CMake

if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
message(FATAL_ERROR "CMake >= 2.8.0 required")
message(FATAL_ERROR "CMake >= 2.8.12 required")
endif()
if(CMAKE_VERSION VERSION_LESS "2.8.3")
message(FATAL_ERROR "CMake >= 2.8.3 required")
if(CMAKE_VERSION VERSION_LESS "2.8.12")
message(FATAL_ERROR "CMake >= 2.8.12 required")
endif()
cmake_policy(PUSH)
cmake_policy(VERSION 2.8.3...3.23)
cmake_policy(VERSION 2.8.12...3.29)
#----------------------------------------------------------------
# Generated CMake target import file.
#----------------------------------------------------------------
Expand Down Expand Up @@ -61,13 +61,9 @@ add_library(OpenAL::OpenAL STATIC IMPORTED)
set_target_properties(OpenAL::OpenAL PROPERTIES
INTERFACE_COMPILE_DEFINITIONS "AL_LIBTYPE_STATIC"
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include/AL;${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include/AL"
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:-pthread>;-Wl,-framework,AudioToolbox;-Wl,-framework,AudioUnit,-framework,ApplicationServices;-Wl,-framework,CoreAudio;\$<LINK_ONLY:dl>;\$<LINK_ONLY:m>"
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:-pthread>;-Wl,-framework,AudioToolbox;-Wl,-framework,AudioUnit,-framework,ApplicationServices;-Wl,-framework,CoreAudio;\$<LINK_ONLY:dl>;\$<LINK_ONLY:m>;\$<LINK_ONLY:>"
)

if(CMAKE_VERSION VERSION_LESS 2.8.12)
message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
endif()

# Load information for each installed configuration.
file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/OpenALTargets-*.cmake")
foreach(_cmake_config_file IN LISTS _cmake_config_files)
Expand All @@ -81,9 +77,12 @@ set(_IMPORT_PREFIX)

# Loop over all imported files and verify that they actually exist
foreach(_cmake_target IN LISTS _cmake_import_check_targets)
foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
if(NOT EXISTS "${_cmake_file}")
message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
if(CMAKE_VERSION VERSION_LESS "3.28"
OR NOT DEFINED _cmake_import_check_xcframework_for_${_cmake_target}
OR NOT IS_DIRECTORY "${_cmake_import_check_xcframework_for_${_cmake_target}}")
foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
if(NOT EXISTS "${_cmake_file}")
message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
\"${_cmake_file}\"
but this file does not exist. Possible reasons include:
* The file was deleted, renamed, or moved to another location.
Expand All @@ -92,8 +91,9 @@ but this file does not exist. Possible reasons include:
\"${CMAKE_CURRENT_LIST_FILE}\"
but not all the files it references.
")
endif()
endforeach()
endif()
endforeach()
endif()
unset(_cmake_file)
unset("_cmake_import_check_files_for_${_cmake_target}")
endforeach()
Expand Down
Binary file modified deps/openal/lib/libopenal.a
Binary file not shown.
2 changes: 1 addition & 1 deletion deps/openal/lib/pkgconfig/openal.pc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ includedir=${prefix}/include
Name: OpenAL
Description: OpenAL is a cross-platform 3D audio API
Requires:
Version: 1.24.1
Version: 1.24.2
Libs: -L${libdir} -lopenal
Libs.private: -pthread -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit,-framework,ApplicationServices -Wl,-framework,CoreAudio -ldl -lm
Cflags: -I${includedir} -I${includedir}/AL -DAL_LIBTYPE_STATIC

0 comments on commit e0f442d

Please sign in to comment.