From 8dcd6ea2b4a5961ae809d2fc2e309c079062f455 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 28 Jan 2025 18:12:32 +0100 Subject: [PATCH 01/11] increment version number to 0.23.17 --- NEWS | 3 +++ android/AndroidManifest.xml | 4 ++-- meson.build | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 1e155b9f4..2d22a1fac 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +ver 0.23.17 (not yet released) +* support libfmt 11.1 + ver 0.23.16 (2024/12/03) * database - fix integer overflows with 64-bit inode numbers diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 3957d5850..0bd959956 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="75" + android:versionName="0.23.17"> diff --git a/meson.build b/meson.build index 605245b2e..9b224670f 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'mpd', ['c', 'cpp'], - version: '0.23.16', + version: '0.23.17', meson_version: '>= 0.56.0', default_options: [ 'c_std=c11', From 1385212572225ea7216ca6a492802eb3bfaaca9e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 12 Sep 2023 10:20:24 +0200 Subject: [PATCH 02/11] io/uring/meson.build: detect liburing with include_type=system This avoids breakages due to `-Wgnu-anonymous-struct`. --- src/io/uring/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/io/uring/meson.build b/src/io/uring/meson.build index 9bfe24654..7a315abaf 100644 --- a/src/io/uring/meson.build +++ b/src/io/uring/meson.build @@ -7,7 +7,9 @@ if host_machine.system() != 'linux' subdir_done() endif -liburing = dependency('liburing', required: get_option('io_uring')) +liburing = dependency('liburing', + include_type: 'system', + required: get_option('io_uring')) uring_features.set('HAVE_URING', liburing.found()) configure_file(output: 'Features.h', configuration: uring_features) From 508bfbe334cbb6f937086c8e0f3c39f3e197c255 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 28 Jan 2025 18:24:41 +0100 Subject: [PATCH 03/11] pipewire/meson.build: add "include_type:system" This suppresses a compiler warning due to sloppy code in PipeWire: /usr/include/spa-0.2/spa/utils/json-core.h:440:29: error: implicit conversion increases floating-point precision: 'float' to 'double' [-Werror,-Wdouble-promotion] 440 | return spa_dtoa(str, size, val); | ~~~~~~~~ ^~~ --- src/lib/pipewire/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/pipewire/meson.build b/src/lib/pipewire/meson.build index 2d6424fdc..76292cafa 100644 --- a/src/lib/pipewire/meson.build +++ b/src/lib/pipewire/meson.build @@ -1,4 +1,6 @@ -pipewire_dep = dependency('libpipewire-0.3', required: get_option('pipewire')) +pipewire_dep = dependency('libpipewire-0.3', + include_type: 'system', + required: get_option('pipewire')) conf.set('ENABLE_PIPEWIRE', pipewire_dep.found()) if not pipewire_dep.found() subdir_done() From 1d8d298a220a1443b230c3bd8c49071cb7fddd6d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 28 Jan 2025 18:11:01 +0100 Subject: [PATCH 04/11] subprojects: update fmt to 11.1.1-2 --- subprojects/fmt.wrap | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/subprojects/fmt.wrap b/subprojects/fmt.wrap index fd508477f..89661cc9c 100644 --- a/subprojects/fmt.wrap +++ b/subprojects/fmt.wrap @@ -1,13 +1,13 @@ [wrap-file] -directory = fmt-11.0.2 -source_url = https://github.com/fmtlib/fmt/archive/11.0.2.tar.gz -source_filename = fmt-11.0.2.tar.gz -source_hash = 6cb1e6d37bdcb756dbbe59be438790db409cdb4868c66e888d5df9f13f7c027f -patch_filename = fmt_11.0.2-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/fmt_11.0.2-1/get_patch -patch_hash = 90c9e3b8e8f29713d40ca949f6f93ad115d78d7fb921064112bc6179e6427c5e -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/fmt_11.0.2-1/fmt-11.0.2.tar.gz -wrapdb_version = 11.0.2-1 +directory = fmt-11.1.1 +source_url = https://github.com/fmtlib/fmt/archive/11.1.1.tar.gz +source_filename = fmt-11.1.1.tar.gz +source_hash = 482eed9efbc98388dbaee5cb5f368be5eca4893456bb358c18b7ff71f835ae43 +patch_filename = fmt_11.1.1-2_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/fmt_11.1.1-2/get_patch +patch_hash = eee2e90d5d43061a0a1f0b9f8eb188c5b8820ef3e1b15e4b8a4eb791ef82b325 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/fmt_11.1.1-2/fmt-11.1.1.tar.gz +wrapdb_version = 11.1.1-2 [provide] fmt = fmt_dep From a5a26d304b1cacbd916309a71e74b5f24517ebec Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 28 Jan 2025 18:11:09 +0100 Subject: [PATCH 05/11] subprojects: update sqlite3 to 3.48.0-1 --- subprojects/sqlite3.wrap | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/subprojects/sqlite3.wrap b/subprojects/sqlite3.wrap index 70410cf3b..1cc2ac410 100644 --- a/subprojects/sqlite3.wrap +++ b/subprojects/sqlite3.wrap @@ -1,13 +1,13 @@ [wrap-file] -directory = sqlite-amalgamation-3470100 -source_url = https://www.sqlite.org/2024/sqlite-amalgamation-3470100.zip -source_filename = sqlite-amalgamation-3470100.zip -source_hash = 9da21e6b14ef6a943cdc30f973df259fb390bb4483f77e7f171b9b6e977e5458 -patch_filename = sqlite3_3.47.1-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/sqlite3_3.47.1-1/get_patch -patch_hash = 7a298e69c663abfccd2d3632c6897b4f90627d36fd7fa137240c1d97c9a86466 -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/sqlite3_3.47.1-1/sqlite-amalgamation-3470100.zip -wrapdb_version = 3.47.1-1 +directory = sqlite-amalgamation-3480000 +source_url = https://www.sqlite.org/2025/sqlite-amalgamation-3480000.zip +source_filename = sqlite-amalgamation-3480000.zip +source_hash = d9a15a42db7c78f88fe3d3c5945acce2f4bfe9e4da9f685cd19f6ea1d40aa884 +patch_filename = sqlite3_3.48.0-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/sqlite3_3.48.0-1/get_patch +patch_hash = c871d65d019e55b372cb6c5878ed9cc496ab5c3ccfb56e4171ab2526970d49b2 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/sqlite3_3.48.0-1/sqlite-amalgamation-3480000.zip +wrapdb_version = 3.48.0-1 [provide] sqlite3 = sqlite3_dep From 9445ea1565792e897962436887f7e8951d3a14d3 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 28 Jan 2025 18:15:44 +0100 Subject: [PATCH 06/11] subprojects: add libnpupnp --- meson.build | 4 ++++ subprojects/.gitignore | 2 ++ subprojects/libnpupnp.wrap | 10 ++++++++++ 3 files changed, 16 insertions(+) create mode 100644 subprojects/libnpupnp.wrap diff --git a/meson.build b/meson.build index 9b224670f..9d93f1579 100644 --- a/meson.build +++ b/meson.build @@ -15,6 +15,8 @@ project( 'expat:default_library=static', 'fmt:default_library=static', 'gtest:default_library=static', + 'libmicrohttpd:default_library=static', + 'libnpupnp:default_library=static', 'sqlite3:default_library=static', 'vorbis:default_library=static', @@ -23,6 +25,8 @@ project( 'expat:warning_level=0', 'fmt:warning_level=0', 'gtest:warning_level=0', + 'libmicrohttpd:warning_level=0', + 'libnpupnp:warning_level=0', 'sqlite3:warning_level=0', 'vorbis:warning_level=0', ], diff --git a/subprojects/.gitignore b/subprojects/.gitignore index 4eb01d547..c8ab8e2f2 100644 --- a/subprojects/.gitignore +++ b/subprojects/.gitignore @@ -4,4 +4,6 @@ /fmt-*/ /googletest-*/ /sqlite-*/ +/libmicrohttpd* +/libnpupnp-*/ /libvorbis-*/ diff --git a/subprojects/libnpupnp.wrap b/subprojects/libnpupnp.wrap new file mode 100644 index 000000000..035fe3409 --- /dev/null +++ b/subprojects/libnpupnp.wrap @@ -0,0 +1,10 @@ +[wrap-file] +directory = libnpupnp-6.2.0 +source_url = https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-6.2.0.tar.gz +source_filename = libnpupnp-6.2.0.tar.gz +source_hash = 1c8101607f32a61f2477f23fa33839aa6d64568a83ca23ba43d430290937251d +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libnpupnp_6.2.0-1/libnpupnp-6.2.0.tar.gz +wrapdb_version = 6.2.0-1 + +[provide] +libnpupnp = libnpupnp_dep From 75a3d9340e932e64bb7dc27663c2beae4669939b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 30 Oct 2024 21:31:16 +0100 Subject: [PATCH 07/11] python/build/libs.py: update FFmpeg to 7.1 --- python/build/libs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python/build/libs.py b/python/build/libs.py index a1456c79d..2d9a752fb 100644 --- a/python/build/libs.py +++ b/python/build/libs.py @@ -156,8 +156,8 @@ gme = CmakeProject( ) ffmpeg = FfmpegProject( - 'http://ffmpeg.org/releases/ffmpeg-6.1.tar.xz', - '488c76e57dd9b3bee901f71d5c95eaf1db4a5a31fe46a28654e837144207c270', + 'http://ffmpeg.org/releases/ffmpeg-7.1.tar.xz', + '40973d44970dbc83ef302b0609f2e74982be2d85916dd2ee7472d30678a7abe6', 'lib/libavcodec.a', [ '--disable-shared', '--enable-static', @@ -422,6 +422,7 @@ ffmpeg = FfmpegProject( '--disable-decoder=kgv1', '--disable-decoder=kmvc', '--disable-decoder=lagarith', + '--disable-decoder=lead', '--disable-decoder=loco', '--disable-decoder=lscr', '--disable-decoder=m101', From 93eb3da48a93dcc0efc21465d09d9fa98dc9446d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 28 Jan 2025 18:28:48 +0100 Subject: [PATCH 08/11] subprojects: add liburing --- meson.build | 2 ++ subprojects/.gitignore | 1 + subprojects/liburing.wrap | 13 +++++++++++++ 3 files changed, 16 insertions(+) create mode 100644 subprojects/liburing.wrap diff --git a/meson.build b/meson.build index 9d93f1579..f9749468b 100644 --- a/meson.build +++ b/meson.build @@ -17,6 +17,7 @@ project( 'gtest:default_library=static', 'libmicrohttpd:default_library=static', 'libnpupnp:default_library=static', + 'liburing:default_library=static', 'sqlite3:default_library=static', 'vorbis:default_library=static', @@ -27,6 +28,7 @@ project( 'gtest:warning_level=0', 'libmicrohttpd:warning_level=0', 'libnpupnp:warning_level=0', + 'liburing:warning_level=0', 'sqlite3:warning_level=0', 'vorbis:warning_level=0', ], diff --git a/subprojects/.gitignore b/subprojects/.gitignore index c8ab8e2f2..24f8cf399 100644 --- a/subprojects/.gitignore +++ b/subprojects/.gitignore @@ -6,4 +6,5 @@ /sqlite-*/ /libmicrohttpd* /libnpupnp-*/ +/liburing-*/ /libvorbis-*/ diff --git a/subprojects/liburing.wrap b/subprojects/liburing.wrap new file mode 100644 index 000000000..00de3a761 --- /dev/null +++ b/subprojects/liburing.wrap @@ -0,0 +1,13 @@ +[wrap-file] +directory = liburing-liburing-2.5 +source_url = https://github.com/axboe/liburing/archive/refs/tags/liburing-2.5.tar.gz +source_filename = liburing-2.5.tar.gz +source_hash = 456f5f882165630f0dc7b75e8fd53bd01a955d5d4720729b4323097e6e9f2a98 +patch_filename = liburing_2.5-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/liburing_2.5-1/get_patch +patch_hash = d72f651e0edd8102535af575d682ce86c3fc2fdabb40b8faa2659d0f7d437f44 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/liburing_2.5-1/liburing-2.5.tar.gz +wrapdb_version = 2.5-1 + +[provide] +dependency_names = liburing From 53090e3745e2cc6e8cc9556a18218e1816c25561 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 28 Jan 2025 18:37:05 +0100 Subject: [PATCH 09/11] .github/workflows/build.yml: update actions/setup-python to v5 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 474ee24d4..3d82623d8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -111,7 +111,7 @@ jobs: with: key: macos - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v5 - name: Install dependencies run: | From e57c60e3d88abe1c9c9fa16c992ccca4fa79e260 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 28 Jan 2025 18:38:55 +0100 Subject: [PATCH 10/11] .github/workflows/build.yml: update hendrikmuhs/ccache-action to v1.2 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d82623d8..751f07563 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: - id: checkout uses: actions/checkout@v2 - id: cache-ccache - uses: hendrikmuhs/ccache-action@v1 + uses: hendrikmuhs/ccache-action@v1.2 with: key: linux - name: Install dependencies @@ -107,7 +107,7 @@ jobs: uses: actions/checkout@v2 - id: cache-ccache - uses: hendrikmuhs/ccache-action@v1 + uses: hendrikmuhs/ccache-action@v1.2 with: key: macos From a0a39ae828bcfeef6242647bd1c47396cdf75423 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 28 Jan 2025 18:39:09 +0100 Subject: [PATCH 11/11] .github/workflows/build.yml: update actions/checkout to v4 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 751f07563..436778636 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: CXX: 'ccache g++-10' steps: - id: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - id: cache-ccache uses: hendrikmuhs/ccache-action@v1.2 with: @@ -104,7 +104,7 @@ jobs: runs-on: macos-latest steps: - id: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - id: cache-ccache uses: hendrikmuhs/ccache-action@v1.2