diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-03-20 02:49:27 +0100 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-03-20 02:49:27 +0100 |
| commit | 12bf5ab473db6d25b134b8171a445381a11a8601 (patch) | |
| tree | 0426f4a3f1f7fd20c5447a53aae078ed54f8d68f /main/mpd | |
| parent | f85c551306d7550f3e6bdd65a981d1f5936dba42 (diff) | |
| download | aports-12bf5ab473db6d25b134b8171a445381a11a8601.tar.bz2 aports-12bf5ab473db6d25b134b8171a445381a11a8601.tar.xz | |
main/mpd: upgrade to 0.19.14
Diffstat (limited to 'main/mpd')
| -rw-r--r-- | main/mpd/APKBUILD | 21 | ||||
| -rw-r--r-- | main/mpd/musl-gcc5-fixes.patch | 37 |
2 files changed, 8 insertions, 50 deletions
diff --git a/main/mpd/APKBUILD b/main/mpd/APKBUILD index e857f714a9..5762090a83 100644 --- a/main/mpd/APKBUILD +++ b/main/mpd/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org> pkgname=mpd -pkgver=0.19.13 +pkgver=0.19.14 case $pkgver in *.*.*) _branch=${pkgver%.*};; *.*) _branch=$pkgver;; @@ -32,12 +32,7 @@ source="http://www.musicpd.org/download/mpd/$_branch/mpd-$pkgver.tar.xz _builddir="$srcdir/$pkgname-$pkgver" prepare() { - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done + default_prepare || return 1 libtoolize --force && aclocal && autoconf && automake --add-missing \ || return 1 } @@ -82,21 +77,21 @@ package() { "$pkgdir"/var/lib/mpd/music || return 1 } -md5sums="016c93fc3d78bfb92e896445f04ea741 mpd-0.19.13.tar.xz +md5sums="9f99340ec6b77bea4ba3729e3b76fd7c mpd-0.19.14.tar.xz a84cce5fdb848c7d282e38698432df51 underlinking.patch -97e6eab066fc610e6e3a3b2263a6d5ba musl-gcc5-fixes.patch +76bf696786915e7d84ea4f9483ac8a36 musl-gcc5-fixes.patch b0c5da8706963a5ae910ff604eb87e2b stacksize.patch afe7a40ac52e4619e5d755b3523132a8 mpd.initd dbd301041953a5cf9c2b9de8f23eb6bb mpd.confd" -sha256sums="f1014838fa7ab2d5fe2ef7f4c101d58fdec2c4c13cfbd2462ee146c8e4919a55 mpd-0.19.13.tar.xz +sha256sums="2fd23805132e5002a4d24930001a7c7d3aaf55e3bd0cd71af5385895160e99e7 mpd-0.19.14.tar.xz b3a0499cbd3f759612ad94fce00588d97e5e82af0b2bcc560869eb977067a426 underlinking.patch -f8be8d5f00576e4734d44d3ee2ad2ddd55351c25eee5a545573a264304514db9 musl-gcc5-fixes.patch +21eb5d288208a6fdf26dac37a7e629fb2221b2e1b970bd66e2992ddf70ce2aed musl-gcc5-fixes.patch 7ae663ecc08498e1d822349cf580eb738f43218308ae0b75efe128276f8ab98a stacksize.patch e6eb40494f583f8b22ef5dc9c4f871220ddd483f1e67cb3bf7eae31eba331479 mpd.initd 32c072f77c23c2cc2dd7c93b65b73015e0587caaf2740856132af32cee623206 mpd.confd" -sha512sums="32125963aa1d808b65dc9b19141044e924f5fbcb635435b250d64f25b6bd69c3069d8db013de34bf5cc601951c952c930e5c88e64609e91ee858853e58140725 mpd-0.19.13.tar.xz +sha512sums="378c31033fd846c4a025c3e45ea61fd79378421371e1b4aa2ac3cf9f10d5c47d930bc6b052055f8f2c70fa98c6d471be73e3e6d6ede568057f7279753b017f40 mpd-0.19.14.tar.xz d6a98c5f60a60ddd5fa94b25864f800a6a6fb6ffe114793293d0ccc71bb5d1cdb847ca39fde4128446b55a38be85634106d5d6f2c77ee450f33631b30140781a underlinking.patch -5140ad3eb13b5e141e9b9909ad27ae2a08ac7556b3ff23f97a65ae6dc20f3856a0376b85fe8e90eb37b8fbaccd0c1002b4bc788d0abcb7541c95713e1cc98a3a musl-gcc5-fixes.patch +1dcf0bc5446cd448242b0a82cf471ea959bc390056f2270a08b930911844117668d869d047bd5c24b03872c39e033b8b8d2a978fe9ebbe69745ac16cb389e136 musl-gcc5-fixes.patch f425c20e18207a406f84a6a664f02625fca9d42977b1289f4ba8595406b26f6aa73b4f1cb5a1115858cb75fa7844f42d7174adba3f6af1af216c44901a1ccaa0 stacksize.patch 3725a528a45edf60e6a9ebd75c880aa63d0e71ab40c20dbc538af2d7c83ca657833b6853d9b488d635883fb7871bb76fada129b3bf8acff4bb060f98a5ad8774 mpd.initd 41b2467f5b03f5c4dd7003cd5f56f6cfc1f67af7a9aa2538d70360f839625222bdd0c4b04c33e8cd52eeecfc354da3ca22f5aaab8aee357a5774aaf3503594e7 mpd.confd" diff --git a/main/mpd/musl-gcc5-fixes.patch b/main/mpd/musl-gcc5-fixes.patch index e80c088a7b..9f5fc785b5 100644 --- a/main/mpd/musl-gcc5-fixes.patch +++ b/main/mpd/musl-gcc5-fixes.patch @@ -1,18 +1,3 @@ -Problem has been reported upstream and closed with WONTFIX: -http://bugs.musicpd.org/view.php?id=4387 -http://bugs.musicpd.org/view.php?id=4110 - -however... - -POSIX does not permit using PTHREAD_COND_INITIALIZER except for static -initialization, and certainly does not permit using it as a value - -also POSIX does not specify the type of the object (it's opaque) so if -there are any types for which their code would be invalid C++, then their -code is invalid - -also, volatile in the type is necessary. without that, LTO can break the code. - --- ./src/notify.hxx.orig +++ ./src/notify.hxx @@ -28,7 +28,7 @@ @@ -24,25 +9,3 @@ also, volatile in the type is necessary. without that, LTO can break the code. constexpr #endif notify():pending(false) {} ---- ./src/thread/PosixCond.hxx.orig -+++ ./src/thread/PosixCond.hxx -@@ -41,7 +41,7 @@ - pthread_cond_t cond; - - public: --#if defined(__NetBSD__) || defined(__BIONIC__) -+#if !defined(__GLIBC__) - /* NetBSD's PTHREAD_COND_INITIALIZER is not compatible with - "constexpr" */ - PosixCond() { ---- ./src/thread/PosixMutex.hxx.orig -+++ ./src/thread/PosixMutex.hxx -@@ -41,7 +41,7 @@ - pthread_mutex_t mutex; - - public: --#if defined(__NetBSD__) || defined(__BIONIC__) -+#if !defined(__GLIBC__) - /* NetBSD's PTHREAD_MUTEX_INITIALIZER is not compatible with - "constexpr" */ - PosixMutex() { |