diff --git a/NEWS b/NEWS index 0a2ea338e..6ea828dfc 100644 --- a/NEWS +++ b/NEWS @@ -24,6 +24,11 @@ ver 0.24 (not yet released) * static partition configuration * remove Haiku support +ver 0.23.11 (not yet released) +* macOS: fix build failure "no archive members specified" +* Android/Windows + - update OpenSSL to 3.0.7 + ver 0.23.10 (2022/10/14) * storage - curl: fix file time stamps diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 33c51c4da..41320212f 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="70" + android:versionName="0.23.11"> diff --git a/doc/conf.py b/doc/conf.py index 404436f5a..bc9730504 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -38,7 +38,10 @@ author = 'Max Kellermann' # built documents. # # The short X.Y version. -version = '0.24' +with open('../meson.build') as f: + import re + version = re.match(r"project\([^\)]*\bversion:\s*'([^']+)'", + f.read(4096)).group(1) # The full version, including alpha/beta/rc tags. release = version + '~git' @@ -47,7 +50,7 @@ release = version + '~git' # # This is also used if you do content translation via gettext catalogs. # Usually you set "language" from the command line for these cases. -language = None +language = "en" # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: diff --git a/doc/index.rst b/doc/index.rst index c9555de48..49b96a2b2 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -11,6 +11,12 @@ Music Player Daemon client protocol +.. toctree:: + :maxdepth: 1 + :caption: man pages: + + mpd.1 + mpd.conf.5 Indices and tables ================== diff --git a/doc/plugins.rst b/doc/plugins.rst index cb110842a..7ba3f1f63 100644 --- a/doc/plugins.rst +++ b/doc/plugins.rst @@ -219,8 +219,9 @@ Opens remote files or streams over HTTP using libcurl. Note that unless overridden by the below settings (e.g. by setting them to a blank value), general curl configuration from environment -variables such as ``http_proxy`` or specified in :file:`~/.curlrc` -will be in effect. +variables such as ``http_proxy`` will be in effect. + +User name and password are read from an optional :file:`~/.netrc`, :file:`~/.curlrc` is not read. .. list-table:: :widths: 20 70 10 diff --git a/python/build/libs.py b/python/build/libs.py index abe48996b..f50e164c6 100644 --- a/python/build/libs.py +++ b/python/build/libs.py @@ -43,8 +43,8 @@ opus = AutotoolsProject( ) flac = AutotoolsProject( - 'http://downloads.xiph.org/releases/flac/flac-1.4.0.tar.xz', - 'af41c0733c93c237c3e52f64dd87e3b0d9af38259f1c7d11e8cbf583c48c2506', + 'http://downloads.xiph.org/releases/flac/flac-1.4.2.tar.xz', + 'e322d58a1f48d23d9dd38f432672865f6f79e73a6f9cc5a5f57fcaa83eb5a8e4', 'lib/libFLAC.a', [ '--disable-shared', '--enable-static', @@ -387,14 +387,14 @@ ffmpeg = FfmpegProject( ) openssl = OpenSSLProject( - 'https://www.openssl.org/source/openssl-3.0.5.tar.gz', - 'aa7d8d9bef71ad6525c55ba11e5f4397889ce49c2c9349dcea6d3e4f0b024a7a', + 'https://www.openssl.org/source/openssl-3.0.7.tar.gz', + '83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e', 'include/openssl/ossl_typ.h', ) curl = CmakeProject( - 'https://curl.se/download/curl-7.85.0.tar.xz', - '88b54a6d4b9a48cb4d873c7056dcba997ddd5b7be5a2d537a4acb55c20b04be6', + 'https://curl.se/download/curl-7.86.0.tar.xz', + '2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b', 'lib/libcurl.a', [ '-DBUILD_CURL_EXE=OFF', diff --git a/src/archive/plugins/meson.build b/src/archive/plugins/meson.build index f4ef98b65..ff58a3acc 100644 --- a/src/archive/plugins/meson.build +++ b/src/archive/plugins/meson.build @@ -22,6 +22,10 @@ if libzzip_dep.found() found_archive_plugin = true endif +if not found_archive_plugin + subdir_done() +endif + archive_plugins = static_library( 'archive_plugins', archive_plugins_sources,