From cf6139d4a0084cda9048e7c87f441f051cb595b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Jendrysik?= Date: Fri, 12 Dec 2014 12:21:40 +0100 Subject: main/mpd: upgrade to 0.19.6, remove needless patch --- main/mpd/APKBUILD | 16 ++++++---------- main/mpd/fix-musl.patch | 11 ----------- 2 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 main/mpd/fix-musl.patch (limited to 'main/mpd') diff --git a/main/mpd/APKBUILD b/main/mpd/APKBUILD index 8405d6892f..ec258a1ebd 100644 --- a/main/mpd/APKBUILD +++ b/main/mpd/APKBUILD @@ -1,7 +1,8 @@ +# Contributor: Łukasz Jendrysik # Contributor: Sebastian Wicki # Maintainer: Natanael Copa pkgname=mpd -pkgver=0.19.5 +pkgver=0.19.6 case $pkgver in *.*.*) _branch=${pkgver%.*};; *.*) _branch=$pkgver;; @@ -22,11 +23,9 @@ makedepends="lame-dev glib-dev curl-dev libao-dev libmad-dev flac-dev install="$pkgname.pre-install" subpackages="$pkgname-doc" source="http://www.musicpd.org/download/mpd/$_branch/mpd-$pkgver.tar.xz - fix-musl.patch underlinking.patch mpd.initd - mpd.confd - " + mpd.confd" _builddir="$srcdir/$pkgname-$pkgver" @@ -75,18 +74,15 @@ package() { "$pkgdir"/var/lib/mpd/playlists \ "$pkgdir"/var/lib/mpd/music } -md5sums="dd3d2088205dc5f8fb4b6768ed7d9f5c mpd-0.19.5.tar.xz -efa521234a16b5f4ffbde40ef645eab2 fix-musl.patch +md5sums="92342846c6fe77a3d70078827d14ce5d mpd-0.19.6.tar.xz a84cce5fdb848c7d282e38698432df51 underlinking.patch 2ccbb38edc6dff5b5740760837f3005a mpd.initd dbd301041953a5cf9c2b9de8f23eb6bb mpd.confd" -sha256sums="e621e05e7d0e92690f7a1b6ee6f1e502a4d009c69caa4907519282ca571f72cf mpd-0.19.5.tar.xz -cf3cb6c2e1b93baabbe0375e75b8909f80589c568c28c1e301c9ad960550d5d8 fix-musl.patch +sha256sums="fac25376ee46b89249ee28a1ae13b2d5d1df7ff62464340c33c077015364d1e0 mpd-0.19.6.tar.xz b3a0499cbd3f759612ad94fce00588d97e5e82af0b2bcc560869eb977067a426 underlinking.patch 5f9d066a044d6cb1a9990a59f63dd4a07e78e5179ad90b22374db09b7c62cafd mpd.initd 32c072f77c23c2cc2dd7c93b65b73015e0587caaf2740856132af32cee623206 mpd.confd" -sha512sums="db9be1def7c8f9ddcb2bdbd03a8a9a3f014e9d873188c3ae1e7b3b705f05836689260e5a000cd2e944959b7e810f794ad7bca95c2c187a31ea7197b28e1edad8 mpd-0.19.5.tar.xz -ea3efdf7baaaabdfbbc8c4571b30c666e0a96465fc05e4c84629304af21d8f26d339c49e9f8de458e6320b1a6334457cd2b8fb633f318e525a261ca8016d2974 fix-musl.patch +sha512sums="b679c42169ad0815c69de817b7d59531e6afb9a88ed15ddbe4648f103815b513605081ffddb12a92c9e52e402fcb80c9df984c05c70491a4f3cc4f7efc5e3d86 mpd-0.19.6.tar.xz d6a98c5f60a60ddd5fa94b25864f800a6a6fb6ffe114793293d0ccc71bb5d1cdb847ca39fde4128446b55a38be85634106d5d6f2c77ee450f33631b30140781a underlinking.patch 80ad8c2fa59c1bd52d3db50e46208f64d027fbecd753b6d688a1095627c8a8b84bd337a682a192bde0b2155edc0eafbe59ed47bae3b3c26c4b1c0a8090d77f6d mpd.initd 41b2467f5b03f5c4dd7003cd5f56f6cfc1f67af7a9aa2538d70360f839625222bdd0c4b04c33e8cd52eeecfc354da3ca22f5aaab8aee357a5774aaf3503594e7 mpd.confd" diff --git a/main/mpd/fix-musl.patch b/main/mpd/fix-musl.patch deleted file mode 100644 index 0a9bc5f85e..0000000000 --- a/main/mpd/fix-musl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/thread/Id.hxx.orig -+++ ./src/thread/Id.hxx -@@ -85,7 +85,7 @@ - #ifdef WIN32 - return id == other.id; - #else -- return ::pthread_equal(id, other.id); -+ return (::pthread_equal)(id, other.id); - #endif - } - -- cgit v1.2.3