main/mpd: upgrade to 0.18.1

2 files changed, 66 insertions, 4 deletions

diff --git a/main/mpd/0001-add-various-missing-headers.patch b/main/mpd/0001-add-various-missing-headers.patch
new file mode 100644
index 0000000000..e5be9b4653
--- /dev/null
+++ b/main/mpd/0001-add-various-missing-headers.patch
@@ -0,0 +1,53 @@
+From 642d3548cf986703f9d4534861c59d64dde3497a Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 5 Nov 2013 07:21:48 +0000
+Subject: [PATCH] add various missing headers
+
+Fixes building with gcc-4.8
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ src/ConfigGlobal.cxx      | 1 +
+ src/InotifySource.cxx     | 1 +
+ src/system/FatalError.cxx | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/src/ConfigGlobal.cxx b/src/ConfigGlobal.cxx
+index 99932f6..49b9c08 100644
+--- a/src/ConfigGlobal.cxx
++++ b/src/ConfigGlobal.cxx
+@@ -32,6 +32,7 @@
+ 
+ #include <assert.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ static ConfigData config_data;
+ 
+diff --git a/src/InotifySource.cxx b/src/InotifySource.cxx
+index 8dc6b5c..ccf5d3e 100644
+--- a/src/InotifySource.cxx
++++ b/src/InotifySource.cxx
+@@ -27,6 +27,7 @@
+ 
+ #include <sys/inotify.h>
+ #include <unistd.h>
++#include <errno.h>
+ 
+ bool
+ InotifySource::OnSocketReady(gcc_unused unsigned flags)
+diff --git a/src/system/FatalError.cxx b/src/system/FatalError.cxx
+index 85384c4..f02b4b5 100644
+--- a/src/system/FatalError.cxx
++++ b/src/system/FatalError.cxx
+@@ -28,6 +28,7 @@
+ #include <unistd.h>
+ #include <stdarg.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #ifdef WIN32
+ #include <windows.h>
+-- 
+1.8.4.2
+
diff --git a/main/mpd/APKBUILD b/main/mpd/APKBUILD
index 651a1032f2..0d8686113b 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.17.6
+pkgver=0.18.1
 pkgrel=0
 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
 url="http://musicpd.org"
@@ -16,6 +16,7 @@ makedepends="pkgconfig 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/${pkgver%.*}/mpd-$pkgver.tar.xz
+        0001-add-various-missing-headers.patch
         mpd.initd
         mpd.confd
         "
@@ -24,6 +25,11 @@ _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
         update_config_sub || return 1
 }
 
@@ -61,12 +67,15 @@ package() {
                 "$pkgdir"/var/lib/mpd/playlists \
                 "$pkgdir"/var/lib/mpd/music
 }
-md5sums="d0da6a6a1d9cf1e8710b6082f6ef7849  mpd-0.17.6.tar.xz
+md5sums="7067e2dce6ece045819861b050f3e3b1  mpd-0.18.1.tar.xz
+a74d07b1d5f3ff75cd5800fbffb5ccdf  0001-add-various-missing-headers.patch
 2ccbb38edc6dff5b5740760837f3005a  mpd.initd
 dbd301041953a5cf9c2b9de8f23eb6bb  mpd.confd"
-sha256sums="defd23931bd3f0aaee82a079a0583278e51e25f480509a93bc5f70de7f421906  mpd-0.17.6.tar.xz
+sha256sums="00d68eaf20d9b5e800acf4feb8c28808031e676278e7a779e4c5afe813d631e3  mpd-0.18.1.tar.xz
+b85e4c6c78ffe2c375539762b9c876013236f674bf4c890a326fa2bbd08fa360  0001-add-various-missing-headers.patch
 5f9d066a044d6cb1a9990a59f63dd4a07e78e5179ad90b22374db09b7c62cafd  mpd.initd
 32c072f77c23c2cc2dd7c93b65b73015e0587caaf2740856132af32cee623206  mpd.confd"
-sha512sums="fe720d7a6561ec8836ff1309dfb01fdd34a9f92a41b2a70f39acc0a55cd7828287b802826c38ea59a40c258c190c5769e56f73330d2eee85ea346019edd2b6eb  mpd-0.17.6.tar.xz
+sha512sums="3d1e21faac80d7e35cc26d29607edc2c2212183fcb793d62ab916c589b492bf147980384abbd010d8936b2f59faf6f1a740300deb97c449393a1e17f9bf6e3d6  mpd-0.18.1.tar.xz
+06bf6a08ade81029c68ba2080f7226da504621fe68f1a562139fdce91fcd571f5c191b54e1dde3377c8fa33ff7852996df4111dffd57c13da3e3f020514f235f  0001-add-various-missing-headers.patch
 80ad8c2fa59c1bd52d3db50e46208f64d027fbecd753b6d688a1095627c8a8b84bd337a682a192bde0b2155edc0eafbe59ed47bae3b3c26c4b1c0a8090d77f6d  mpd.initd
 41b2467f5b03f5c4dd7003cd5f56f6cfc1f67af7a9aa2538d70360f839625222bdd0c4b04c33e8cd52eeecfc354da3ca22f5aaab8aee357a5774aaf3503594e7  mpd.confd"