From 63aa65e65b9d2c08772ea15d25fb8fdb0d32e557 Mon Sep 17 00:00:00 2001 From: Edoardo Lolletti Date: Thu, 12 Aug 2021 04:42:28 +0200 Subject: [openal-soft] enable coreaudio backend for ios (#19464) * [openal-soft] enable coreaudio backend for ios * update port version * Merge cmake checks * Rename outdated cmake variable * Update version files --- ports/openal-soft/portfile.cmake | 8 ++++---- ports/openal-soft/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openal-soft.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake index 09090baba..79ea4a0c7 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -18,7 +18,7 @@ endif() set(ALSOFT_REQUIRE_LINUX OFF) set(ALSOFT_REQUIRE_WINDOWS OFF) -set(ALSOFT_REQUIRE_OSX OFF) +set(ALSOFT_REQUIRE_APPLE OFF) if(VCPKG_TARGET_IS_LINUX) set(ALSOFT_REQUIRE_LINUX ON) @@ -26,8 +26,8 @@ endif() if(VCPKG_TARGET_IS_WINDOWS) set(ALSOFT_REQUIRE_WINDOWS ON) endif() -if(VCPKG_TARGET_IS_OSX) - set(ALSOFT_REQUIRE_OSX ON) +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) + set(ALSOFT_REQUIRE_APPLE ON) endif() vcpkg_configure_cmake( @@ -46,7 +46,7 @@ vcpkg_configure_cmake( -DALSOFT_BACKEND_SNDIO=OFF -DALSOFT_BACKEND_PORTAUDIO=OFF -DALSOFT_BACKEND_PULSEAUDIO=OFF - -DALSOFT_BACKEND_COREAUDIO=${ALSOFT_REQUIRE_OSX} + -DALSOFT_BACKEND_COREAUDIO=${ALSOFT_REQUIRE_APPLE} -DALSOFT_BACKEND_JACK=OFF -DALSOFT_BACKEND_OPENSL=OFF -DALSOFT_BACKEND_WAVE=ON diff --git a/ports/openal-soft/vcpkg.json b/ports/openal-soft/vcpkg.json index 6783a1bed..c96c68a3c 100644 --- a/ports/openal-soft/vcpkg.json +++ b/ports/openal-soft/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openal-soft", "version-semver": "1.21.1", - "port-version": 1, + "port-version": 2, "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" diff --git a/versions/baseline.json b/versions/baseline.json index 02fa424c7..b52840b02 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4582,7 +4582,7 @@ }, "openal-soft": { "baseline": "1.21.1", - "port-version": 1 + "port-version": 2 }, "openblas": { "baseline": "0.3.15", diff --git a/versions/o-/openal-soft.json b/versions/o-/openal-soft.json index 0b2d40ef9..9a6e6a3ed 100644 --- a/versions/o-/openal-soft.json +++ b/versions/o-/openal-soft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b1e7ccf10631bcb24825e8742bf18de9c561e71", + "version-semver": "1.21.1", + "port-version": 2 + }, { "git-tree": "cb266fe5f02b9d2b5cb38343d25083359062bd07", "version-semver": "1.21.1", -- cgit v1.2.3