diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-02-12 07:54:45 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-02-12 07:54:45 +0000 |
| commit | 26dd9bbd478a82e0a9b0e07988ceb13d4abfdd63 (patch) | |
| tree | 7f899751a7d8dc58a9f7b1003ff70cb60ad6f9d3 /main/mpd | |
| parent | 8f186ca09b4ff2e507f07fb34a46702ab3f6dbac (diff) | |
| download | aports-26dd9bbd478a82e0a9b0e07988ceb13d4abfdd63.tar.bz2 aports-26dd9bbd478a82e0a9b0e07988ceb13d4abfdd63.tar.xz | |
main/mpd: upgrade to 0.18.8 and fix musl build
Diffstat (limited to 'main/mpd')
| -rw-r--r-- | main/mpd/APKBUILD | 25 | ||||
| -rw-r--r-- | main/mpd/fix-musl.patch | 11 | ||||
| -rw-r--r-- | main/mpd/underlinking.patch | 10 |
3 files changed, 39 insertions, 7 deletions
diff --git a/main/mpd/APKBUILD b/main/mpd/APKBUILD index 03709f0cc1..9faa95d509 100644 --- a/main/mpd/APKBUILD +++ b/main/mpd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sebastian Wicki <gandro@gmx.net> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mpd -pkgver=0.18.7 +pkgver=0.18.8 pkgrel=0 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" url="http://musicpd.org" @@ -10,12 +10,15 @@ pkggroups="mpd audio" arch="all" license="GPL2" depends= -makedepends="pkgconfig lame-dev glib-dev curl-dev libao-dev libmad-dev flac-dev +makedepends="lame-dev glib-dev curl-dev libao-dev libmad-dev flac-dev libogg-dev faad2-dev libid3tag-dev libvorbis-dev alsa-lib-dev - libsamplerate-dev libshout-dev libmodplug-dev" + libsamplerate-dev libshout-dev libmodplug-dev + autoconf automake libtool" install="$pkgname.pre-install" subpackages="$pkgname-doc" source="http://www.musicpd.org/download/mpd/${pkgver%.*}/mpd-$pkgver.tar.xz + fix-musl.patch + underlinking.patch mpd.initd mpd.confd " @@ -29,7 +32,9 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done - update_config_sub || return 1 + libtoolize --force && aclocal && autoconf && automake --add-missing \ + || return 1 + update_config_sub } build() { @@ -66,12 +71,18 @@ package() { "$pkgdir"/var/lib/mpd/playlists \ "$pkgdir"/var/lib/mpd/music } -md5sums="1ef604a6c8d5e73f8314de8cf95ba607 mpd-0.18.7.tar.xz +md5sums="7bbe1caf5abe404dc985ca4f44984b1f mpd-0.18.8.tar.xz +efa521234a16b5f4ffbde40ef645eab2 fix-musl.patch +66d79f107766fcbb80530a2e3eda8d62 underlinking.patch 2ccbb38edc6dff5b5740760837f3005a mpd.initd dbd301041953a5cf9c2b9de8f23eb6bb mpd.confd" -sha256sums="3f61b548536ca2b4c6e89fde0b85aa3ce22856fb35053c5b194d9a47daecfb82 mpd-0.18.7.tar.xz +sha256sums="5366378e548fb77996cc33b0e15165ddd84f1e496bdd04616bd593aecdc26450 mpd-0.18.8.tar.xz +cf3cb6c2e1b93baabbe0375e75b8909f80589c568c28c1e301c9ad960550d5d8 fix-musl.patch +2350d1e82d5271dd1d2eb205ffa517dca4fc3f65eedc9f6841db74a29f1380b2 underlinking.patch 5f9d066a044d6cb1a9990a59f63dd4a07e78e5179ad90b22374db09b7c62cafd mpd.initd 32c072f77c23c2cc2dd7c93b65b73015e0587caaf2740856132af32cee623206 mpd.confd" -sha512sums="8f495263242adbf56c2f27ea773c5d829d752ccd9165d127786f444a2f3fb76a0af931fc562ae44c033ae4058ed741f1a8de661ce306aba4f8a2dd189c563443 mpd-0.18.7.tar.xz +sha512sums="a6f540813b3f91c74645d3903a0b36edd1546880bfa7d1c06f2cb61b37e9c1e343b03ff06a685c4ded796a7f486b19e89849ca43f2b978c839b72eb0be184f34 mpd-0.18.8.tar.xz +ea3efdf7baaaabdfbbc8c4571b30c666e0a96465fc05e4c84629304af21d8f26d339c49e9f8de458e6320b1a6334457cd2b8fb633f318e525a261ca8016d2974 fix-musl.patch +f8fdec6999036dc49dd954f7df211adf853aed8f5e0cf8538c251017593d4448d569fa8abf6d536de2ff05a7abb4dd4daa604b9dd5a9a7ddbcfe9b2fda591290 underlinking.patch 80ad8c2fa59c1bd52d3db50e46208f64d027fbecd753b6d688a1095627c8a8b84bd337a682a192bde0b2155edc0eafbe59ed47bae3b3c26c4b1c0a8090d77f6d mpd.initd 41b2467f5b03f5c4dd7003cd5f56f6cfc1f67af7a9aa2538d70360f839625222bdd0c4b04c33e8cd52eeecfc354da3ca22f5aaab8aee357a5774aaf3503594e7 mpd.confd" diff --git a/main/mpd/fix-musl.patch b/main/mpd/fix-musl.patch new file mode 100644 index 0000000000..0a9bc5f85e --- /dev/null +++ b/main/mpd/fix-musl.patch @@ -0,0 +1,11 @@ +--- ./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 + } + diff --git a/main/mpd/underlinking.patch b/main/mpd/underlinking.patch new file mode 100644 index 0000000000..e44470604e --- /dev/null +++ b/main/mpd/underlinking.patch @@ -0,0 +1,10 @@ +--- ./Makefile.am.orig ++++ ./Makefile.am +@@ -678,6 +678,7 @@ + $(TWOLAME_LIBS) \ + $(FLAC_LIBS) \ + $(OPUS_LIBS) \ ++ $(VORBIS_LIBS) \ + $(VORBISENC_LIBS) + + libencoder_plugins_a_SOURCES = \ |