diff options
3 files changed, 30 insertions, 8 deletions
diff --git a/media-sound/jack-audio-connection-kit/ChangeLog b/media-sound/jack-audio-connection-kit/ChangeLog index 111e57e32373..d5bc7426ad53 100644 --- a/media-sound/jack-audio-connection-kit/ChangeLog +++ b/media-sound/jack-audio-connection-kit/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/jack-audio-connection-kit # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.81 2006/11/13 01:22:24 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.82 2006/11/18 12:47:24 eldad Exp $ + + 18 Nov 2006; Eldad Zack <eldad@gentoo.org> + jack-audio-connection-kit-0.101.1-r1.ebuild, + jack-audio-connection-kit-0.102.20.ebuild: + Fixed cpudetection to be aware of mmx and sse, and add the appropriate + CFLAGS when used and enabled. Closes bug #153001 13 Nov 2006; Joseph Jezak <josejx@gentoo.org> jack-audio-connection-kit-0.101.1-r1.ebuild: diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1-r1.ebuild index c44e5efdd5c8..37a06499e2b0 100644 --- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1-r1.ebuild +++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1-r1.ebuild,v 1.10 2006/11/13 01:22:24 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1-r1.ebuild,v 1.11 2006/11/18 12:47:24 eldad Exp $ inherit flag-o-matic eutils multilib @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz http://netjack.sourceforge.net/ LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="amd64 arm ppc ~ppc-macos ppc64 sh sparc x86" +KEYWORDS="~amd64 ~arm ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86" IUSE="altivec alsa caps coreaudio doc debug jack-tmpfs mmx oss portaudio sndfile sse netjack cpudetection" RDEPEND="dev-util/pkgconfig @@ -85,14 +85,22 @@ src_compile() { -maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt fi - # CPU Detection (dynsimd) uses asm routines which requires 3dnow. + # CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx and sse. + # Also, without -O2 it will not compile as well. # we test if it is present before enabling the configure flag. if use cpudetection ; then if (! grep 3dnow /proc/cpuinfo >/dev/null) ; then ewarn "Can't build cpudetection (dynsimd) without cpu 3dnow support. see bug #136565." + elif (! grep sse /proc/cpuinfo >/dev/null) ; then + ewarn "Can't build cpudetection (dynsimd) without cpu sse support. see bug #136565." + elif (! grep mmx /proc/cpuinfo >/dev/null) ; then + ewarn "Can't build cpudetection (dynsimd) without cpu mmx support. see bug #136565." else - einfo "Enabling cpudetection (dynsimd)" + einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS." myconf="${myconf} --enable-dynsimd" + + filter-flags -O* + append-flags -mmmx -msse -m3dnow -O2 fi fi diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.102.20.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.102.20.ebuild index 927970e7a413..fad5b73fd9ce 100644 --- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.102.20.ebuild +++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.102.20.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.102.20.ebuild,v 1.1 2006/10/08 03:01:56 eldad Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.102.20.ebuild,v 1.2 2006/11/18 12:47:24 eldad Exp $ inherit flag-o-matic eutils multilib @@ -72,14 +72,22 @@ src_compile() { -maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt fi - # CPU Detection (dynsimd) uses asm routines which requires 3dnow. + # CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx and sse. + # Also, without -O2 it will not compile as well. # we test if it is present before enabling the configure flag. if use cpudetection ; then if (! grep 3dnow /proc/cpuinfo >/dev/null) ; then ewarn "Can't build cpudetection (dynsimd) without cpu 3dnow support. see bug #136565." + elif (! grep sse /proc/cpuinfo >/dev/null) ; then + ewarn "Can't build cpudetection (dynsimd) without cpu sse support. see bug #136565." + elif (! grep mmx /proc/cpuinfo >/dev/null) ; then + ewarn "Can't build cpudetection (dynsimd) without cpu mmx support. see bug #136565." else - einfo "Enabling cpudetection (dynsimd)" + einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS." myconf="${myconf} --enable-dynsimd" + + filter-flags -O* + append-flags -mmmx -msse -m3dnow -O2 fi fi |