From: Tim Harder <radhermit@gentoo.org>
Date: Sat, 17 Sep 2011 00:26:14 +0000 (+0000)
Subject: Fix build with audiofile-0.3.0 (bug #383231).
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=08f2359e31c2192ff0a0f5388052c9390ded5eb0;p=gentoo.git

Fix build with audiofile-0.3.0 (bug #383231).

Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64
---

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 7f82a2e0d04a..6b9ebb80bf93 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.264 2011/09/04 01:24:06 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.265 2011/09/17 00:26:14 radhermit Exp $
+
+  17 Sep 2011; Tim Harder <radhermit@gentoo.org> mpd-0.16.4.ebuild,
+  +files/mpd-0.16.4-include-stdio.patch:
+  Fix build with audiofile-0.3.0 (bug #383231).
 
   04 Sep 2011; Michael Weber <xmw@gentoo.org> mpd-0.16.4.ebuild:
   ffmpeg patch now in upstream, remove unneeded and failing epatch line (bug
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index b8aa176f59d5..4cae9a6c0e47 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.15.1-mpdconf.patch 2912 RMD160 6683618151f0f10dc94b5563a48be3729919ef08 SHA1 fc67f59f808d77332a20261525ca74bf1d67b228 SHA256 cacecca8580bce38f998a9f3fa867c274bb112a9af8c59b8dfcbd23a45d34523
 AUX mpd-0.16.3-ffmpeg.patch 800 RMD160 984a98f5f7bd6a412ebb993ac2be6765f94424c9 SHA1 802ee8a3f598d82538b68674af0f82150bf1c52d SHA256 b3958db44146f11bc1f99410284c30a2739915591e92704ed83ea389c222a121
+AUX mpd-0.16.4-include-stdio.patch 269 RMD160 9d4d6ca09b9fc5d55c900e5fd0ab4dfe7d4fb289 SHA1 6dfe58a99bffa616979e0ede9c357f761b247903 SHA256 25816a9a87e06063e086bc93968aea2e312bb6e6618f1b789add960aaefffe63
 AUX mpd-0.16.conf.patch 2646 RMD160 746a65c8eeba996e6fffd561912b82ad81edb9cc SHA1 204d30b2439f49360810ba3790a03381e533ba6d SHA256 5994735065e0e4a8b9b0fbb7ff8219088b7015c573a379dfeacecdfe55834653
 AUX mpd.conf.patch 2566 RMD160 50cb8539749355f610b82b527ed1438f1e5d64b0 SHA1 82c5c3288a3318bb61625edfd266ee453c928109 SHA256 b73ec60d2766d86d78f9ba63d3e5973e8ffb3c1f412f450949bbd3e6dfcbf24f
 AUX mpd.init 824 RMD160 e58cc1644628fb931f5d8bd5726fdceebd29493d SHA1 72377bfa801f6bbcc5474c725303fd234a6bc148 SHA256 a6565c16ffd8ee69d63ead18c967e05abcab2eb64d9810c9f4711aef358cc048
@@ -12,14 +13,18 @@ DIST mpd-0.16.3.tar.bz2 477517 RMD160 860a308ec443896da43c7421db8895c5aff9bd91 S
 DIST mpd-0.16.4.tar.bz2 478807 RMD160 2e06445ea09c30b0ae63c33b85875114008fd13c SHA1 b4eb52903f269e18f434ca5fc346be281ba22c4f SHA256 fa85ca6f837bdfa5ac165c674c2d8cdb77ff44b5f56fac526bc6a11211e61cfd
 EBUILD mpd-0.16.2.ebuild 5426 RMD160 26c1acc62728eeb9102dee0f63ef7b3f26656088 SHA1 0cc36c588c3026ddd02252c2de8abfaf20077540 SHA256 9e80b9113e43090b2eb01fa501c4220367fa738558040059a74c05e2b9175c86
 EBUILD mpd-0.16.3-r1.ebuild 5472 RMD160 8241721e65c37bd0a211c18327facec83f299ec7 SHA1 cc6f0c0ed19840b23f8e1ba8444ad88692f03ca2 SHA256 f7dad7bb1a5c722fabfe3e1a50ba7a41012af1149a35060198535575d4c36b09
-EBUILD mpd-0.16.4.ebuild 5429 RMD160 cdf2e53424f70dfe26e7d947ed3fd173cb7379c8 SHA1 14ca409dae511ae2a42ef75c01ecbd48fbcf23f0 SHA256 fd46a6e1bf5833971c6e1081a8642f665aead365a4ede6d99bfd27c5f78e3aa4
+EBUILD mpd-0.16.4.ebuild 5478 RMD160 66cd2551048d80dae3052d075adb16e3dbeb5022 SHA1 223ead02d3ba201349fc4757aca87abd3625d834 SHA256 7ca60ee177746e36dfc977b7e98dfdb736a7a890a7c32a520cd7dc115808827a
 EBUILD mpd-9999.ebuild 5492 RMD160 9cdc4093fd888d445f1b5c63c0cdf41a5a644c3d SHA1 8eb1ee71a902e8c663c8ef36da8c003ee9c2f321 SHA256 0b3f2c11cb59b7027e489035222fe0e9e77451b902b75e0f7714b7ccead95df4
-MISC ChangeLog 38374 RMD160 8f0c292b661a1983f22899e3ce5d9444efb62684 SHA1 6b151fb305619b6b9dc851058636f0b16547cf7f SHA256 c487de244f8fe9fc5f274edfda2cfda375fec9e529f1330ceda3ecd77c939932
+MISC ChangeLog 38538 RMD160 eca6076b2ac215cd361e5c5ec2b8171aefa22524 SHA1 06ce77d6c4046da15c1a69c14a7a3023a390aebc SHA256 92e736a5bdb59ea01f05d5399972e507589ee83d892189c451d7b00556c21572
 MISC metadata.xml 1434 RMD160 170e2d23e96fb26f832a6fa64d77f9260326e62b SHA1 02b0ce06f5fea588ed924a837d1d375fe7f2a8e9 SHA256 781c3f6bdd130a2638b390f513395447500d609682750748c13b8a7cd9d17034
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk5i00IACgkQknrdDGLu8JC0pAD/bplqIKwwtQiUmCaf4hLE240n
-0l73yYPXtCE9rSDyW+cA/1Vqci+l5jMZrq9cgdI1Mz6S7JkZWhmwyZbTPaMaF8T/
-=DQiL
+iQEcBAEBCgAGBQJOc+ksAAoJEEqz6FtPBkyjoKsH/29a7Le/7/WGIXg1Ac+h15ev
+ftsnh+hvl+CmBcXFSWgFQRyQZ+t/HCJ0d9yx5k7hUuETyjLdTbRX18EjUKTZAcP/
+V3zHLsXRxKgflyKD3BNMw9xpSSVgl4HehOIhMmVETMXrsSxLF4c0i5NtgmzQi1Rw
+7FsK/onqim2nIAO9ZKP1BrLye+ycdkL5L/vAXEUWXGqUumfMHSn8u87NUEPVD2lS
+o7Bp8NEebcCvlJPi0G18BtGdG4vHCf+XE8mqgNLmt3Nrrb7It0HIYo+w2Rk/ICnl
+hJ++vTaAmriSvyExhPDmFdjjrL4V2s6P4UvK3fl56ru7Vu++hiKUOobhkez7NqY=
+=244z
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/files/mpd-0.16.4-include-stdio.patch b/media-sound/mpd/files/mpd-0.16.4-include-stdio.patch
new file mode 100644
index 000000000000..df1cae801461
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.16.4-include-stdio.patch
@@ -0,0 +1,10 @@
+--- mpd-0.16.4/src/decoder/audiofile_decoder_plugin.c.orig
++++ mpd-0.16.4/src/decoder/audiofile_decoder_plugin.c
+@@ -25,6 +25,7 @@
+ #include <af_vfs.h>
+ #include <assert.h>
+ #include <glib.h>
++#include <stdio.h>
+ 
+ #undef G_LOG_DOMAIN
+ #define G_LOG_DOMAIN "audiofile"
diff --git a/media-sound/mpd/mpd-0.16.4.ebuild b/media-sound/mpd/mpd-0.16.4.ebuild
index 14d98d722f4e..474fa7e7ff75 100644
--- a/media-sound/mpd/mpd-0.16.4.ebuild
+++ b/media-sound/mpd/mpd-0.16.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.4.ebuild,v 1.2 2011/09/04 01:24:06 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.4.ebuild,v 1.3 2011/09/17 00:26:14 radhermit Exp $
 
 EAPI=4
 inherit eutils flag-o-matic linux-info multilib
@@ -79,7 +79,8 @@ pkg_setup() {
 
 src_prepare() {
 	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	epatch "${FILESDIR}"/${PN}-0.16.conf.patch
+	epatch "${FILESDIR}"/${PN}-0.16.conf.patch \
+		"${FILESDIR}"/${P}-include-stdio.patch
 }
 
 src_configure() {