From b01edcb9bc5d8c884013240b00be053f30efa56c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 17 May 2017 15:27:40 +0200 Subject: [PATCH 01/11] .travis.yml: indent 2 --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index cea4e765d..1e45f37fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,16 +2,16 @@ dist: trusty language: cpp addons: - apt: - packages: - - libcppunit-dev - - libboost-dev + apt: + packages: + - libcppunit-dev + - libboost-dev os: - - linux + - linux compiler: - - gcc + - gcc before_install: # C++14 @@ -25,7 +25,7 @@ install: - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 90 script: - - ./autogen.sh - - ./configure --enable-test - - make - - make check + - ./autogen.sh + - ./configure --enable-test + - make + - make check From 40e2a703d0046d5e5da3e1ab4f5211fa0b40b375 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 17 May 2017 15:36:59 +0200 Subject: [PATCH 02/11] .travis.yml: parallel build --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1e45f37fb..a8435faf3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,10 @@ addons: os: - linux +env: + global: + - MAKEFLAGS="-j2" + compiler: - gcc From 78faee8c7cb4e4b24256d42e8df8e48e1ffc0b52 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 17 May 2017 15:55:57 +0200 Subject: [PATCH 03/11] .travis.yml: choose compiler with environment variables .. and not update-alternatives, which requires "sudo". --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a8435faf3..27a17c4eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,10 +25,9 @@ before_install: install: # C++14 - sudo apt-get install -qq g++-5 - - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 90 - - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 90 script: + - export CC=gcc-5 CXX=g++-5 - ./autogen.sh - ./configure --enable-test - make From b31bd37a303027b5b7fd99cab5549eddd4c222d8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 17 May 2017 15:55:25 +0200 Subject: [PATCH 04/11] .travis.yml: check $TRAVIS_OS_NAME Prepare for Mac OS X support by omitting those Ubuntu-specific commands. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 27a17c4eb..b03fb7f23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,15 +19,15 @@ compiler: before_install: # C++14 - - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - - sudo apt-get update -qq + - test "$TRAVIS_OS_NAME" != "linux" || sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test + - test "$TRAVIS_OS_NAME" != "linux" || sudo apt-get update -qq install: # C++14 - - sudo apt-get install -qq g++-5 + - test "$TRAVIS_OS_NAME" != "linux" || sudo apt-get install -qq g++-5 script: - - export CC=gcc-5 CXX=g++-5 + - test "$TRAVIS_OS_NAME" != "linux" || export CC=gcc-5 CXX=g++-5 - ./autogen.sh - ./configure --enable-test - make From 6d023c4df3d35daa01ca5ab8de83b01661e09fc5 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 17 May 2017 16:22:19 +0200 Subject: [PATCH 05/11] .travis.yml: remove the unnecessary "compiler" setting --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b03fb7f23..ba237cfa3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,6 @@ env: global: - MAKEFLAGS="-j2" -compiler: - - gcc - before_install: # C++14 - test "$TRAVIS_OS_NAME" != "linux" || sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test From ffa676f577a202f3b78b69a52cf327fa095541be Mon Sep 17 00:00:00 2001 From: Mario Di Raimondo Date: Fri, 19 May 2017 11:28:22 +0200 Subject: [PATCH 06/11] playlist/m3u: support for mime-type `audio-mpegurl` for M3U playlists --- NEWS | 2 ++ src/playlist/plugins/ExtM3uPlaylistPlugin.cxx | 1 + src/playlist/plugins/M3uPlaylistPlugin.cxx | 1 + 3 files changed, 4 insertions(+) diff --git a/NEWS b/NEWS index f3bc7a04f..9e858b4c6 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ ver 0.20.8 (not yet released) * output - osx: fix build failure due to missing "noexcept" +* playlist + - m3u: support MIME type `audio/mpegurl` * fix build failure with GCC 4.x ver 0.20.7 (2017/05/15) diff --git a/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx b/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx index 751eff4c3..9f1faa04f 100644 --- a/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx +++ b/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx @@ -146,6 +146,7 @@ static const char *const extm3u_suffixes[] = { static const char *const extm3u_mime_types[] = { "audio/x-mpegurl", + "audio/mpegurl", nullptr }; diff --git a/src/playlist/plugins/M3uPlaylistPlugin.cxx b/src/playlist/plugins/M3uPlaylistPlugin.cxx index c504b97dd..b76181805 100644 --- a/src/playlist/plugins/M3uPlaylistPlugin.cxx +++ b/src/playlist/plugins/M3uPlaylistPlugin.cxx @@ -66,6 +66,7 @@ static const char *const m3u_suffixes[] = { static const char *const m3u_mime_types[] = { "audio/x-mpegurl", + "audio/mpegurl", nullptr }; From ca23b15f5cd1f4eed0ec2482e3e6e3d225bd6832 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 19 May 2017 19:45:38 +0200 Subject: [PATCH 07/11] test/test_byte_reverse: move "alignas" attribute to the front Apparently, this makes old clang versions happy ("'alignas' attribute cannot be applied to types). --- test/test_byte_reverse.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/test_byte_reverse.cxx b/test/test_byte_reverse.cxx index 3643e07af..f884e1fbe 100644 --- a/test/test_byte_reverse.cxx +++ b/test/test_byte_reverse.cxx @@ -49,9 +49,9 @@ CPPUNIT_TEST_SUITE_REGISTRATION(ByteReverseTest); void ByteReverseTest::TestByteReverse2() { - static const char src[] alignas(uint16_t) = "123456"; + alignas(uint16_t) static const char src[] = "123456"; static const char result[] = "214365"; - static uint8_t dest[ARRAY_SIZE(src)] alignas(uint16_t); + alignas(uint16_t)static uint8_t dest[ARRAY_SIZE(src)]; reverse_bytes(dest, (const uint8_t *)src, (const uint8_t *)(src + ARRAY_SIZE(src) - 1), 2); @@ -73,9 +73,9 @@ ByteReverseTest::TestByteReverse3() void ByteReverseTest::TestByteReverse4() { - static const char src[] alignas(uint32_t) = "12345678"; + alignas(uint32_t) static const char src[] = "12345678"; static const char result[] = "43218765"; - static uint8_t dest[ARRAY_SIZE(src)] alignas(uint32_t); + alignas(uint32_t) static uint8_t dest[ARRAY_SIZE(src)]; reverse_bytes(dest, (const uint8_t *)src, (const uint8_t *)(src + ARRAY_SIZE(src) - 1), 4); From 9939904b0296989f940ec851d3a7fc18c5ab5628 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 19 May 2017 19:30:33 +0200 Subject: [PATCH 08/11] .travis.yml: configure with --disable-silent-rules --disable-dependency-tracking --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ba237cfa3..01cf3580c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,6 @@ install: script: - test "$TRAVIS_OS_NAME" != "linux" || export CC=gcc-5 CXX=g++-5 - ./autogen.sh - - ./configure --enable-test + - ./configure --disable-silent-rules --disable-dependency-tracking --enable-test - make - make check From d19e7db09e040efc78c70a2ccee3a35b4b654c4b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 19 May 2017 19:34:25 +0200 Subject: [PATCH 09/11] .travis.yml: add shell variable OPTIONS --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 01cf3580c..84e17880c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,8 +24,9 @@ install: - test "$TRAVIS_OS_NAME" != "linux" || sudo apt-get install -qq g++-5 script: + - OPTIONS="--enable-test" - test "$TRAVIS_OS_NAME" != "linux" || export CC=gcc-5 CXX=g++-5 - ./autogen.sh - - ./configure --disable-silent-rules --disable-dependency-tracking --enable-test + - ./configure --disable-silent-rules --disable-dependency-tracking $OPTIONS - make - make check From b90c48b50f8291d9063eb216e61786831fccf322 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 17 May 2017 16:54:02 +0200 Subject: [PATCH 10/11] .travis.yml: enable Mac OS X --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 84e17880c..f8823c024 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ addons: os: - linux + - osx env: global: @@ -18,14 +19,17 @@ before_install: # C++14 - test "$TRAVIS_OS_NAME" != "linux" || sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - test "$TRAVIS_OS_NAME" != "linux" || sudo apt-get update -qq + - test "$TRAVIS_OS_NAME" != "osx" || brew update install: # C++14 - test "$TRAVIS_OS_NAME" != "linux" || sudo apt-get install -qq g++-5 + - test "$TRAVIS_OS_NAME" != "osx" || brew install cppunit script: - OPTIONS="--enable-test" - test "$TRAVIS_OS_NAME" != "linux" || export CC=gcc-5 CXX=g++-5 + - test "$TRAVIS_OS_NAME" != "osx" || OPTIONS="$OPTIONS --enable-osx" - ./autogen.sh - ./configure --disable-silent-rules --disable-dependency-tracking $OPTIONS - make From 8d290ad509fcf2d6af8bff1cd783cab96f6a9db4 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 19 May 2017 20:10:22 +0200 Subject: [PATCH 11/11] release v0.20.8 --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 9e858b4c6..45598ac05 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -ver 0.20.8 (not yet released) +ver 0.20.8 (2017/05/19) * output - osx: fix build failure due to missing "noexcept" * playlist