diff options
| author |   Friedrich Oslage <bluebird@gentoo.org> | 2008-09-14 16:56:22 +0000 |
|---|---|---|
| committer | Friedrich Oslage <bluebird@gentoo.org> | 2008-09-14 16:56:22 +0000 |
| commit | a7ab84c650074c83b484829fa39a16c236a2266e (patch) | |
| tree | e2c96ff471510c7785d276d8e77f112353f952cb /media-sound/jack-audio-connection-kit | |
| parent | Initial import of split gnome-python-desktop. This package installs bindings ... (diff) | |
| download | gentoo-2-a7ab84c650074c83b484829fa39a16c236a2266e.tar.gz gentoo-2-a7ab84c650074c83b484829fa39a16c236a2266e.tar.bz2 gentoo-2-a7ab84c650074c83b484829fa39a16c236a2266e.zip | |
Stable on sparc, also add a patch to make /proc/cpuinfo parsing work with recent kernels, bug #236230
(Portage version: 2.1.4.4)
Diffstat (limited to 'media-sound/jack-audio-connection-kit')
3 files changed, 27 insertions, 3 deletions
diff --git a/media-sound/jack-audio-connection-kit/ChangeLog b/media-sound/jack-audio-connection-kit/ChangeLog index c4a6f7cb4fdd..2655ae91a64f 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-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.107 2008/07/11 22:18:43 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.108 2008/09/14 16:56:22 bluebird Exp $ + + 14 Sep 2008; Friedrich Oslage <bluebird@gentoo.org> + +files/jack-audio-connection-kit-sparc-cpuinfo.patch, + jack-audio-connection-kit-0.109.2-r1.ebuild: + Stable on sparc, also add a patch to make /proc/cpuinfo parsing work with + recent kernels, bug #236230 11 Jul 2008; Alexis Ballier <aballier@gentoo.org> -jack-audio-connection-kit-0.109.0.ebuild, diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-sparc-cpuinfo.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-sparc-cpuinfo.patch new file mode 100644 index 000000000000..8017f90ebe93 --- /dev/null +++ b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-sparc-cpuinfo.patch @@ -0,0 +1,17 @@ +On Linux/SPARC, /proc/cpuinfo doesn't include "Cpu0Bogo" anymore, +use "Cpu0ClkTck" instead to determine the processor speed. + +linux upstream commit 8b99cfb8cc51adae7f5294c8962a026c63100959 + +--- old/config/os/gnu-linux/time.c ++++ new/config/os/gnu-linux/time.c +@@ -152,7 +152,8 @@ + defined(__x86_64__) + ret = sscanf(buf, "cpu MHz : %" SCNu64, &mhz); + #elif defined( __sparc__ ) +- ret = sscanf(buf, "Cpu0Bogo : %" SCNu64, &mhz); ++ ret = sscanf(buf, "Cpu0ClkTck : %" PRIx16, &mhz); ++ mhz = mhz / 1000 / 1000; // hz -> mhz + #elif defined( __mc68000__ ) + ret = sscanf(buf, "Clocking: %" SCNu64, &mhz); + #elif defined( __s390__ ) diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2-r1.ebuild index 42b42214c083..5f3d26fd9e90 100644 --- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2-r1.ebuild +++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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.109.2-r1.ebuild,v 1.1 2008/05/20 09:14:05 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2-r1.ebuild,v 1.2 2008/09/14 16:56:22 bluebird Exp $ inherit flag-o-matic eutils multilib linux-info autotools multilib @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz netjack? ( mirror://sourceforge LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc ~x86" IUSE="altivec alsa caps coreaudio doc debug mmx oss sse netjack cpudetection" RDEPEND=">=media-libs/libsndfile-1.0.0 @@ -47,6 +47,7 @@ src_unpack() { epatch "${FILESDIR}/${PN}-transport.patch" epatch "${FILESDIR}/${PN}-0.103.0-riceitdown.patch" epatch "${FILESDIR}/${PN}-0.103.0-ppc64fix.patch" + epatch "${FILESDIR}/${PN}-sparc-cpuinfo.patch" eautoreconf } |