fix on ppc64 for bug #195058

Package-Manager: portage-2.1.3.9

4 files changed, 102 insertions, 10 deletions

diff --git a/media-sound/jack-audio-connection-kit/ChangeLog b/media-sound/jack-audio-connection-kit/ChangeLog
index ef3e4a0e6bdc..632b90bf26d4 100644
--- a/media-sound/jack-audio-connection-kit/ChangeLog
+++ b/media-sound/jack-audio-connection-kit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/jack-audio-connection-kit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.99 2007/09/07 21:16:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.100 2007/10/08 06:07:42 tgall Exp $
+
+  08 Oct 2007; Tom Gall <tgall@gentoo.org>
+  +jack-audio-connection-kit-0.103.0-ppc64fix.patch:
+  fix for bug #195058 on ppc64
 
   07 Sep 2007; Jeroen Roovers <jer@gentoo.org>
   jack-audio-connection-kit-0.103.0.ebuild:
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index 678938957065..f9b16c62753f 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -6,6 +6,10 @@ AUX jack-audio-connection-kit-0.100.0-driver_interface.patch 374 RMD160 223cfd51
 MD5 a3265365ae4f49605813783bb1b87306 files/jack-audio-connection-kit-0.100.0-driver_interface.patch 374
 RMD160 223cfd51cf3712e4955ae25c012ed7ee5ef2a3d6 files/jack-audio-connection-kit-0.100.0-driver_interface.patch 374
 SHA256 c339bc371ce4f41aa20171c1482725591d3e0d969bb7d0bdd0f73532faca3fb6 files/jack-audio-connection-kit-0.100.0-driver_interface.patch 374
+AUX jack-audio-connection-kit-0.103.0-ppc64fix.patch 2688 RMD160 f5e56bf524078be13f5b9114e1629c5bc4d2d0ac SHA1 bd4b823c54e06debec3b93b3bf850af06b69f045 SHA256 80e12c89348728ad9dc3022d00322b030102dbe7c5bd2b300a2b45dd696afb68
+MD5 0e48ba95d2799035e4fde8cb950c9153 files/jack-audio-connection-kit-0.103.0-ppc64fix.patch 2688
+RMD160 f5e56bf524078be13f5b9114e1629c5bc4d2d0ac files/jack-audio-connection-kit-0.103.0-ppc64fix.patch 2688
+SHA256 80e12c89348728ad9dc3022d00322b030102dbe7c5bd2b300a2b45dd696afb68 files/jack-audio-connection-kit-0.103.0-ppc64fix.patch 2688
 AUX jack-audio-connection-kit-0.103.0-riceitdown.patch 1588 RMD160 9a4c86b480b580e16d407f88fc30b23fcd339efb SHA1 2e082c75e0927525f225e58e73f1a59811eb238c SHA256 4b26b1528cc9ec17bad3968af81ded11d378a5a2379a553f401c1ff2ec03a3c4
 MD5 5ed5be6d13b3df972edcd933f5569f99 files/jack-audio-connection-kit-0.103.0-riceitdown.patch 1588
 RMD160 9a4c86b480b580e16d407f88fc30b23fcd339efb files/jack-audio-connection-kit-0.103.0-riceitdown.patch 1588
@@ -48,10 +52,10 @@ EBUILD jack-audio-connection-kit-0.102.20.ebuild 4336 RMD160 52f5e652cb9c0f21d0c
 MD5 bcbae59c4d2e98c4dd75b7fa40d460a9 jack-audio-connection-kit-0.102.20.ebuild 4336
 RMD160 52f5e652cb9c0f21d0c52bbda68a0441c14a615d jack-audio-connection-kit-0.102.20.ebuild 4336
 SHA256 ac1165773f8f3b626ce985928cd7dc90d31876077ff9b0ca79af1aafa6caa220 jack-audio-connection-kit-0.102.20.ebuild 4336
