From 5781f223f6b307a3b0b5ae776fd2504825871dba Mon Sep 17 00:00:00 2001 From: jcorporation Date: Tue, 18 Oct 2022 22:39:01 +0200 Subject: [PATCH 01/10] Document curl plugin .netrc and .curlrc behavior --- doc/plugins.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/plugins.rst b/doc/plugins.rst index 0aa36dac8..7e6fe5765 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 80 From 44ef34db88818bbaf78bb617b024fc7eac9ca571 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 20 Oct 2022 19:08:26 +0200 Subject: [PATCH 02/10] doc/conf.py: read version number from meson.build --- doc/conf.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/conf.py b/doc/conf.py index 0c50cecb7..95474259e 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -38,7 +38,9 @@ author = 'Max Kellermann' # built documents. # # The short X.Y version. -version = '0.23.10' +with open('../meson.build') as f: + import re + version = re.match(r".*version:\s*'([^']+)'", f.readline()).group(1) # The full version, including alpha/beta/rc tags. #release = version + '~git' From 8c9d7bf07ef9e48edad534e780836da19af88948 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 20 Oct 2022 19:08:50 +0200 Subject: [PATCH 03/10] increment version number to 0.23.11 --- NEWS | 2 ++ android/AndroidManifest.xml | 4 ++-- meson.build | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 40408061c..1757244d1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +ver 0.23.11 (not yet released) + 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/meson.build b/meson.build index e02b06971..c7cb2d74f 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'mpd', ['c', 'cpp'], - version: '0.23.10', + version: '0.23.11', meson_version: '>= 0.56.0', default_options: [ 'c_std=c11', From 01c9c4507fb2cd21d8b345dc4de5e0b0652f731e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 3 Nov 2022 10:22:15 +0100 Subject: [PATCH 04/10] python/build/libs.py: update OpenSSL to 3.0.7 Punycode hooray! --- NEWS | 2 ++ python/build/libs.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 1757244d1..0e136c7e0 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ ver 0.23.11 (not yet released) +* Android/Windows + - update OpenSSL to 3.0.7 ver 0.23.10 (2022/10/14) * storage diff --git a/python/build/libs.py b/python/build/libs.py index abe48996b..949e745ed 100644 --- a/python/build/libs.py +++ b/python/build/libs.py @@ -387,8 +387,8 @@ 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', ) From c549e16ed148cf38ab46cf5363deb3fda2975451 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 3 Nov 2022 10:23:20 +0100 Subject: [PATCH 05/10] python/build/libs.py: update CURL to 7.86.0 --- python/build/libs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/build/libs.py b/python/build/libs.py index 949e745ed..7c01ae9ae 100644 --- a/python/build/libs.py +++ b/python/build/libs.py @@ -393,8 +393,8 @@ openssl = OpenSSLProject( ) 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', From 619bb60b267f1e350ed3aefbf3cdf02a7803a34b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 3 Nov 2022 10:26:25 +0100 Subject: [PATCH 06/10] python/build/libs.py: update FLAC to 1.4.2 --- python/build/libs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/build/libs.py b/python/build/libs.py index 7c01ae9ae..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', From 1944c826bca98b0b278f46e3a37a74388ffd596f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 3 Nov 2022 20:32:52 +0100 Subject: [PATCH 07/10] doc/conf.py: fix version regular expression Commit 44ef34db88818bbaf78bb617b024fc7eac9ca571 was broken. --- doc/conf.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/conf.py b/doc/conf.py index 95474259e..248505869 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -40,7 +40,8 @@ author = 'Max Kellermann' # The short X.Y version. with open('../meson.build') as f: import re - version = re.match(r".*version:\s*'([^']+)'", f.readline()).group(1) + version = re.match(r"project\([^\)]*\bversion:\s*'([^']+)'", + f.read(4096)).group(1) # The full version, including alpha/beta/rc tags. #release = version + '~git' From 32bddfabea39136f07b7f0ec8b8b00c89a470e6f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 3 Nov 2022 20:34:35 +0100 Subject: [PATCH 08/10] archive/plugins/meson.build: do not generate empty library If no archive library was found, return from the "plugins" directory without creating "libarchive_plugins.a". Empty static libraries are unsupported on some operating systems such as macOS. Closes https://github.com/MusicPlayerDaemon/MPD/issues/1650 --- NEWS | 1 + src/archive/plugins/meson.build | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/NEWS b/NEWS index 0e136c7e0..d3e2ed88a 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,5 @@ ver 0.23.11 (not yet released) +* macOS: fix build failure "no archive members specified" * Android/Windows - update OpenSSL to 3.0.7 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, From 6f283b52ab22fd4dd693acc3f18e2953528b0a2b Mon Sep 17 00:00:00 2001 From: gd Date: Tue, 25 Oct 2022 20:00:24 +0300 Subject: [PATCH 09/10] doc/conf.py: set language = 'en' to suppress warning: Invalid configuration value found --- doc/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/conf.py b/doc/conf.py index 248505869..9a438b3ee 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -50,7 +50,7 @@ with open('../meson.build') as f: # # 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: From e7bfd32ccc5bfdd8b07d329419f4f4522be7f41f Mon Sep 17 00:00:00 2001 From: gd Date: Tue, 25 Oct 2022 20:04:33 +0300 Subject: [PATCH 10/10] doc/index.rst: added man pages links to suppress warnings: document isn't included in any toctree --- doc/index.rst | 6 ++++++ 1 file changed, 6 insertions(+) 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 ==================