Fixed configure failure against pulseaudio-1.1 (bug #384847 by Ian Abbott, fixed by Ian Abbott and Nathan Phillip Brink).

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

5 files changed, 52 insertions, 6 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 6246c8944400..8588ad034be6 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.110 2012/03/20 14:57:32 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.111 2012/03/24 22:49:33 slyfox Exp $
+
+  24 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/qemu-0.11.1-cfg-pulse.patch, qemu-0.11.1-r1.ebuild, qemu-0.11.1.ebuild:
+  Fixed configure failure against pulseaudio-1.1 (bug #384847 by Ian Abbott,
+  fixed by Ian Abbott and Nathan Phillip Brink).
 
   20 Mar 2012; Doug Goldstein <cardoe@gentoo.org> qemu-1.0-r3.ebuild,
   qemu-1.0.1.ebuild:
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 7e00c57a9c07..1731e3380e31 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qemu-0.11.0-mips64-user-fix.patch 313 RMD160 db016e0a48990a435dd6cf6e807145b33ada4908 SHA1 2ea913b1bcd29734a6d4011794bdb4aa3599a184 SHA256 b4173fc177bd0d0ba67f5551a3512047a19a9b2c0a122f968e32fbd834848d2f
 AUX qemu-0.11.1-CVE-2012-0029-backport.patch 1448 RMD160 efdf7bfe481bbfec2106d4a1652ec4df3242eb97 SHA1 dd44a1c1224c90f93bfcb19c612c6920325e6624 SHA256 fb739ca478977f17b73489823b92d8964da1bb308db997596e1160900f2c9236
+AUX qemu-0.11.1-cfg-pulse.patch 622 RMD160 fdcda8f475c5a7246177b09b2293edfafff02d72 SHA1 33ab2f759716905f75a69b8ae05369edbf25e7fe SHA256 22ee9c11fad4f1360dff7dfddf0776db72efee19cb5409fbefc995277cd2d134
 AUX qemu-1.0-unmagic-debug.patch 1929 RMD160 c86b8ea8366dd662f520f79967842d32fe33d26d SHA1 a87e85c56aa656e6afcfb7c37430cb5da408bee8 SHA256 dd68fa1abc9e7c9d17bb2407c5a5b80b1302a9c1b24805abe61537b068347659
 AUX qemu-1.0-unmagic-xfsctl.patch 654 RMD160 a3cfa3dcf275c05c484c7ad04700f75ac43658ce SHA1 ddc8eb1060aabda087f0641801668749b6c93e03 SHA256 b69f5fac63fdd61a314373359dc20b1bf0d4eb6bc0e66105032d28c107a81090
 AUX qemu-ifdown 478 RMD160 2187fbf352e6b84686f0cf0e9e9ebe5d26359858 SHA1 1daccb4785fe503687562798f90be1414267e27d SHA256 7d90c39184fd7531d9b8ae787122b68ac768b41afeb0ef2b3baa6461f77af03d
@@ -9,11 +13,18 @@ DIST qemu-0.11.1.tar.gz 3830070 RMD160 4da00fa6c01d7ff6af0ee781bc9260da577ea7d3
 DIST qemu-1.0-patches.tar.xz 43540 RMD160 79a39d5a8050fe8eedd5e0becb828d2ae0b465c3 SHA1 423880fb32f27e05d1382ed341e6cc4bee840dc3 SHA256 32a8b98cd5fd661268328d71efbfafd65972102b10da363193f3da98bd9b2d72
 DIST qemu-1.0.1.tar.gz 10853005 RMD160 dcef344f150e238880871768f2f07ccb6e8ecce7 SHA1 4d08b5a83538fcd7b222bec6f1c584da8d12497a SHA256 198902e10782517f607c9ed9e629b5e7708ea39eb373ed3ec3f1c8a169d98378
 DIST qemu-1.0.tar.gz 10848714 RMD160 3a60aef6cfebba6896bdb12c99525da5456172fd SHA1 7dcb1b3516554d6d899d7488cd444dbb7721fcee SHA256 47674b7da559d5e1b44cc401af9ac5ad962d14e9eede12567b13e4b841989737
-EBUILD qemu-0.11.1-r1.ebuild 4847 RMD160 0456b19a417f3d956f2547054ca8e59c80cbc5c4 SHA1 2391cc3191c031dab137bc4cc741ad8aaa2ef94e SHA256 e8c3324283d7220f5c586488968c327dd77ad955e6cc1357feeebd1a140c7217
-EBUILD qemu-0.11.1.ebuild 4778 RMD160 d486cd77ace1c38a51bc5c2ed36e647adfba20a5 SHA1 4327168352b6dd1ed894c2042e88f5595e2e3353 SHA256 e92a9e70e89b749de513b3e01c8cfb52e9443fcf202df1b800461dab9d08c70a
+EBUILD qemu-0.11.1-r1.ebuild 4895 RMD160 02d91b081c3b08a483164468408330166251822e SHA1 124c4277c592c08f21681f7a35d20ac3e0f71cf3 SHA256 b94019302e51fcd388afa820583d2be7fafbc51b679cfda05c69d9f2ff351a7d
+EBUILD qemu-0.11.1.ebuild 4826 RMD160 67561dc2c9a2b3ddc800f85a1f59ab8a04041fc7 SHA1 f21be7235ff5083dcd587b59db95fa1c6e72b1f3 SHA256 6ee89fb2a893682703c0539e99e5d62a2a372bf7f19bf5fde2a0cad84468f880
 EBUILD qemu-1.0-r2.ebuild 6839 RMD160 72c62aae7746e64301e1a2771e8ce34d6d9d660b SHA1 1f0f9d31ad7df69d5039a127e9df3445151cbf31 SHA256 24aaa01bde45e7cc61b8e7b7776cf45d02402863bebea79f32f897813f8dc997
 EBUILD qemu-1.0-r3.ebuild 7144 RMD160 dd850e1fcefbe654493aa7ebe8660ebeb94f599a SHA1 d7671acecc18ff9caf757e39a38352abb1f90459 SHA256 14dbed04052cbddd35c22d6e4ae5f8a319ab54a82a6406909669078e04f03d78
 EBUILD qemu-1.0.1.ebuild 7111 RMD160 3422cf669fc8371e22a8399ab54febe3465cba25 SHA1 6c8ae1998c2b257c5cc5e1ef2fe85881a9d8b9ef SHA256 acd99d7a78754192c8b762fc80e9f1624b4e36cc10234c20b5df22b4959fa091
 EBUILD qemu-9999.ebuild 6745 RMD160 28031db02f27a3a681c891b303d267e05ea077de SHA1 1e3126c83645ba5002efbcc221f363c2d58b4fb1 SHA256 0108c9d0d444eb900020277d983652109551a24cad9e503f53194fe6c10d0335
-MISC ChangeLog 16446 RMD160 9b847053cb7aa2365431a3c8d8ea170eb042a353 SHA1 8f86d3ae123b74520d3719722ad8b0c55abf995b SHA256 a21208e2fab711a5eaebff94215583c0190741efe08c9d83d37187209df09bc4
+MISC ChangeLog 16708 RMD160 4362ad18046f46991967d81908cda2f8bda382de SHA1 fda037f5f7e02e89a540277ce987ed3ca08eb6e0 SHA256 9f51394a38c985244ad74abcb548632b4d3b06b049d589e95caca90e73cc1dcf
 MISC metadata.xml 2506 RMD160 3862b61dd3ab2c7dadda97ff1d4c26743623af03 SHA1 9aebc402ad81d51eebf4dcaa179d9914be91fd8d SHA256 039849ef9550e3ef56d5821e4bd7ef0b8cfad1da24f9bf4476ac6871d0f32357
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk9uUKYACgkQcaHudmEf86pPVwCfdTwbPDXQzc0rYUW1DIIDPCpt
+IvkAnjnV3cdzWFkw3UN2872g1SeHWotz
+=+bju
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/files/qemu-0.11.1-cfg-pulse.patch b/app-emulation/qemu/files/qemu-0.11.1-cfg-pulse.patch
new file mode 100644
index 000000000000..767038357cf4
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-0.11.1-cfg-pulse.patch
@@ -0,0 +1,28 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+
+Fix detection of pulseaudio caused by not including the headers which
+define NULL.
+
+--- a/configure
++++ b/configure
+@@ -1004,7 +1004,9 @@
+     lib=$3
+     exp=$4
+     cfl=$5
++    prologue=${6}
+         cat > $TMPC << EOF
++${prologue}
+ #include <$hdr>
+ int main(void) { $exp }
+ EOF
+@@ -1044,7 +1046,8 @@
+ 
+     pa)
+     audio_drv_probe $drv pulse/simple.h -lpulse-simple \
+-        "pa_simple *s = NULL; pa_simple_free(s); return 0;"
++        "pa_simple *s = NULL; pa_simple_free(s); return 0;" \
++	'' '#include <stddef.h> /* NULL */'
+     ;;
+ 
+     oss|sdl|core|wav|dsound)
+
diff --git a/app-emulation/qemu/qemu-0.11.1-r1.ebuild b/app-emulation/qemu/qemu-0.11.1-r1.ebuild
index 0e9cb2efc532..0e6a41ebabb3 100644
--- a/app-emulation/qemu/qemu-0.11.1-r1.ebuild
+++ b/app-emulation/qemu/qemu-0.11.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.11.1-r1.ebuild,v 1.2 2012/03/18 13:41:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.11.1-r1.ebuild,v 1.3 2012/03/24 22:49:33 slyfox Exp $
 
 EAPI="2"
 
@@ -62,6 +62,7 @@ src_prepare() {
 	sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak
 	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
 	epatch "${FILESDIR}/qemu-0.11.1-CVE-2012-0029-backport.patch"
+	epatch "${FILESDIR}"/${P}-cfg-pulse.patch #384847
 }
 
 src_configure() {
diff --git a/app-emulation/qemu/qemu-0.11.1.ebuild b/app-emulation/qemu/qemu-0.11.1.ebuild
index 6ed59cbd563e..fa21d50de8ff 100644
--- a/app-emulation/qemu/qemu-0.11.1.ebuild
+++ b/app-emulation/qemu/qemu-0.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.11.1.ebuild,v 1.8 2012/03/18 13:41:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.11.1.ebuild,v 1.9 2012/03/24 22:49:33 slyfox Exp $
 
 EAPI="2"
 
@@ -61,6 +61,7 @@ src_prepare() {
 	# Append CFLAGS while linking
 	sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak
 	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
+	epatch "${FILESDIR}"/${P}-cfg-pulse.patch #384847
 }
 
 src_configure() {