diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2010-03-11 15:22:42 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2010-03-11 15:22:42 +0000 |
| commit | 0e8fd182c5df26b90158a4da3cc474ceee8137c0 (patch) | |
| tree | c56718dfdf32def4b366223c330747d81057a555 /net-wireless | |
| parent | Require USE=edit for app-misc/mc, bug 283113. Change EAPI to 2. (diff) | |
| download | gentoo-2-0e8fd182c5df26b90158a4da3cc474ceee8137c0.tar.gz gentoo-2-0e8fd182c5df26b90158a4da3cc474ceee8137c0.tar.bz2 gentoo-2-0e8fd182c5df26b90158a4da3cc474ceee8137c0.zip | |
fix bug 308081
(Portage version: 2.1.7.17/cvs/Linux x86_64)
Diffstat (limited to 'net-wireless')
| -rw-r--r-- | net-wireless/bluez/ChangeLog | 7 | ||||
| -rw-r--r-- | net-wireless/bluez/bluez-4.62.ebuild | 5 | ||||
| -rw-r--r-- | net-wireless/bluez/files/bluez-4.62-makefile_ipctest.patch | 29 |
3 files changed, 39 insertions, 2 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/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 + |