diff --git a/NEWS b/NEWS index 1efe2729a6..c6a633fad5 100644 --- a/NEWS +++ b/NEWS @@ -16,6 +16,8 @@ ver 0.25 (not yet released) * require Meson 1.2 ver 0.24.9 (not yet released) +* input + - curl: fix build failure after CURL 8.19 API change * database - upnp: refuse to build with libupnp >= 1.14.26 due to API breakage diff --git a/doc/user.rst b/doc/user.rst index 606305edaa..04f7ee87dc 100644 --- a/doc/user.rst +++ b/doc/user.rst @@ -1321,8 +1321,7 @@ ICY-MetaData ------------ Some MP3 streams send information about the current song with a -protocol named `"ICY-MetaData" -`_. +protocol named "ICY-MetaData". :program:`MPD` makes its ``StreamTitle`` value available as ``Title`` tag. diff --git a/python/build/libs.py b/python/build/libs.py index d0bc70e5c0..e3e786fc0f 100644 --- a/python/build/libs.py +++ b/python/build/libs.py @@ -2,7 +2,6 @@ from os.path import abspath from build.project import Project -from build.zlib import ZlibProject from build.cmake import CmakeProject from build.autotools import AutotoolsProject from build.ffmpeg import FfmpegProject @@ -18,11 +17,15 @@ ], ) -zlib = ZlibProject( - ('http://zlib.net/zlib-1.3.1.tar.xz', - 'https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.xz'), - '38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32', - 'lib/libz.a', +zlib = CmakeProject( + ('http://zlib.net/zlib-1.3.2.tar.xz', + 'https://github.com/madler/zlib/releases/download/v1.3.2/zlib-1.3.2.tar.xz'), + 'd7a0654783a4da529d1bb793b7ad9c3318020af77667bcae35f95d0e42a792f3', + 'include/zlib.h', + [ + '-DZLIB_BUILD_TESTING=OFF', + '-DZLIB_BUILD_SHARED=OFF', + ], ) libmodplug = AutotoolsProject( diff --git a/python/build/zlib.py b/python/build/zlib.py deleted file mode 100644 index 41138c8256..0000000000 --- a/python/build/zlib.py +++ /dev/null @@ -1,34 +0,0 @@ -import subprocess -from typing import Optional, Sequence, Union - -from build.makeproject import MakeProject -from .toolchain import AnyToolchain - -class ZlibProject(MakeProject): - def __init__(self, url: Union[str, Sequence[str]], md5: str, installed: str, - **kwargs): - MakeProject.__init__(self, url, md5, installed, **kwargs) - - def get_make_args(self, toolchain: AnyToolchain) -> list[str]: - return MakeProject.get_make_args(self, toolchain) + [ - 'CC=' + toolchain.cc + ' ' + toolchain.cppflags + ' ' + toolchain.cflags, - 'CPP=' + toolchain.cc + ' -E ' + toolchain.cppflags, - 'AR=' + toolchain.ar, - 'ARFLAGS=' + toolchain.arflags, - 'RANLIB=' + toolchain.ranlib, - 'LDSHARED=' + toolchain.cc + ' -shared', - 'libz.a' - ] - - def get_make_install_args(self, toolchain: AnyToolchain) -> list[str]: - return [ - 'RANLIB=' + toolchain.ranlib, - self.install_target - ] - - def _build(self, toolchain: AnyToolchain) -> None: - src = self.unpack(toolchain, out_of_tree=False) - - subprocess.check_call(['./configure', '--prefix=' + toolchain.install_prefix, '--static'], - cwd=src, env=toolchain.env) - self.build_make(toolchain, src) diff --git a/src/lib/curl/Easy.hxx b/src/lib/curl/Easy.hxx index df47862765..390e920fa7 100644 --- a/src/lib/curl/Easy.hxx +++ b/src/lib/curl/Easy.hxx @@ -201,7 +201,7 @@ public: template bool GetInfo(CURLINFO info, T value_r) const noexcept { - return ::curl_easy_getinfo(handle, info, value_r) == CURLE_OK; + return curl_easy_getinfo(handle, info, value_r) == CURLE_OK; } /** @@ -222,7 +222,7 @@ public: } bool Unpause() noexcept { - return ::curl_easy_pause(handle, CURLPAUSE_CONT) == CURLE_OK; + return curl_easy_pause(handle, CURLPAUSE_CONT) == CURLE_OK; } CurlString Escape(const char *string, int length=0) const noexcept { diff --git a/src/memory/HugeAllocator.cxx b/src/memory/HugeAllocator.cxx index a1c797d013..8f3e2fa3a5 100644 --- a/src/memory/HugeAllocator.cxx +++ b/src/memory/HugeAllocator.cxx @@ -34,7 +34,7 @@ HugeFree(std::span p) noexcept void HugeSetName(std::span p, const char *name) noexcept { - SetVmaName(p.data(), p.size(), name); + SetVmaName(p, name); } void diff --git a/src/system/VmaName.hxx b/src/system/VmaName.hxx index 3b8b8b363e..15e488c0a0 100644 --- a/src/system/VmaName.hxx +++ b/src/system/VmaName.hxx @@ -4,6 +4,9 @@ #pragma once +#include // for std::byte +#include + #ifdef __linux__ # include @@ -22,14 +25,14 @@ * This feature requires Linux 5.17. */ inline void -SetVmaName(const void *start, size_t len, const char *name) +SetVmaName(std::span vma, const char *name) { #ifdef __linux__ - prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, (unsigned long)start, len, + prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, + (unsigned long)vma.data(), vma.size(), (unsigned long)name); #else - (void)start; - (void)len; + (void)vma; (void)name; #endif } diff --git a/subprojects/expat.wrap b/subprojects/expat.wrap index d16ba7aba0..a83b6922c5 100644 --- a/subprojects/expat.wrap +++ b/subprojects/expat.wrap @@ -1,13 +1,14 @@ [wrap-file] -directory = expat-2.7.3 -source_url = https://github.com/libexpat/libexpat/releases/download/R_2_7_3/expat-2.7.3.tar.xz -source_filename = expat-2.7.3.tar.bz2 -source_hash = 71df8f40706a7bb0a80a5367079ea75d91da4f8c65c58ec59bcdfbf7decdab9f -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/expat_2.7.3-1/expat-2.7.3.tar.bz2 -patch_filename = expat_2.7.3-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/expat_2.7.3-1/get_patch -patch_hash = e870eb4b2e3c142ce1d18ed24309aa40e07c6c911a4625fa1c6fc493ba18153a -wrapdb_version = 2.7.3-1 +directory = expat-2.7.4 +source_url = https://github.com/libexpat/libexpat/releases/download/R_2_7_4/expat-2.7.4.tar.xz +source_filename = expat-2.7.4.tar.xz +source_hash = 9e9cabb457c1e09de91db2706d8365645792638eb3be1f94dbb2149301086ac0 +source_fallback_url = https://wrapdb.mesonbuild.com/v2/expat_2.7.4-1/get_source/expat-2.7.4.tar.xz +patch_filename = expat_2.7.4-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/expat_2.7.4-1/get_patch +patch_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/expat_2.7.4-1/expat_2.7.4-1_patch.zip +patch_hash = 7bcf8e279b4403bc68b7d22929fd51d4c2397dee0ccb8dbf7cfc4f7ed302aecb +wrapdb_version = 2.7.4-1 [provide] -expat = expat_dep +dependency_names = expat diff --git a/subprojects/liburing.wrap b/subprojects/liburing.wrap index 6de545a219..a483dd9556 100644 --- a/subprojects/liburing.wrap +++ b/subprojects/liburing.wrap @@ -1,13 +1,14 @@ [wrap-file] -directory = liburing-liburing-2.12 -source_url = https://github.com/axboe/liburing/archive/refs/tags/liburing-2.12.tar.gz -source_filename = liburing-2.12.tar.gz -source_hash = f1d10cb058c97c953b4c0c446b11e9177e8c8b32a5a88b309f23fdd389e26370 -patch_filename = liburing_2.12-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/liburing_2.12-1/get_patch -patch_hash = b21f90196008cde9ed242571a71d8302c703272a2f8b91edd589bd8d6abea47a -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/liburing_2.12-1/liburing-2.12.tar.gz -wrapdb_version = 2.12-1 +directory = liburing-liburing-2.14 +source_url = https://github.com/axboe/liburing/archive/refs/tags/liburing-2.14.tar.gz +source_filename = liburing-2.14.tar.gz +source_hash = 5f80964108981c6ad979c735f0b4877d5f49914c2a062f8e88282f26bf61de0c +source_fallback_url = https://wrapdb.mesonbuild.com/v2/liburing_2.14-1/get_source/liburing-2.14.tar.gz +patch_filename = liburing_2.14-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/liburing_2.14-1/get_patch +patch_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/liburing_2.14-1/liburing_2.14-1_patch.zip +patch_hash = 4d0ba8f507c25c4fb9a31507a5c06d2a6c253822828084a0101e2bea27dba62a +wrapdb_version = 2.14-1 [provide] dependency_names = liburing