Skip to content

Commit 177ffde

Browse files
committed
Merge branch 'v0.23.x'
2 parents 0d1fb9a + a0a39ae commit 177ffde

File tree

5 files changed

+25
-20
lines changed

5 files changed

+25
-20
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
libgcrypt20-dev
103103
104104
- id: cache-ccache
105-
uses: hendrikmuhs/ccache-action@v1
105+
uses: hendrikmuhs/ccache-action@v1.2
106106
with:
107107
key: ${{ matrix.compiler }}
108108

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ ver 0.24 (not yet released)
7070
* documentation: switch to sphinx-rtd-theme
7171
* require Meson 1.0
7272

73+
ver 0.23.17 (not yet released)
74+
* support libfmt 11.1
75+
7376
ver 0.23.16 (2024/12/03)
7477
* database
7578
- fix integer overflows with 64-bit inode numbers

src/lib/pipewire/meson.build

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
pipewire_dep = dependency('libpipewire-0.3', required: get_option('pipewire'))
1+
pipewire_dep = dependency('libpipewire-0.3',
2+
include_type: 'system',
3+
required: get_option('pipewire'))
24
conf.set('ENABLE_PIPEWIRE', pipewire_dep.found())
35
if not pipewire_dep.found()
46
subdir_done()

subprojects/fmt.wrap

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[wrap-file]
2-
directory = fmt-11.0.2
3-
source_url = https://github.com/fmtlib/fmt/archive/11.0.2.tar.gz
4-
source_filename = fmt-11.0.2.tar.gz
5-
source_hash = 6cb1e6d37bdcb756dbbe59be438790db409cdb4868c66e888d5df9f13f7c027f
6-
patch_filename = fmt_11.0.2-1_patch.zip
7-
patch_url = https://wrapdb.mesonbuild.com/v2/fmt_11.0.2-1/get_patch
8-
patch_hash = 90c9e3b8e8f29713d40ca949f6f93ad115d78d7fb921064112bc6179e6427c5e
9-
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/fmt_11.0.2-1/fmt-11.0.2.tar.gz
10-
wrapdb_version = 11.0.2-1
2+
directory = fmt-11.1.1
3+
source_url = https://github.com/fmtlib/fmt/archive/11.1.1.tar.gz
4+
source_filename = fmt-11.1.1.tar.gz
5+
source_hash = 482eed9efbc98388dbaee5cb5f368be5eca4893456bb358c18b7ff71f835ae43
6+
patch_filename = fmt_11.1.1-2_patch.zip
7+
patch_url = https://wrapdb.mesonbuild.com/v2/fmt_11.1.1-2/get_patch
8+
patch_hash = eee2e90d5d43061a0a1f0b9f8eb188c5b8820ef3e1b15e4b8a4eb791ef82b325
9+
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/fmt_11.1.1-2/fmt-11.1.1.tar.gz
10+
wrapdb_version = 11.1.1-2
1111

1212
[provide]
1313
fmt = fmt_dep

subprojects/sqlite3.wrap

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[wrap-file]
2-
directory = sqlite-amalgamation-3470100
3-
source_url = https://www.sqlite.org/2024/sqlite-amalgamation-3470100.zip
4-
source_filename = sqlite-amalgamation-3470100.zip
5-
source_hash = 9da21e6b14ef6a943cdc30f973df259fb390bb4483f77e7f171b9b6e977e5458
6-
patch_filename = sqlite3_3.47.1-1_patch.zip
7-
patch_url = https://wrapdb.mesonbuild.com/v2/sqlite3_3.47.1-1/get_patch
8-
patch_hash = 7a298e69c663abfccd2d3632c6897b4f90627d36fd7fa137240c1d97c9a86466
9-
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/sqlite3_3.47.1-1/sqlite-amalgamation-3470100.zip
10-
wrapdb_version = 3.47.1-1
2+
directory = sqlite-amalgamation-3480000
3+
source_url = https://www.sqlite.org/2025/sqlite-amalgamation-3480000.zip
4+
source_filename = sqlite-amalgamation-3480000.zip
5+
source_hash = d9a15a42db7c78f88fe3d3c5945acce2f4bfe9e4da9f685cd19f6ea1d40aa884
6+
patch_filename = sqlite3_3.48.0-1_patch.zip
7+
patch_url = https://wrapdb.mesonbuild.com/v2/sqlite3_3.48.0-1/get_patch
8+
patch_hash = c871d65d019e55b372cb6c5878ed9cc496ab5c3ccfb56e4171ab2526970d49b2
9+
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/sqlite3_3.48.0-1/sqlite-amalgamation-3480000.zip
10+
wrapdb_version = 3.48.0-1
1111

1212
[provide]
1313
sqlite3 = sqlite3_dep

0 commit comments

Comments
 (0)