Stable on sparc, also add a patch to make /proc/cpuinfo parsing work with recent kernels, bug #236230

Package-Manager: portage-2.1.4.4

4 files changed, 30 insertions, 5 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/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index d1ab2d9a568e..f5f255334340 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -2,13 +2,14 @@ AUX jack-audio-connection-kit-0.103.0-ppc64fix.patch 2688 RMD160 f5e56bf524078be
 AUX jack-audio-connection-kit-0.103.0-riceitdown.patch 1588 RMD160 9a4c86b480b580e16d407f88fc30b23fcd339efb SHA1 2e082c75e0927525f225e58e73f1a59811eb238c SHA256 4b26b1528cc9ec17bad3968af81ded11d378a5a2379a553f401c1ff2ec03a3c4
 AUX jack-audio-connection-kit-0.98.1-configure.patch 1459 RMD160 0c370ce569a13488f331fdafea2ebec4d93c003d SHA1 e7d6ff3378c48fba942f99ac088491a7d94c2178 SHA256 43656c1854b21796ceebe74de8206966713631ad6bc9c38f28ff0865103003a0
 AUX jack-audio-connection-kit-0.99.0-jackstart.patch 515 RMD160 d8b01094e8dca70344cb1c45f6c26afd4482f9f8 SHA1 ade17d25f28a9f04cca51c0ba31aa33998d9fb7f SHA256 f0848f287efdd0161079666f36f97e113edcd5eeb8481d637643bb37a0fd0ae0
+AUX jack-audio-connection-kit-sparc-cpuinfo.patch 659 RMD160 b14b46eef7a70c91d8501b5766f69e718b67e842 SHA1 26a4c95457b6c987ddc616dabe33ecea69554673 SHA256 256d48109d32ce8af89042401508392fbb90c499d4cf8b056104dc1a47522fe5
 AUX jack-audio-connection-kit-transport.patch 309 RMD160 7b7130dd922ed14988eb591059d643ece39f6757 SHA1 ed8f9d90ec62476643f41ff60735d4aaaee84886 SHA256 74f1d155f365deb1461d070b37ccd7836c32c521d31960a3f4e6c3f2e528bada
 DIST jack-audio-connection-kit-0.103.0.tar.gz 763244 RMD160 72e47ada90b3d2c391c2e712316a975ae2a13ece SHA1 e804189f3dc024dad37da4afb66a30fd9c92b2bf SHA256 a5d9fd696d7ee4a1c7679b5a688155bc1e0abbdf5f144d6762dbbee874df235f
 DIST jack-audio-connection-kit-0.109.2.tar.gz 831141 RMD160 1e382cf6751b4df3d5d4ea75be7ee94adbc7746a SHA1 5a23c9817fb72858d5bc7b3077224575140b7f55 SHA256 27a7a70e5be0dbcdd98ee1a505399e006e06b4f58fcd3b8cd25763aa7e43bfd4
 DIST jack-audio-connection-kit-0.99.0.tar.gz 722399 RMD160 7d32d77dc58497436d30f6782d0214b26854bb8a SHA1 dc98d8cc65dfb998eb2b035c29c4019963173b59 SHA256 2096acc56c314e689faad0036bbc1d86dea1b9d9620f711d471de76b1dd6859e
 DIST netjack-0.12.tar.bz2 28044 RMD160 13d13f2a66c891da243f9a286833554f680937ff SHA1 f850ed654d0f115065d96bee34d9f7c05e8c5725 SHA256 c443bcb6ec2b477c52cab2fca75aef80fe2c2c91499e45ffdbb1c28ffaa7ee60
 EBUILD jack-audio-connection-kit-0.103.0.ebuild 3983 RMD160 4c005452cfad8c6459938d39e9bca1124f874b7c SHA1 b8ceb1856e9e9ac27b4a1f387c03f32fde5af2ca SHA256 e8ea7f8d6c13b22775008d8f68d78358fd07dc19c009ad37aaae50ee430334ef
-EBUILD jack-audio-connection-kit-0.109.2-r1.ebuild 3706 RMD160 3459e24acbdc5c79bc068414ed4e19ac164479f9 SHA1 c3581101f2c807e0aff8e37dad72f50a75786365 SHA256 d65633b6d49fcc9bc373f066fa89fd0809078e4d0ada27a36285e09d469f577d
+EBUILD jack-audio-connection-kit-0.109.2-r1.ebuild 3757 RMD160 df6fdf95e36c9c1a06571d6c62744a6751f6b6f7 SHA1 6034f1c1c5a8fd1acea90690d38f0fbd2d050c10 SHA256 d0f8c3603f1caa3d51d1541aa541071954ed01e0f7913c4a6cc73e4464d25b64
 EBUILD jack-audio-connection-kit-0.99.0-r3.ebuild 2161 RMD160 4da59bb809ddac33576b3e28707ce122c24b4b1e SHA1 47c532a605305510e472cf6bac1a293ee681ba99 SHA256 7c6cf7b023624a9418419d50523ed24faa18774ab2a4f50536bc8a20dc9518a0
-MISC ChangeLog 21323 RMD160 bb36307d3defc996f1d98c1acb404b7d0fc3f419 SHA1 5e3bcfdec17d183b28c105254c218efbc13cdf4c SHA256 d3bf1ab14c7c9a216347a814a221baca2660d5e472388d2217693223352d8858
+MISC ChangeLog 21587 RMD160 1f3ab83d003f222b0359da537144f17f07c7296c SHA1 e8715db93eeececa0f5adf67bfcb4e302b7845da SHA256 39792c1d3affb5d270d585eef71baa07d028d655e75ca6504097b30f506c855a
 MISC metadata.xml 481 RMD160 e01adafc98ea601c0526c2e8f3dee8a081105b16 SHA1 93d146b438383ba7bba0412471d2da4d3c851921 SHA256 66992ae5c5d644e473973e284f525b9611c9838254cd6f013fae76af643084a0
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
 }