diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2015-06-25 13:08:51 +0200 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2015-06-25 13:09:59 +0200 |
| commit | ffb26010ba794a7d4a9d050cbf07c4590ce60788 (patch) | |
| tree | 07dc8cc10cff2a66e94b9cd46f6c489d27f4a4f5 /main | |
| parent | 9c093d715e59e94412effe5605c80a55bb34bc9b (diff) | |
| download | aports-ffb26010ba794a7d4a9d050cbf07c4590ce60788.tar.bz2 aports-ffb26010ba794a7d4a9d050cbf07c4590ce60788.tar.xz | |
main/mpd: upgrade to 0.19.10 and fix build with gcc5
http://bugs.musicpd.org/view.php?id=4110
Diffstat (limited to 'main')
| -rw-r--r-- | main/mpd/APKBUILD | 14 | ||||
| -rw-r--r-- | main/mpd/musl-gcc5-fixes.patch | 33 |
2 files changed, 42 insertions, 5 deletions
diff --git a/main/mpd/APKBUILD b/main/mpd/APKBUILD index 481d12c85c..1646bc8ef8 100644 --- a/main/mpd/APKBUILD +++ b/main/mpd/APKBUILD @@ -2,13 +2,13 @@ # Contributor: Sebastian Wicki <gandro@gmx.net> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mpd -pkgver=0.19.9 +pkgver=0.19.10 case $pkgver in *.*.*) _branch=${pkgver%.*};; *.*) _branch=$pkgver;; esac -pkgrel=3 +pkgrel=0 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" url="http://musicpd.org" pkgusers="mpd" @@ -24,6 +24,7 @@ install="$pkgname.pre-install" subpackages="$pkgname-doc $pkgname-dbg" source="http://www.musicpd.org/download/mpd/$_branch/mpd-$pkgver.tar.xz underlinking.patch + musl-gcc5-fixes.patch mpd.initd mpd.confd" @@ -74,15 +75,18 @@ package() { "$pkgdir"/var/lib/mpd/playlists \ "$pkgdir"/var/lib/mpd/music } -md5sums="1a66f7b4db1fa61b87e04e666c94088d mpd-0.19.9.tar.xz +md5sums="da4bc3e47afd0faf9e7a67168e012102 mpd-0.19.10.tar.xz a84cce5fdb848c7d282e38698432df51 underlinking.patch +fbed49fa5ddb0147de4b88f6fa2fb2c5 musl-gcc5-fixes.patch 69f9df7ba92ac3f6c46a4a30a2a5c025 mpd.initd dbd301041953a5cf9c2b9de8f23eb6bb mpd.confd" -sha256sums="47851423053cd38cfad65be5985b41b7cd5bdbe8d0d13378e11748a28b19f26f mpd-0.19.9.tar.xz +sha256sums="c386eb3d22f98dc993b5ae3c272f969aa7763713483c6800040ebf1791b15851 mpd-0.19.10.tar.xz b3a0499cbd3f759612ad94fce00588d97e5e82af0b2bcc560869eb977067a426 underlinking.patch +8ab0beb4da675380f69ac7102a3c6f1eef41c2984adc7426e87eb534ce9bac93 musl-gcc5-fixes.patch 9d842c202c010b7254dc89971649139b81bfec49f11c19bcba8be8712279ba7b mpd.initd 32c072f77c23c2cc2dd7c93b65b73015e0587caaf2740856132af32cee623206 mpd.confd" -sha512sums="7d74254e009008ed142ce0b69e75fe6f255ec2c814b246f570225af715ec5c3a5c75276f4720bc1ad351d48be5b20f9797843c03aae9380a6062796539507bf4 mpd-0.19.9.tar.xz +sha512sums="037e1ccd69456bd7d388cbcba26de83144816684fb266995b173df960051e84203d3fc7255d7766eee5dbe0629dbb7745b9821664486158d33da4f29189edef8 mpd-0.19.10.tar.xz d6a98c5f60a60ddd5fa94b25864f800a6a6fb6ffe114793293d0ccc71bb5d1cdb847ca39fde4128446b55a38be85634106d5d6f2c77ee450f33631b30140781a underlinking.patch +da1124b505d2628b4c009fcb3f8dea106017e84c09e1c24c9aa4063007838520fd500e5a48258a78189e12c8b996d920b71060651cdabeb5a7bd01fec01b3400 musl-gcc5-fixes.patch 8b13530fbfb2bded3cb82202261d57ff824521e5682f07c8f3d0562348aeb303e6c3d72a457043c4d4909d7106d723fe701a12ab66b45b016d3b940acbeb205b mpd.initd 41b2467f5b03f5c4dd7003cd5f56f6cfc1f67af7a9aa2538d70360f839625222bdd0c4b04c33e8cd52eeecfc354da3ca22f5aaab8aee357a5774aaf3503594e7 mpd.confd" diff --git a/main/mpd/musl-gcc5-fixes.patch b/main/mpd/musl-gcc5-fixes.patch new file mode 100644 index 0000000000..aeb28574e6 --- /dev/null +++ b/main/mpd/musl-gcc5-fixes.patch @@ -0,0 +1,33 @@ +--- ./src/notify.hxx.orig ++++ ./src/notify.hxx +@@ -28,7 +28,7 @@ + Cond cond; + bool pending; + +-#if !defined(WIN32) && !defined(__NetBSD__) && !defined(__BIONIC__) ++#if !defined(WIN32) && !defined(__NetBSD__) && !defined(__BIONIC__) && defined(__GLIBC__) + 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(__NetBSD__) || defined(__BIONIC__) || !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(__NetBSD__) || defined(__BIONIC__) || !defined(__GLIBC__) + /* NetBSD's PTHREAD_MUTEX_INITIALIZER is not compatible with + "constexpr" */ + PosixMutex() { |