Mirrors/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2026-01-18 01:11:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

[portaudio] Fix linker errors due to duplicate GUID symbols (#48461)

Browse Source
This commit is contained in:
Tom M.
2025-11-25 18:47:50 +01:00
committed by GitHub
parent 26f4cade19
commit 9aee6e968f
5 changed files with 73 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
ports/portaudio/fix-guid-linker-errors.patch Normal file
View File

@@ -0,0 +1,65 @@
From bf5d562f6e35d2aa2d264e92f90666484212a88e Mon Sep 17 00:00:00 2001
From: invertego <invertego@users.noreply.github.com>
Date: Mon, 2 Oct 2023 16:44:48 -0700
Subject: [PATCH 1/2] wdmks: declare GUIDs with selectany attribute
Match the behavior of guiddef.h in both mingw and the Windows SDK
headers. This prevents linking errors caused by multiply defined symbols
when linking against certain Windows SDK libs (like dxguid.lib).
---
src/hostapi/wdmks/pa_win_wdmks.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/hostapi/wdmks/pa_win_wdmks.c b/src/hostapi/wdmks/pa_win_wdmks.c
index bafc970d3..5d2a98743 100644
--- a/src/hostapi/wdmks/pa_win_wdmks.c
+++ b/src/hostapi/wdmks/pa_win_wdmks.c
@@ -165,11 +165,11 @@ Default is to use the pin category.
#define _NTRTL_ /* Turn off default definition of DEFINE_GUIDEX */
#undef DEFINE_GUID
#if defined(__clang__) || (defined(_MSVC_TRADITIONAL) && !_MSVC_TRADITIONAL) /* clang-cl and new msvc preprocessor: avoid too many arguments error */
- #define DEFINE_GUID(n, ...) EXTERN_C const GUID n = {__VA_ARGS__}
+ #define DEFINE_GUID(n, ...) EXTERN_C const GUID DECLSPEC_SELECTANY n = {__VA_ARGS__}
#define DEFINE_GUID_THUNK(n, ...) DEFINE_GUID(n, __VA_ARGS__)
#define DEFINE_GUIDEX(n) DEFINE_GUID_THUNK(n, STATIC_##n)
#else
- #define DEFINE_GUID(n, data) EXTERN_C const GUID n = {data}
+ #define DEFINE_GUID(n, data) EXTERN_C const GUID DECLSPEC_SELECTANY n = {data}
#define DEFINE_GUID_THUNK(n, data) DEFINE_GUID(n, data)
#define DEFINE_GUIDEX(n) DEFINE_GUID_THUNK(n, STATIC_##n)
#endif /* __clang__, !_MSVC_TRADITIONAL */
From 63c6e189cafd6f184797776077a141809ef8cf0e Mon Sep 17 00:00:00 2001
From: Ross Bencina <rossb@audiomulch.com>
Date: Sat, 7 Oct 2023 09:49:19 +1100
Subject: [PATCH 2/2] Make sure this works even if DECLSPEC_SELECTANY is not
defined
---
src/hostapi/wdmks/pa_win_wdmks.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/hostapi/wdmks/pa_win_wdmks.c b/src/hostapi/wdmks/pa_win_wdmks.c
index 5d2a98743..36cb396a8 100644
--- a/src/hostapi/wdmks/pa_win_wdmks.c
+++ b/src/hostapi/wdmks/pa_win_wdmks.c
@@ -164,12 +164,17 @@ Default is to use the pin category.
#define DYNAMIC_GUID(data) {data}
#define _NTRTL_ /* Turn off default definition of DEFINE_GUIDEX */
#undef DEFINE_GUID
+#ifdef DECLSPEC_SELECTANY
+#define PA_DECLSPEC_SELECTANY DECLSPEC_SELECTANY
+#else
+#define PA_DECLSPEC_SELECTANY
+#endif
#if defined(__clang__) || (defined(_MSVC_TRADITIONAL) && !_MSVC_TRADITIONAL) /* clang-cl and new msvc preprocessor: avoid too many arguments error */
- #define DEFINE_GUID(n, ...) EXTERN_C const GUID DECLSPEC_SELECTANY n = {__VA_ARGS__}
+ #define DEFINE_GUID(n, ...) EXTERN_C const GUID PA_DECLSPEC_SELECTANY n = {__VA_ARGS__}
#define DEFINE_GUID_THUNK(n, ...) DEFINE_GUID(n, __VA_ARGS__)
#define DEFINE_GUIDEX(n) DEFINE_GUID_THUNK(n, STATIC_##n)
#else
- #define DEFINE_GUID(n, data) EXTERN_C const GUID DECLSPEC_SELECTANY n = {data}
+ #define DEFINE_GUID(n, data) EXTERN_C const GUID PA_DECLSPEC_SELECTANY n = {data}
#define DEFINE_GUID_THUNK(n, data) DEFINE_GUID(n, data)
#define DEFINE_GUIDEX(n) DEFINE_GUID_THUNK(n, STATIC_##n)
#endif /* __clang__, !_MSVC_TRADITIONAL */

1
ports/portaudio/portfile.cmake
View File

@@ -5,6 +5,7 @@ vcpkg_from_github(
SHA512 0f56e5f5b004f51915f29771b8fc1fe886f1fef5d65ab5ea1db43f43c49917476b9eec14b36aa54d3e9fb4d8bdf61e68c79624d00b7e548d4c493395a758233a
PATCHES
jack.diff
fix-guid-linker-errors.patch
)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" PA_DLL_LINK_WITH_STATIC_RUNTIME)

2
ports/portaudio/vcpkg.json
View File

@@ -1,7 +1,7 @@
{
"name": "portaudio",
"version": "19.7",
"port-version": 7,
"port-version": 8,
"description": "PortAudio Portable Cross-platform Audio I/O API PortAudio is a free, cross-platform, open-source, audio I/O library. It lets you write simple audio programs in 'C' or C++ that will compile and run on many platforms including Windows, Macintosh OS X, and Unix (OSS/ALSA). It is intended to promote the exchange of audio software between developers on different platforms. Many applications use PortAudio for Audio I/O.",
"homepage": "https://www.portaudio.com",
"license": "MIT",

2
versions/baseline.json
View File

@@ -7702,7 +7702,7 @@
},
"portaudio": {
"baseline": "19.7",
"port-version": 7
"port-version": 8
},
"portmidi": {
"baseline": "2.0.6",

5
versions/p-/portaudio.json
View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "47dce0abd35ae2790f4fa16d09279a80f601db93",
"version": "19.7",
"port-version": 8
},
{
"git-tree": "a0dea3aa03b2c63b924f0c068cd21b6a30a6ada5",
"version": "19.7",