[sfml] update to 2.6.2 (#42118)

This commit is contained in:
jim wang 2024-11-14 10:06:25 +00:00 committed by GitHub
parent b36dc82016
commit df6921c0b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 41 additions and 5 deletions

View File

@ -0,0 +1,28 @@
diff --git a/cmake/SFMLConfigDependencies.cmake.in b/cmake/SFMLConfigDependencies.cmake.in
index ef96827..864b32e 100644
--- a/cmake/SFMLConfigDependencies.cmake.in
+++ b/cmake/SFMLConfigDependencies.cmake.in
@@ -75,6 +75,8 @@ if(SFML_STATIC_LIBRARIES)
# sfml-audio
list(FIND SFML_FIND_COMPONENTS "audio" FIND_SFML_AUDIO_COMPONENT_INDEX)
if(FIND_SFML_AUDIO_COMPONENT_INDEX GREATER -1)
+ find_dependency(OpenAL)
+ set(OpenAL_LIB OpenAL::OpenAL)
sfml_bind_dependency(TARGET OpenAL FRIENDLY_NAME "OpenAL" SEARCH_NAMES "OpenAL" "openal" "openal32")
if (NOT FIND_SFML_OS_IOS)
sfml_bind_dependency(TARGET VORBIS FRIENDLY_NAME "VorbisFile" SEARCH_NAMES "vorbisfile")
diff --git a/src/SFML/Audio/CMakeLists.txt b/src/SFML/Audio/CMakeLists.txt
index 8158365..3ebaf90 100644
--- a/src/SFML/Audio/CMakeLists.txt
+++ b/src/SFML/Audio/CMakeLists.txt
@@ -68,7 +68,9 @@ elseif(SFML_OS_ANDROID)
endif()
# find external libraries
-find_package(OpenAL REQUIRED)
+find_package(OpenAL CONFIG REQUIRED)
+set(OpenAL_LIB OpenAL::OpenAL)
+sfml_find_package(OpenAL LINK OpenAL_LIB)
sfml_find_package(VORBIS INCLUDE "VORBIS_INCLUDE_DIRS" LINK "VORBIS_LIBRARIES")
sfml_find_package(FLAC INCLUDE "FLAC_INCLUDE_DIR" LINK "FLAC_LIBRARY")

View File

@ -2,9 +2,10 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
REPO SFML/SFML REPO SFML/SFML
REF "${VERSION}" REF "${VERSION}"
HEAD_REF master HEAD_REF master
SHA512 b376d3b00277ed60d107fe1268c210749b3aafcee618a8f924b181a9b476e92b9cb9baddecf70a8913b5910c471d53ea0260a876ad7b2db2b98b944d9f508714 SHA512 d8a8bee3aa9acda4609104c2a9d4a2512e4be6d6e85fd4b24c287c03f60cfb888e669e61bfac4113dae35f0c3492559b65b3453baf38766d8c0223d9ab77aada
PATCHES PATCHES
fix-dependencies.patch fix-dependencies.patch
fix-dep-openal.patch
) )
# The embedded FindFreetype doesn't properly handle debug libraries # The embedded FindFreetype doesn't properly handle debug libraries
@ -32,6 +33,9 @@ vcpkg_cmake_configure(
-DSFML_GENERATE_PDB=OFF -DSFML_GENERATE_PDB=OFF
-DSFML_WARNINGS_AS_ERRORS=OFF #Remove in the next version -DSFML_WARNINGS_AS_ERRORS=OFF #Remove in the next version
${FEATURE_OPTIONS} ${FEATURE_OPTIONS}
MAYBE_UNUSED_VARIABLES
SFML_MISC_INSTALL_PREFIX
SFML_WARNINGS_AS_ERRORS
) )
vcpkg_cmake_install() vcpkg_cmake_install()

View File

@ -1,7 +1,6 @@
{ {
"name": "sfml", "name": "sfml",
"version": "2.6.1", "version": "2.6.2",
"port-version": 1,
"description": "Simple and fast multimedia library", "description": "Simple and fast multimedia library",
"homepage": "https://github.com/SFML/SFML", "homepage": "https://github.com/SFML/SFML",
"license": "Zlib", "license": "Zlib",

View File

@ -8301,8 +8301,8 @@
"port-version": 6 "port-version": 6
}, },
"sfml": { "sfml": {
"baseline": "2.6.1", "baseline": "2.6.2",
"port-version": 1 "port-version": 0
}, },
"sfsexp": { "sfsexp": {
"baseline": "1.4.1", "baseline": "1.4.1",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "16580cf264c6a8933fb657e425a5866568d4c394",
"version": "2.6.2",
"port-version": 0
},
{ {
"git-tree": "4c609b9803b2a442437fac0e707f18df8544810a", "git-tree": "4c609b9803b2a442437fac0e707f18df8544810a",
"version": "2.6.1", "version": "2.6.1",