diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2010-03-08 14:35:09 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2010-03-08 14:35:09 +0000 |
| commit | 6d94893a32c073464672c4388fb96654c170b2dc (patch) | |
| tree | 61417773a980a191d2e61eb4deb7619439b934b5 /net-wireless | |
| parent | Fix building with libpng14. (diff) | |
| download | gentoo-2-6d94893a32c073464672c4388fb96654c170b2dc.tar.gz gentoo-2-6d94893a32c073464672c4388fb96654c170b2dc.tar.bz2 gentoo-2-6d94893a32c073464672c4388fb96654c170b2dc.zip | |
Version bump
(Portage version: 2.1.7.17/cvs/Linux x86_64)
Diffstat (limited to 'net-wireless')
| -rw-r--r-- | net-wireless/bluez/ChangeLog | 9 | ||||
| -rw-r--r-- | net-wireless/bluez/bluez-4.62.ebuild (renamed from net-wireless/bluez/bluez-4.61-r1.ebuild) | 17 | ||||
| -rw-r--r-- | net-wireless/bluez/files/bluez-alsa_location.patch | 16 |
3 files changed, 28 insertions, 14 deletions
diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog index e190820d1416..826472319fe3 100644 --- a/net-wireless/bluez/ChangeLog +++ b/net-wireless/bluez/ChangeLog @@ -1,6 +1,13 @@ # 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.28 2010/03/03 19:55:23 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.29 2010/03/08 14:35:09 pacho Exp $ + +*bluez-4.62 (08 Mar 2010) + + 08 Mar 2010; Pacho Ramos <pacho@gentoo.org> -bluez-4.61-r1.ebuild, + +bluez-4.62.ebuild, +files/bluez-alsa_location.patch: + Version bump, fixes important bugs like symbol breakage introduced in 4.61 + that was causing bug 308081. Thanks to David Watzke for reporting. *bluez-4.61-r1 (03 Mar 2010) diff --git a/net-wireless/bluez/bluez-4.61-r1.ebuild b/net-wireless/bluez/bluez-4.62.ebuild index 0b3d6a91b116..5afb0e850034 100644 --- a/net-wireless/bluez/bluez-4.61-r1.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.61-r1.ebuild,v 1.1 2010/03/03 19:55:23 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.62.ebuild,v 1.1 2010/03/08 14:35:09 pacho Exp $ EAPI="2" @@ -56,7 +56,9 @@ src_prepare() { epatch "${FILESDIR}/4.60/cups-location.patch" fi - # needed for both patches + # Fix alsa files location + epatch "${FILESDIR}/${PN}-alsa_location.patch" + eautoreconf } @@ -126,17 +128,6 @@ src_install() { newinitd "${FILESDIR}/4.60/bluetooth-init.d" bluetooth || die newconfd "${FILESDIR}/4.60/bluetooth-conf.d" bluetooth || die - - if use alsa; then - # ALSA config directory in Gentoo is the default one: /usr/share/alsa - # so bluetooth.conf must be moved there. - # Upstream should be contacted about this. - dodir /usr/share/alsa - mv "${D}"/etc/alsa/bluetooth.conf "${D}"/usr/share/alsa || \ - die "cannot move bluetooth.conf to /usr/share/alsa" - rmdir "${D}"/etc/alsa || die "/etc/alsa not empty" - fi - } pkg_postinst() { diff --git a/net-wireless/bluez/files/bluez-alsa_location.patch b/net-wireless/bluez/files/bluez-alsa_location.patch new file mode 100644 index 000000000000..4d0712c67141 --- /dev/null +++ b/net-wireless/bluez/files/bluez-alsa_location.patch @@ -0,0 +1,16 @@ +bluez installs stuff into /etc/alsa, which is wrong since the +correct location (also stated in alsa-lib configure.in) is +/usr/share/alsa instead +Upstream report: +http://permalink.gmane.org/gmane.linux.bluez.kernel/4739 +--- Makefile.am~ 2010-02-12 20:26:48.000000000 +0100 ++++ Makefile.am 2010-03-05 10:17:15.000000000 +0100 +@@ -241,7 +241,7 @@ + audio_libasound_module_ctl_bluetooth_la_CFLAGS = @ALSA_CFLAGS@ + + if CONFIGFILES +-alsaconfdir = $(sysconfdir)/alsa ++alsaconfdir = $(datadir)/alsa + + alsaconf_DATA = audio/bluetooth.conf + endif |