-EBUILD jack-audio-connection-kit-0.103.0.ebuild 3894 RMD160 e425ede56923736d3fe0e9f1209cd90e2a493af1 SHA1 3296c3e7e9566ed5a79dd879d467a761105118c3 SHA256 99f5be990ae00d2a1516e85effc26a0af15c127c29c2aad9830e04b30b8e0ea6
-MD5 c6ceab675ec99b3a30e2dd83dd55c4ae jack-audio-connection-kit-0.103.0.ebuild 3894
-RMD160 e425ede56923736d3fe0e9f1209cd90e2a493af1 jack-audio-connection-kit-0.103.0.ebuild 3894
-SHA256 99f5be990ae00d2a1516e85effc26a0af15c127c29c2aad9830e04b30b8e0ea6 jack-audio-connection-kit-0.103.0.ebuild 3894
+EBUILD jack-audio-connection-kit-0.103.0.ebuild 3945 RMD160 142cce5778fd6780ec2b3bdbef0d786c68588fdb SHA1 15ed11c4c081a5eb7f55473540d534d4ae0de368 SHA256 5b37b039b5372f51b03d3c4baadeac9d39e9d71f2c3483c89538f8ebf97db868
+MD5 d5ea14eac93fa223d20a561598f59210 jack-audio-connection-kit-0.103.0.ebuild 3945
+RMD160 142cce5778fd6780ec2b3bdbef0d786c68588fdb jack-audio-connection-kit-0.103.0.ebuild 3945
+SHA256 5b37b039b5372f51b03d3c4baadeac9d39e9d71f2c3483c89538f8ebf97db868 jack-audio-connection-kit-0.103.0.ebuild 3945
 EBUILD jack-audio-connection-kit-0.99.0-r1.ebuild 2083 RMD160 c0b6d255195d597ee8cd140d8b19fecfae155e9b SHA1 9b7cee8fd3821be4b14b81a5e6eaac4b0babd756 SHA256 caf3b47a41f6a9c64d6f7591865d7da74f716b9e3c52a96f839a9ac6d8144aa4
 MD5 3fafe4bf68ec8637e67790cbb0b36fe6 jack-audio-connection-kit-0.99.0-r1.ebuild 2083
 RMD160 c0b6d255195d597ee8cd140d8b19fecfae155e9b jack-audio-connection-kit-0.99.0-r1.ebuild 2083
@@ -64,10 +68,10 @@ EBUILD jack-audio-connection-kit-0.99.0-r3.ebuild 2192 RMD160 0d46668b0be59361b4
 MD5 9a3e73e29899a31085a17e9191118999 jack-audio-connection-kit-0.99.0-r3.ebuild 2192
 RMD160 0d46668b0be59361b40b78570dc56793005e2046 jack-audio-connection-kit-0.99.0-r3.ebuild 2192
 SHA256 4fe298b98ee197629f11a2ad8d57a3ac4653fe0ef3e0cfe06404abbadc85ab24 jack-audio-connection-kit-0.99.0-r3.ebuild 2192
-MISC ChangeLog 19509 RMD160 ff632f10b97865176145120e250506455e51895d SHA1 d18bf93e13da95c7c87e14816a657292c3657b83 SHA256 909d82d28d5c7c63fc750c1131a72b529857462a2f917cb6a61c37007add2c8e
-MD5 4148c4a1275e553597b9a126ac6cc150 ChangeLog 19509
-RMD160 ff632f10b97865176145120e250506455e51895d ChangeLog 19509
-SHA256 909d82d28d5c7c63fc750c1131a72b529857462a2f917cb6a61c37007add2c8e ChangeLog 19509
+MISC ChangeLog 19640 RMD160 443cd481539bc9ad2d8de56202eb6bcd35d26fbd SHA1 1e5e30fb8733e4fcae302c55e7795cd7719dc654 SHA256 ee4dc3f1323c5d1e7e25789a8327f7e13d30589a701d793644314f858273882c
+MD5 885cfecad209097227d3bbf6ea4d93bd ChangeLog 19640
+RMD160 443cd481539bc9ad2d8de56202eb6bcd35d26fbd ChangeLog 19640
+SHA256 ee4dc3f1323c5d1e7e25789a8327f7e13d30589a701d793644314f858273882c ChangeLog 19640
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 MD5 f62f5a9cf5fe86389cf2bf4d85244ef5 metadata.xml 161
 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 metadata.xml 161
diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.103.0-ppc64fix.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.103.0-ppc64fix.patch
new file mode 100644
index 000000000000..f0d148413518
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.103.0-ppc64fix.patch
@@ -0,0 +1,83 @@
+--- configure.ac.orig	2007-10-08 00:19:25.000000000 -0500
++++ configure.ac	2007-10-08 00:42:19.000000000 -0500
+@@ -219,8 +219,20 @@
+ 
+ dnl ----------------------------------------------------------------------
+ 
+-                                                                                
+-if test "$target_cpu" = "powerpc"; then
++
++if test "$target_cpu" = "powerpc64" ; then
++
++    AC_ARG_ENABLE(cell,
++       [  --enable-cell           enable Cell BE support (default=no)],,
++       [ enable_cell=no ])
++
++    if test "x$enable_cell" = xyes; then
++       AC_DEFINE(ENABLE_CELLBE, 1, [Define to 1 if you need support for the Cell BE.])
++    fi
++
++fi
++
++if test "$target_cpu" = "powerpc" -o "$target_cpu" = "powerpc64" ; then
+ 
+     AC_DEFINE(POWERPC, 1, "Are we running a ppc CPU?")
+     
+@@ -252,6 +262,9 @@
+     dnl -mcpu=7450 does not reliably work with gcc 3.*
+     
+     JACK_OPT_CFLAGS="-D_REENTRANT -mcpu=7400 $ALTIVEC_OPT_FLAGS_FLAGS -mhard-float -mpowerpc-gfxopt"
++    if test "$target_cpu" = "powerpc64"; then
++        JACK_OPT_CFLAGS="-D_REENTRANT -O2 -mcpu=powerpc64 $ALTIVEC_OPT_FLAGS -mhard-float"
++    fi
+ 
+ elif echo $target_cpu | egrep '(i.86|x86_64)' >/dev/null; then
+ 
+--- config/cpu/powerpc/cycles.h.orig	2006-05-25 21:45:16.000000000 -0500
++++ config/cpu/powerpc/cycles.h	2007-10-08 00:49:03.000000000 -0500
+@@ -25,6 +25,9 @@
+ /* PowerPC */
+ 
+ #define CPU_FTR_601			0x00000100
++#ifdef __powerpc64__
++#define CPU_FTR_CELL_TB_BUG            0x0000800000000000UL
++#endif /* __powerpc64__ */
+ 
+ typedef unsigned long cycles_t;
+ 
+@@ -36,6 +39,27 @@
+ {
+ 	cycles_t ret = 0;
+ 
++#ifdef __powerpc64__
++#ifdef ENABLE_CELLBE
++	__asm__ __volatile__(                            \
++	         "90:    mftb %0;\n"                     \
++	         "97:    cmpwi %0,0;\n"                  \
++	         "       beq- 90b;\n"                    \
++	         "99:\n"                                 \
++	         ".section __ftr_fixup,\"a\"\n"          \
++	         ".align 3\n"                            \
++	         "98:\n"                                 \
++	         "       .llong %1\n"                    \
++	         "       .llong %1\n"                    \
++	         "       .llong 97b-98b\n"               \
++	         "       .llong 99b-98b\n"               \
++	         ".previous"                             \
++	         : "=r" (ret) : "i" (CPU_FTR_CELL_TB_BUG));
++
++#else /* !ENABLE_CELLBE */
++	__asm__ __volatile__("mftb %0" : "=r" (ret));
++#endif /* !ENABLE_CELLBE */
++#else
+ 	__asm__ __volatile__(
+ 		"98:	mftb %0\n"
+ 		"99:\n"
+@@ -46,6 +70,7 @@
+ 		"	.long 99b\n"
+ 		".previous"
+ 		: "=r" (ret) : "i" (CPU_FTR_601));
++#endif /* !__powerpc64__ */
+ 	return ret;
+ }
+ 
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.103.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.103.0.ebuild
index 6d8a6f5ad946..47436a4291fd 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.103.0.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.103.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.103.0.ebuild,v 1.14 2007/09/07 21:16:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.103.0.ebuild,v 1.15 2007/10/08 06:07:42 tgall Exp $
 
 inherit flag-o-matic eutils multilib linux-info autotools multilib
 
@@ -47,6 +47,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-transport.patch"
 	epatch "${FILESDIR}/${P}-riceitdown.patch"
+        epatch "${FILESDIR}/${P}-ppc64fix.patch"
 
 	eautoreconf
 }