Hello community, here is the log from the commit of package mpd for openSUSE:Factory checked in at 2020-01-20 22:53:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mpd (Old) and /work/SRC/openSUSE:Factory/.mpd.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mpd" Mon Jan 20 22:53:25 2020 rev:16 rq:765688 version:0.21.19 Changes: -------- --- /work/SRC/openSUSE:Factory/mpd/mpd.changes 2019-12-28 13:40:56.998946016 +0100 +++ /work/SRC/openSUSE:Factory/.mpd.new.26092/mpd.changes 2020-01-20 22:53:42.731303526 +0100 @@ -1,0 +2,12 @@ +Mon Jan 20 07:42:18 UTC 2020 - Илья Индиго <i...@ilya.pp.ua> + +- Update to 0.21.19 + * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.19/NEWS + * 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 + * fix build failure with Android NDK r20 + +------------------------------------------------------------------- Old: ---- mpd-0.21.18.tar.xz New: ---- mpd-0.21.19.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mpd.spec ++++++ --- /var/tmp/diff_new_pack.3wmL3V/_old 2020-01-20 22:53:43.815303943 +0100 +++ /var/tmp/diff_new_pack.3wmL3V/_new 2020-01-20 22:53:43.819303945 +0100 @@ -1,7 +1,7 @@ # # spec file for package mpd # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %bcond_with faad %bcond_without mpd_iso9660 Name: mpd -Version: 0.21.18 +Version: 0.21.19 Release: 0 Summary: Music Player Daemon License: GPL-2.0-or-later ++++++ mpd-0.21.18.tar.xz -> mpd-0.21.19.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpd-0.21.18/.travis.yml new/mpd-0.21.19/.travis.yml --- old/mpd-0.21.18/.travis.yml 2019-12-24 16:13:16.000000000 +0100 +++ new/mpd-0.21.19/.travis.yml 2020-01-17 15:49:02.000000000 +0100 @@ -23,6 +23,50 @@ env: - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH" + # Ubuntu Bionic (18.04) with GCC 7 on big-endian + - os: linux + arch: s390x + dist: bionic + addons: + apt: + sources: + - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson) + packages: + - libgtest-dev + - libboost-dev + - python3.6 + - python3-urllib3 + - ninja-build + before_install: + - wget https://bootstrap.pypa.io/get-pip.py + - /usr/bin/python3.6 get-pip.py --user + install: + - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson + env: + - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH" + + # Ubuntu Bionic (18.04) with GCC 7 on ARM64 + - os: linux + arch: arm64 + dist: bionic + addons: + apt: + sources: + - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson) + packages: + - libgtest-dev + - libboost-dev + - python3.6 + - python3-urllib3 + - ninja-build + before_install: + - wget https://bootstrap.pypa.io/get-pip.py + - /usr/bin/python3.6 get-pip.py --user + install: + - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson + env: + - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH" + # Ubuntu Trusty (16.04) with GCC 6 - os: linux dist: trusty diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpd-0.21.18/NEWS new/mpd-0.21.19/NEWS --- old/mpd-0.21.18/NEWS 2019-12-24 16:13:16.000000000 +0100 +++ new/mpd-0.21.19/NEWS 2020-01-17 15:49:02.000000000 +0100 @@ -1,3 +1,11 @@ +ver 0.21.19 (2020/01/17) +* 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 +* fix build failure with Android NDK r20 + ver 0.21.18 (2019/12/24) * protocol - work around Mac OS X bug in the ISO 8601 parser diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpd-0.21.18/android/AndroidManifest.xml new/mpd-0.21.19/android/AndroidManifest.xml --- old/mpd-0.21.18/android/AndroidManifest.xml 2019-12-24 16:13:16.000000000 +0100 +++ new/mpd-0.21.19/android/AndroidManifest.xml 2020-01-17 15:49:02.000000000 +0100 @@ -2,10 +2,10 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android"; package="org.musicpd" android:installLocation="auto" - android:versionCode="41" - android:versionName="0.21.18"> + android:versionCode="42" + android:versionName="0.21.19"> - <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="26"/> + <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WAKE_LOCK"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpd-0.21.18/android/build.py new/mpd-0.21.19/android/build.py --- old/mpd-0.21.18/android/build.py 2019-12-24 16:13:16.000000000 +0100 +++ new/mpd-0.21.19/android/build.py 2020-01-17 15:49:02.000000000 +0100 @@ -25,16 +25,15 @@ 'arch': 'arm-linux-androideabi', 'ndk_arch': 'arm', 'toolchain_arch': 'arm-linux-androideabi', - 'llvm_triple': 'armv7-none-linux-androideabi', + 'llvm_triple': 'armv7-linux-androideabi', 'cflags': '-march=armv7-a -mfpu=vfp -mfloat-abi=softfp', }, 'arm64-v8a': { - 'android_api_level': '21', 'arch': 'aarch64-linux-android', 'ndk_arch': 'arm64', 'toolchain_arch': 'aarch64-linux-android', - 'llvm_triple': 'aarch64-none-linux-android', + 'llvm_triple': 'aarch64-linux-android', 'cflags': '', }, @@ -42,9 +41,17 @@ 'arch': 'i686-linux-android', 'ndk_arch': 'x86', 'toolchain_arch': 'x86', - 'llvm_triple': 'i686-none-linux-android', + 'llvm_triple': 'i686-linux-android', 'cflags': '-march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32', }, + + 'x86_64': { + 'arch': 'x86_64-linux-android', + 'ndk_arch': 'x86_64', + 'toolchain_arch': 'x86_64', + 'llvm_triple': 'x86_64-linux-android', + 'cflags': '-m64', + }, } # select the NDK target @@ -76,24 +83,18 @@ ndk_arch = abi_info['ndk_arch'] android_api_level = '21' - ndk_platform = 'android-' + android_api_level # select the NDK compiler gcc_version = '4.9' - ndk_platform_path = os.path.join(ndk_path, 'platforms', ndk_platform) - sysroot = os.path.join(ndk_path, 'sysroot') - target_root = os.path.join(ndk_platform_path, 'arch-' + ndk_arch) - install_prefix = os.path.join(arch_path, 'root') self.arch = arch self.install_prefix = install_prefix - self.sysroot = sysroot toolchain_path = os.path.join(ndk_path, 'toolchains', abi_info['toolchain_arch'] + '-' + gcc_version, 'prebuilt', build_arch) llvm_path = os.path.join(ndk_path, 'toolchains', 'llvm', 'prebuilt', build_arch) - llvm_triple = abi_info['llvm_triple'] + llvm_triple = abi_info['llvm_triple'] + android_api_level common_flags = '-Os -g' common_flags += ' -fPIC' @@ -107,6 +108,9 @@ common_flags += ' -fvisibility=hidden -fdata-sections -ffunction-sections' + # required flags from https://android.googlesource.com/platform/ndk/+/ndk-release-r20/docs/BuildSystemMaintainers.md#additional-required-arguments + common_flags += ' -fno-addrsig' + self.ar = os.path.join(toolchain_bin, arch + '-ar') self.ranlib = os.path.join(toolchain_bin, arch + '-ranlib') self.nm = os.path.join(toolchain_bin, arch + '-nm') @@ -114,15 +118,11 @@ self.cflags = common_flags self.cxxflags = common_flags - self.cppflags = '--sysroot=' + sysroot + \ - ' -isystem ' + os.path.join(install_prefix, 'include') + \ - ' -isystem ' + os.path.join(sysroot, 'usr', 'include', arch) + \ - ' -D__ANDROID_API__=' + android_api_level - self.ldflags = '--sysroot=' + sysroot + \ - ' -L' + os.path.join(install_prefix, 'lib') + \ - ' -L' + os.path.join(target_root, 'usr', 'lib') + \ - ' -B' + os.path.join(target_root, 'usr', 'lib') + \ + self.cppflags = ' -isystem ' + os.path.join(install_prefix, 'include') + self.ldflags = ' -L' + os.path.join(install_prefix, 'lib') + \ + ' -Wl,--exclude-libs=ALL' + \ ' ' + common_flags + self.ldflags = common_flags self.libs = '' self.is_arm = ndk_arch == 'arm' @@ -130,13 +130,10 @@ self.is_aarch64 = ndk_arch == 'arm64' self.is_windows = False - libcxx_path = os.path.join(ndk_path, 'sources/cxx-stl/llvm-libc++') - libcxx_libs_path = os.path.join(libcxx_path, 'libs', android_abi) - libstdcxx_flags = '' - libstdcxx_cxxflags = libstdcxx_flags + ' -isystem ' + os.path.join(libcxx_path, 'include') + ' -isystem ' + os.path.join(ndk_path, 'sources/android/support/include') - libstdcxx_ldflags = libstdcxx_flags + ' -L' + libcxx_libs_path - libstdcxx_libs = '-lc++_static -lc++abi' + libstdcxx_cxxflags = '' + libstdcxx_ldflags = '' + libstdcxx_libs = '-static-libstdc++' if self.is_armv7: # On 32 bit ARM, clang generates no ".eh_frame" section; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpd-0.21.18/doc/conf.py new/mpd-0.21.19/doc/conf.py --- old/mpd-0.21.18/doc/conf.py 2019-12-24 16:13:16.000000000 +0100 +++ new/mpd-0.21.19/doc/conf.py 2020-01-17 15:49:02.000000000 +0100 @@ -38,7 +38,7 @@ # built documents. # # The short X.Y version. -version = '0.21.18' +version = '0.21.19' # The full version, including alpha/beta/rc tags. release = version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpd-0.21.18/meson.build new/mpd-0.21.19/meson.build --- old/mpd-0.21.18/meson.build 2019-12-24 16:13:16.000000000 +0100 +++ new/mpd-0.21.19/meson.build 2020-01-17 15:49:02.000000000 +0100 @@ -1,7 +1,7 @@ project( 'mpd', ['c', 'cpp'], - version: '0.21.18', + version: '0.21.19', meson_version: '>= 0.49.0', default_options: [ 'c_std=c99', @@ -88,6 +88,10 @@ ] if get_option('buildtype') != 'debug' + test_cxxflags += [ + '-ffunction-sections', + '-fdata-sections', + ] test_cflags += [ '-ffunction-sections', '-fdata-sections', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpd-0.21.18/python/build/libs.py new/mpd-0.21.19/python/build/libs.py --- old/mpd-0.21.18/python/build/libs.py 2019-12-24 16:13:16.000000000 +0100 +++ new/mpd-0.21.19/python/build/libs.py 2020-01-17 15:49:02.000000000 +0100 @@ -9,8 +9,8 @@ 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', ) @@ -52,8 +52,8 @@ ) 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', @@ -112,8 +112,8 @@ ) 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', @@ -341,8 +341,8 @@ ) 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', @@ -358,6 +358,11 @@ '--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', ], @@ -365,8 +370,8 @@ ) 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', @@ -392,7 +397,7 @@ ) 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', ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpd-0.21.18/src/config/File.cxx new/mpd-0.21.19/src/config/File.cxx --- old/mpd-0.21.18/src/config/File.cxx 2019-12-24 16:13:16.000000000 +0100 +++ new/mpd-0.21.19/src/config/File.cxx 2020-01-17 15:49:02.000000000 +0100 @@ -153,11 +153,9 @@ 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 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpd-0.21.18/src/output/plugins/PulseOutputPlugin.cxx new/mpd-0.21.19/src/output/plugins/PulseOutputPlugin.cxx --- old/mpd-0.21.18/src/output/plugins/PulseOutputPlugin.cxx 2019-12-24 16:13:16.000000000 +0100 +++ new/mpd-0.21.19/src/output/plugins/PulseOutputPlugin.cxx 2020-01-17 15:49:02.000000000 +0100 @@ -650,7 +650,7 @@ break; } - ss.rate = audio_format.sample_rate; + ss.rate = std::min(audio_format.sample_rate, PA_RATE_MAX); ss.channels = audio_format.channels; /* create a stream .. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mpd-0.21.18/src/util/Compiler.h new/mpd-0.21.19/src/util/Compiler.h --- old/mpd-0.21.18/src/util/Compiler.h 2019-12-24 16:13:16.000000000 +0100 +++ new/mpd-0.21.19/src/util/Compiler.h 2020-01-17 15:49:02.000000000 +0100 @@ -145,7 +145,7 @@ #if GCC_CHECK_VERSION(7,0) #define gcc_fallthrough __attribute__((fallthrough)) -#elif CLANG_CHECK_VERSION(10,0) +#elif CLANG_CHECK_VERSION(10,0) && defined(__cplusplus) #define gcc_fallthrough [[fallthrough]] #else #define gcc_fallthrough
