fix bug 308081

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

4 files changed, 45 insertions, 7 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 826472319fe3..fc09ecb2df42 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.29 2010/03/08 14:35:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.30 2010/03/11 15:22:41 pacho Exp $
+
+  11 Mar 2010; Pacho Ramos <pacho@gentoo.org> bluez-4.62.ebuild,
+  +files/bluez-4.62-makefile_ipctest.patch:
+  Upstream patch by Vinicius Costa to fix bug 308081. Thanks to David Watzke
+  for reporting the problem.
 
 *bluez-4.62 (08 Mar 2010)
 
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 1f125113ed30..79c51f14db47 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -13,6 +13,7 @@ AUX 4.60/bluetooth-init.d 731 RMD160 d3415b987e5fce10ea90d93c91bbb99e47e34c5d SH
 AUX 4.60/cups-location.patch 311 RMD160 25260d0d4c0b28def0ca29dbe4579d582c632a06 SHA1 0e5218280082a2121c7553e79aba9cbb703c9fe0 SHA256 2240f0ce509f323f0b657049140a75fda3d83242b02546d81eeaa1bb3f7c26ec
 AUX bluez-4.18-udev.rules 228 RMD160 ab9b4ce8907c62eb9d1f14406cc2ff3f5ec69a19 SHA1 14e652de6cfed28f215727800460e600129007c2 SHA256 7577c2ed295b67f960f17ac65a44889c6536c125b34e33860d6d9f128a59fa82
 AUX bluez-4.18-udev.script 752 RMD160 d8f60749dbe497bef7362a4c3f56b2b83ca079cb SHA1 0c39b4b4f4c57fb334daa793f89c0ffac046b956 SHA256 cb41a4eeea5137fb27d82d74f34e5e7dd725ddf8442c39ea623afe0d3c041fcf
+AUX bluez-4.62-makefile_ipctest.patch 1296 RMD160 19fb0c31b0981b81ea7ac9cca4780e3f93d0d870 SHA1 ce9f7f582176472cf08890ba0ac9de8187ecea57 SHA256 176c61b760fe57860d2190319854ac056850a56bc0d58c206b2be697224978ab
 AUX bluez-alsa_location.patch 539 RMD160 d4ecae8267e78d0e81a38d8ba72a8311c724a7e9 SHA1 9422e3c95fdc5e46d714d00563fcd016da6b2f24 SHA256 85d21fdd51bffb29cc45e0ab5050dd7d85ed8fa652551789bb7f5c48d7f77b44
 AUX bluez-plugdev.patch 469 RMD160 a70cd0310240491cf14a5a6d7b60e760804e9816 SHA1 b273aac740e7c19aebc441c6c77e0ba8d32f3480 SHA256 ec3f06f24f530574edf5eef308afcf16bb7e0a88336a454a0b24698d2491f5f2
 DIST bluez-4.28.tar.gz 956161 RMD160 a8add4666bc19d009132be0118d075da79e8cba2 SHA1 ff992e8665814f8af0568883fa54f9355865b82b SHA256 8a7ecc1a2ad5b8c46414b58dd3a3519f2979a320ffa7d27c88519a7cf8755493
@@ -24,13 +25,13 @@ EBUILD bluez-4.38.ebuild 5057 RMD160 0026396a9aa7a74beaa10b84cc1da104a746bf56 SH
 EBUILD bluez-4.39-r1.ebuild 5102 RMD160 706738db0941cd34f413de426fcfac79527707ca SHA1 58d22620bc0f900e5015a92cf184784108fde8c4 SHA256 1669607d81263dec57a5db4a31ed33978b38385641bdee5ec94bc241a5b2594e
 EBUILD bluez-4.39-r2.ebuild 5277 RMD160 3267dafd21c7e6fce90087f7d78b694a41b1e019 SHA1 c9c71ec49d327c4298a7c525780e49aaec1c7986 SHA256 4b4200f63a03577972bf5c5d555a2d939df4ab522fb0c3131cd219f6ac01afbe
 EBUILD bluez-4.39.ebuild 5057 RMD160 54c6c6d5f0a8c07aad48c66dc92e7978137abdb9 SHA1 a9a3720560b9831d3bccd34242aa251f116fead1 SHA256 a77d9a23c52405efc4ed7e862a519e4a0ce733c6ec7a040dd02c225859df4446
