From 2464990fbb45df8488bb52525f17f07424b86873 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 19 Sep 2022 21:41:57 +0200 Subject: [PATCH] [openal-soft] fix mingw x86 build (#26816) --- ports/openal-soft/0001-fix-mingw-x86-build.patch | 13 +++++++++++++ ports/openal-soft/portfile.cmake | 4 ++++ ports/openal-soft/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openal-soft.json | 5 +++++ 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 ports/openal-soft/0001-fix-mingw-x86-build.patch diff --git a/ports/openal-soft/0001-fix-mingw-x86-build.patch b/ports/openal-soft/0001-fix-mingw-x86-build.patch new file mode 100644 index 0000000000..a63002a4e2 --- /dev/null +++ b/ports/openal-soft/0001-fix-mingw-x86-build.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1984ac9..0d1690a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -472,7 +472,7 @@ if(CMAKE_SIZEOF_VOID_P MATCHES "4" AND HAVE_SSE2) + # assumes the stack is suitably aligned. Older Linux code or other + # OSs don't guarantee this on 32-bit, so externally-callable + # functions need to ensure an aligned stack. +- set(EXPORT_DECL "${EXPORT_DECL} __attribute__((force_align_arg_pointer))") ++ set(EXPORT_DECL "${EXPORT_DECL}__attribute__((force_align_arg_pointer))") + endif() + endif() + endif() diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake index fa6fb6e3f3..43218d0fdd 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF dc83d99c95a42c960150ddeee06c124134b52208 # openal-soft-1.22.2 SHA512 3fbbdfbb2609ef8187d20ce74b2fb8082037288f3fd80df71d360705d8efdadfe8f62811af1cd824cb6572c8c3479b370f8ae3819b8b8bb0b20c34f7a73cc530 HEAD_REF master + PATCHES + 0001-fix-mingw-x86-build.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -75,6 +77,8 @@ vcpkg_cmake_configure( ALSOFT_CONFIG ALSOFT_CPUEXT_NEON ALSOFT_HRTF_DEFS + ALSOFT_BACKEND_WINMM + ALSOFT_BACKEND_DSOUND CMAKE_DISABLE_FIND_PACKAGE_WindowsSDK ) diff --git a/ports/openal-soft/vcpkg.json b/ports/openal-soft/vcpkg.json index b6a1a169a7..43aac0e8d0 100644 --- a/ports/openal-soft/vcpkg.json +++ b/ports/openal-soft/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openal-soft", "version-semver": "1.22.2", - "port-version": 3, + "port-version": 4, "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": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 1f7c75677c..37380ee4c5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5266,7 +5266,7 @@ }, "openal-soft": { "baseline": "1.22.2", - "port-version": 3 + "port-version": 4 }, "openblas": { "baseline": "0.3.21", diff --git a/versions/o-/openal-soft.json b/versions/o-/openal-soft.json index fcc1028c60..41556162e7 100644 --- a/versions/o-/openal-soft.json +++ b/versions/o-/openal-soft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f028dc8de3d983f0844c0b586c1b6ddfad5d899", + "version-semver": "1.22.2", + "port-version": 4 + }, { "git-tree": "a0e8008cd2061bcaeaf0ed725438edae4386aac1", "version-semver": "1.22.2",