From 42eb69f46f7950862cd175b0a36f4fa531429ba8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 4 Feb 2020 22:06:51 +0100 Subject: [PATCH 1/5] test/meson.build: restore -Wno-missing-declarations for GTest This is still needed for GTest 1.8.0 (Travis / Ubuntu Bionic). --- test/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/test/meson.build b/test/meson.build index 5818da55d..4e3fbab49 100644 --- a/test/meson.build +++ b/test/meson.build @@ -6,6 +6,7 @@ if compiler.get_id() == 'gcc' gtest_compile_args += [ '-Wno-suggest-attribute=format', '-Wno-suggest-attribute=noreturn', + '-Wno-missing-declarations', ] endif From 5397d18ed9680a4d09427dffcd2f994a31828ea5 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 10 Feb 2020 09:18:37 +0100 Subject: [PATCH 2/5] protocol/ArgParser: cast seek offset to SignedSongTime "The issue is that ParseCommandArgSignedSongTime parses with SongTime::FromS, not SignedSongTime::FromS, before casting back to a SignedSongTime for the return. With x86 overflow rules this doesn't matter, but on ARM the first cast turns negative values to zero." Closes https://github.com/MusicPlayerDaemon/MPD/issues/757 --- NEWS | 1 + src/protocol/ArgParser.cxx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 32a4eed6e..92204f996 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ ver 0.21.20 (not yet released) - audiofile, ffmpeg, sndfile: handle MIME type "audio/wav" - ffmpeg: fix playback of AIFF and TTA - vorbis, opus: fix seeking in small files +* fix backwards seeking on ARM (and other non-x86 CPUs) ver 0.21.19 (2020/01/17) * configuration diff --git a/src/protocol/ArgParser.cxx b/src/protocol/ArgParser.cxx index b162c1984..fdd2b4a5d 100644 --- a/src/protocol/ArgParser.cxx +++ b/src/protocol/ArgParser.cxx @@ -175,5 +175,5 @@ SignedSongTime ParseCommandArgSignedSongTime(const char *s) { auto value = ParseCommandArgFloat(s); - return SongTime::FromS(value); + return SignedSongTime::FromS(value); } From 050e30418c07a8e6fb7dfa6e15308e1711e18bd5 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 2 Feb 2020 20:27:13 -0800 Subject: [PATCH 3/5] Fix travis pip is bugged on arm64 and s390x. Add --no-cache-dir to fix. For consistency, it doesn't hurt to add everywhere. --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index c349c993c..4c458e066 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,9 @@ matrix: - ninja-build before_install: - wget https://bootstrap.pypa.io/get-pip.py - - /usr/bin/python3.6 get-pip.py --user + - /usr/bin/python3.6 get-pip.py --user --no-cache-dir install: - - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson + - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir env: - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH" @@ -39,9 +39,9 @@ matrix: - ninja-build before_install: - wget https://bootstrap.pypa.io/get-pip.py - - /usr/bin/python3.6 get-pip.py --user + - /usr/bin/python3.6 get-pip.py --user --no-cache-dir install: - - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson + - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir env: - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH" @@ -61,9 +61,9 @@ matrix: - ninja-build before_install: - wget https://bootstrap.pypa.io/get-pip.py - - /usr/bin/python3.6 get-pip.py --user + - /usr/bin/python3.6 get-pip.py --user --no-cache-dir install: - - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson + - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir env: - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH" @@ -86,9 +86,9 @@ matrix: - ninja-build before_install: - wget https://bootstrap.pypa.io/get-pip.py - - /usr/bin/python3.6 get-pip.py --user + - /usr/bin/python3.6 get-pip.py --user --no-cache-dir install: - - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson + - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir env: # use gold as workaround for https://sourceware.org/bugzilla/show_bug.cgi?id=17068 - MATRIX_EVAL="export CC='ccache gcc-6' CXX='ccache g++-6' LDFLAGS=-fuse-ld=gold PATH=\$HOME/.local/bin:\$PATH" @@ -112,9 +112,9 @@ matrix: - ninja-build before_install: - wget https://bootstrap.pypa.io/get-pip.py - - /usr/bin/python3.6 get-pip.py --user + - /usr/bin/python3.6 get-pip.py --user --no-cache-dir install: - - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson + - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson --no-cache-dir env: # use gold as workaround for https://sourceware.org/bugzilla/show_bug.cgi?id=17068 - MATRIX_EVAL="export CC='ccache gcc-8' CXX='ccache g++-8' LDFLAGS=-fuse-ld=gold PATH=\$HOME/.local/bin:\$PATH" From 89800324cba3294644cd264ab36301ed4c6a58f2 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 16 Feb 2020 20:19:17 +0100 Subject: [PATCH 4/5] .travis.yml: use GTest 1.8.0 instead of HEAD Fixes strange C++11 compatibility problems during GTest installation: /tmp/gtest-20200216-20679-mu1044/googletest/include/gtest/internal/gtest-internal.h:1249:1: error: unknown type name 'constexpr' constexpr bool TypedTestCaseIsDeprecated() { return true; } /tmp/gtest-20200216-20679-mu1044/googletest/include/gtest/internal/gtest-internal.h:1249:11: error: expected unqualified-id constexpr bool TypedTestCaseIsDeprecated() { return true; } /tmp/gtest-20200216-20679-mu1044/googletest/include/gtest/internal/gtest-internal.h:1254:1: error: unknown type name 'constexpr' constexpr bool RegisterTypedTestCase_P_IsDeprecated() { return true; } --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4c458e066..c62d7e244 100644 --- a/.travis.yml +++ b/.travis.yml @@ -148,7 +148,7 @@ install: # belonging to nss. You can unlink it" during gtest install - test "$TRAVIS_OS_NAME" != "osx" || brew unlink nss - - test "$TRAVIS_OS_NAME" != "osx" || brew install --HEAD https://gist.githubusercontent.com/Kronuz/96ac10fbd8472eb1e7566d740c4034f8/raw/gtest.rb + - test "$TRAVIS_OS_NAME" != "osx" || brew install https://gist.githubusercontent.com/Kronuz/96ac10fbd8472eb1e7566d740c4034f8/raw/gtest.rb before_script: - ccache -s From f24bcc7f427e3c1728fc6929dc867a74bdd22e12 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 16 Feb 2020 20:43:35 +0100 Subject: [PATCH 5/5] release v0.21.20 --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 92204f996..b6e6dff7b 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -ver 0.21.20 (not yet released) +ver 0.21.20 (2020/02/16) * decoder - audiofile, ffmpeg, sndfile: handle MIME type "audio/wav" - ffmpeg: fix playback of AIFF and TTA