From 4f11fa0d419af1c911e2dd5caa9d8e6ebe7e4027 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 17 Jan 2020 14:58:40 +0100 Subject: [PATCH 01/10] config/File: allow overriding top-level settings in includes Remove the error message and instead erase the old setting if the "repeatable" flag is not set. https://github.com/MusicPlayerDaemon/MPD/issues/684 --- NEWS | 2 ++ src/config/File.cxx | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index e7c38ca97..7cd878032 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ ver 0.21.19 (not yet released) +* configuration + - allow overriding top-level settings in includes * output - pulse: obey Pulse's maximum sample rate (fixes DSD128 playback) * fix build failure with clang 10 diff --git a/src/config/File.cxx b/src/config/File.cxx index b0361bc6b..269ea8419 100644 --- a/src/config/File.cxx +++ b/src/config/File.cxx @@ -153,11 +153,9 @@ ReadConfigParam(ConfigData &config_data, BufferedReader &reader, name, reader.GetLineNumber()); if (!option.repeatable) - if (const auto *param = config_data.GetParam(o)) - throw FormatRuntimeError("config parameter \"%s\" is first defined " - "on line %d and redefined on line %u\n", - name, param->line, - reader.GetLineNumber()); + /* if the option is not repeatable, override the old + value by removing it first */ + config_data.GetParamList(o).clear(); /* now parse the block or the value */ From 75dc9506c29dbf62446d7c9f8f8dd269922a14ea Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 17 Jan 2020 15:16:20 +0100 Subject: [PATCH 02/10] python/build/libs.py: update libmpdclient to 2.17 --- 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 fea21a282..85e8c1c23 100644 --- a/python/build/libs.py +++ b/python/build/libs.py @@ -9,8 +9,8 @@ from build.ffmpeg import FfmpegProject from build.boost import BoostProject libmpdclient = MesonProject( - 'https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.16.tar.xz', - 'fa6bdab67c0e0490302b38f00c27b4959735c3ec8aef7a88327adb1407654464', + 'https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.17.tar.xz', + 'ee9b8f1c7e95b65c8f18a354daf7b16bfcd455fc52a0f3b5abe402316bce3559', 'lib/libmpdclient.a', ) From 2190cc7927c7b354cf434d04f8c228507ea2b4bd Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 17 Jan 2020 15:17:21 +0100 Subject: [PATCH 03/10] python/build/libs.py: update FLAC to 1.3.3 --- 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 85e8c1c23..24cc8659c 100644 --- a/python/build/libs.py +++ b/python/build/libs.py @@ -52,8 +52,8 @@ opus = AutotoolsProject( ) flac = AutotoolsProject( - 'http://downloads.xiph.org/releases/flac/flac-1.3.2.tar.xz', - '91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f', + 'http://downloads.xiph.org/releases/flac/flac-1.3.3.tar.xz', + '213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748', 'lib/libFLAC.a', [ '--disable-shared', '--enable-static', From 7059215795569ac95fea0fff11a368daff4dee4a Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 17 Jan 2020 15:19:00 +0100 Subject: [PATCH 04/10] python/build/libs.py: update FFmpeg to 4.2.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 24cc8659c..301d7beff 100644 --- a/python/build/libs.py +++ b/python/build/libs.py @@ -112,8 +112,8 @@ liblame = AutotoolsProject( ) ffmpeg = FfmpegProject( - 'http://ffmpeg.org/releases/ffmpeg-4.2.1.tar.xz', - 'cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4', + 'http://ffmpeg.org/releases/ffmpeg-4.2.2.tar.xz', + 'cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c', 'lib/libavcodec.a', [ '--disable-shared', '--enable-static', From 61784c214450d54948511acd1d10a8e1596ffc97 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 17 Jan 2020 15:19:46 +0100 Subject: [PATCH 05/10] python/build/libs.py: update CURL to 7.68.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 301d7beff..48fc6100d 100644 --- a/python/build/libs.py +++ b/python/build/libs.py @@ -341,8 +341,8 @@ ffmpeg = FfmpegProject( ) curl = AutotoolsProject( - 'http://curl.haxx.se/download/curl-7.66.0.tar.xz', - 'dbb48088193016d079b97c5c3efde8efa56ada2ebf336e8a97d04eb8e2ed98c1', + 'http://curl.haxx.se/download/curl-7.68.0.tar.xz', + 'b724240722276a27f6e770b952121a3afd097129d8c9fe18e6272dc34192035a', 'lib/libcurl.a', [ '--disable-shared', '--enable-static', From 9d02103ebe409550c6896e2064c2f22f36a25917 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 17 Jan 2020 15:29:51 +0100 Subject: [PATCH 06/10] python/build/libs.py: disable various CURL features we don't use --- python/build/libs.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python/build/libs.py b/python/build/libs.py index 48fc6100d..8fc8a6bd5 100644 --- a/python/build/libs.py +++ b/python/build/libs.py @@ -358,6 +358,11 @@ curl = AutotoolsProject( '--disable-manual', '--disable-threaded-resolver', '--disable-verbose', '--disable-sspi', '--disable-crypto-auth', '--disable-ntlm-wb', '--disable-tls-srp', '--disable-cookies', + '--disable-doh', + '--disable-mime', + '--disable-netrc', + '--disable-progress-meter', + '--disable-alt-svc', '--without-ssl', '--without-gnutls', '--without-nss', '--without-libssh2', ], From aed0d13591b44432eca3c70d97964a6986689cdd Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 17 Jan 2020 15:20:54 +0100 Subject: [PATCH 07/10] python/build/libs.py: update expat to 2.2.9 --- 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 8fc8a6bd5..b364370dc 100644 --- a/python/build/libs.py +++ b/python/build/libs.py @@ -370,8 +370,8 @@ curl = AutotoolsProject( ) libexpat = AutotoolsProject( - 'https://github.com/libexpat/libexpat/releases/download/R_2_2_7/expat-2.2.7.tar.bz2', - 'cbc9102f4a31a8dafd42d642e9a3aa31e79a0aedaa1f6efd2795ebc83174ec18', + 'https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.bz2', + 'f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237', 'lib/libexpat.a', [ '--disable-shared', '--enable-static', From b8614048d4ee8b3b2b23bf32524efb425f77109d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 17 Jan 2020 15:21:39 +0100 Subject: [PATCH 08/10] python/build/libs.py: update Boost to 1.72.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 b364370dc..7c317d46a 100644 --- a/python/build/libs.py +++ b/python/build/libs.py @@ -397,7 +397,7 @@ libnfs = AutotoolsProject( ) boost = BoostProject( - 'https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2', - 'd73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee', + 'https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2', + '59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722', 'include/boost/version.hpp', ) From ac1b844c1588fcb816d7aa896d0c405d82b7a39b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 17 Jan 2020 15:48:43 +0100 Subject: [PATCH 09/10] android/AndroidManifest.xml: increase targetSdkVersion to 28 Google Play refuses uploads with a lower targetSdkVersion. --- android/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index d1bcefc02..25c755885 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -5,7 +5,7 @@ android:versionCode="42" android:versionName="0.21.19"> - + From 4013fa15b9dd43b6711e0f5493e2c55c8b6caa2b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 17 Jan 2020 15:49:02 +0100 Subject: [PATCH 10/10] release v0.21.19 --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 7cd878032..3a7acd6cc 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -ver 0.21.19 (not yet released) +ver 0.21.19 (2020/01/17) * configuration - allow overriding top-level settings in includes * output