Skip to content

Commit 0de3675

Browse files
committed
[openal-soft] Fix compatibility with fmt 12.2.0
1 parent 95392cb commit 0de3675

5 files changed

Lines changed: 62 additions & 2 deletions

File tree

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
diff --git a/alc/alc.cpp b/alc/alc.cpp
2+
index 729f91ec4..d10d186be 100644
3+
--- a/alc/alc.cpp
4+
+++ b/alc/alc.cpp
5+
@@ -104,7 +104,7 @@
6+
#include "effects/base.h"
7+
#include "export_list.h"
8+
#include "flexarray.h"
9+
-#include "fmt/core.h"
10+
+#include "fmt/format.h"
11+
#include "fmt/ranges.h"
12+
#include "gsl/gsl"
13+
#include "inprogext.h"
14+
diff --git a/alc/backends/pipewire.cpp b/alc/backends/pipewire.cpp
15+
index 7f925db5d..855a6d89e 100644
16+
--- a/alc/backends/pipewire.cpp
17+
+++ b/alc/backends/pipewire.cpp
18+
@@ -54,7 +54,7 @@
19+
#include "core/helpers.h"
20+
#include "core/logging.h"
21+
#include "dynload.h"
22+
-#include "fmt/core.h"
23+
+#include "fmt/format.h"
24+
#include "fmt/ranges.h"
25+
#include "gsl/gsl"
26+
#include "opthelpers.h"
27+
diff --git a/common/pffft.cpp b/common/pffft.cpp
28+
index 8dc965064..82a471cdb 100644
29+
--- a/common/pffft.cpp
30+
+++ b/common/pffft.cpp
31+
@@ -74,7 +74,7 @@
32+
33+
#include "almalloc.h"
34+
#include "alnumeric.h"
35+
-#include "fmt/core.h"
36+
+#include "fmt/format.h"
37+
#include "fmt/ranges.h"
38+
#include "gsl/gsl"
39+
#include "opthelpers.h"
40+
diff --git a/core/hrtf_loader.cpp b/core/hrtf_loader.cpp
41+
index 3582964ac..3ffa48a32 100644
42+
--- a/core/hrtf_loader.cpp
43+
+++ b/core/hrtf_loader.cpp
44+
@@ -13,8 +13,9 @@
45+
46+
#include "alformat.hpp"
47+
#include "alnumeric.h"
48+
-#include "fmt/core.h"
49+
+#include "fmt/format.h"
50+
#include "fmt/ranges.h"
51+
+#include "fmt/std.h"
52+
#include "gsl/gsl"
53+
#include "hrtf.h"
54+
#include "logging.h"

ports/openal-soft/portfile.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ vcpkg_from_github(
77
PATCHES
88
pkgconfig-cxx.diff
99
devendor-fmt.diff
10+
fix-fmt-header.patch
1011
)
1112

1213
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

ports/openal-soft/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "openal-soft",
33
"version": "1.25.1",
4-
"port-version": 1,
4+
"port-version": 2,
55
"description": "OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.",
66
"homepage": "https://github.com/kcat/openal-soft",
77
"license": "LGPL-2.0-or-later",

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7342,7 +7342,7 @@
73427342
},
73437343
"openal-soft": {
73447344
"baseline": "1.25.1",
7345-
"port-version": 1
7345+
"port-version": 2
73467346
},
73477347
"openblas": {
73487348
"baseline": "0.3.33",

versions/o-/openal-soft.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "35d7e2a2f7dfc87f25ee7d95b8063d31090653f2",
5+
"version": "1.25.1",
6+
"port-version": 2
7+
},
38
{
49
"git-tree": "ba7a19e35c8e759b284e01ec32c03c499f154181",
510
"version": "1.25.1",

0 commit comments

Comments
 (0)