-EBUILD bluez-4.62.ebuild 4771 RMD160 db22818a302a2768acc1ac2a94f281a313646ef0 SHA1 c879181b318ce1fc25c16edb46d34366ccc079b5 SHA256 78660fbe1bdaa4eda2c962167bf0dd23e2925bf52b9a3f1bb3fa561fcb98e155
-MISC ChangeLog 5513 RMD160 d794af37ac3697d8f32f6a38838feea9ccb2eda1 SHA1 06a8b7e6679525f41c087e4020c5a1c4b25af4c2 SHA256 2fd79af5c01f9f604690302ff5bce0fc8c73c8b190336b7d8607fbc6f7b3159b
+EBUILD bluez-4.62.ebuild 4873 RMD160 48e3e226521cb2d63fc760febaa086a1490ead8b SHA1 84ba74546d0fd0c7f91c3329677961705ebfb41b SHA256 ba00b3bb9720419d9c44946b39a6f2f939456bfe82e646fbec860558f19ac421
+MISC ChangeLog 5729 RMD160 46301e4bf195653c63c3febc059c4938358a8757 SHA1 bbf7f2771e382ea2eea3edb00895942b68a5e238 SHA256 69a3544e81be136f7dc23a6f306f2576dd71b67fb1be5cc13588559fbddf6b24
 MISC metadata.xml 915 RMD160 4d404bfa89b7fed54ee3f7fd1858045ce45b9e09 SHA1 9bc166c659554dc6798ed11cdd80bf47dbdd9bca SHA256 193327f89fa8e03e52f9548abdc600b120016005e4cd220de71e833cad20eea4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuVCyYACgkQCaWpQKGI+9QfawCfXAN8B8zwct+ub+UGebPiRWob
-/20AnA5vSxVF4QoHIN8XTLgg0cJlNkYx
-=lQU3
+iEYEARECAAYFAkuZCscACgkQCaWpQKGI+9RVcACfc/OqXGzyHg3dKTmAYPKxsOlL
+N5AAnRuBtWIOxGd7qu0E49BUCjzBn2Br
+=jiYI
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-4.62.ebuild b/net-wireless/bluez/bluez-4.62.ebuild
index 5afb0e850034..f97e5a191d5a 100644
--- a/net-wireless/bluez/bluez-4.62.ebuild
+++ b/net-wireless/bluez/bluez-4.62.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.62.ebuild,v 1.1 2010/03/08 14:35:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.62.ebuild,v 1.2 2010/03/11 15:22:41 pacho Exp $
 
 EAPI="2"
 
@@ -59,6 +59,9 @@ src_prepare() {
 	# Fix alsa files location
 	epatch "${FILESDIR}/${PN}-alsa_location.patch"
 
+	# Upstream patch to fix ipctest build, bug 308081
+	epatch "${FILESDIR}/${P}-makefile_ipctest.patch"
+
 	eautoreconf
 }
 
diff --git a/net-wireless/bluez/files/bluez-4.62-makefile_ipctest.patch b/net-wireless/bluez/files/bluez-4.62-makefile_ipctest.patch
new file mode 100644
index 000000000000..6304a6f0ac79
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-4.62-makefile_ipctest.patch
@@ -0,0 +1,29 @@
+From f62006a86143f2c8556b4e6f3e74508db6b2aa5d Mon Sep 17 00:00:00 2001
+From: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
+Date: Mon, 8 Mar 2010 20:01:32 -0300
+Subject: [PATCH 1/1] Fix compilation when --enable-test is passed
+
+When --enable-test is passed along with --disable-alsa and
+--disable-gstreamer, the SBC lib is not built, which breaks
+compilation of the ipctest test program.
+---
+ acinclude.m4 |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 2e4444d..f7bb047 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -316,7 +316,8 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+ 
+ 	AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
+ 	AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes")
+-	AM_CONDITIONAL(SBC, test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes")
++	AM_CONDITIONAL(SBC, test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes" ||
++									test "${test_enable}" = "yes")
+ 	AM_CONDITIONAL(ALSA, test "${alsa_enable}" = "yes" && test "${alsa_found}" = "yes")
+ 	AM_CONDITIONAL(GSTREAMER, test "${gstreamer_enable}" = "yes" && test "${gstreamer_found}" = "yes")
+ 	AM_CONDITIONAL(AUDIOPLUGIN, test "${audio_enable}" = "yes")
+-- 
+1.7.0.2
+