[jack-audio-connection-kit] Fix ppc64 mpd issue RHBZ#799552

Orcan Ogetbil oget at fedoraproject.org
Sat Mar 3 04:33:40 UTC 2012


commit 7e2e4a4e5616e8ca8ab008824d8b41f5eef8bfe1
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Fri Mar 2 23:33:35 2012 -0500

    Fix ppc64 mpd issue RHBZ#799552

 jack-audio-connection-kit.spec |    8 +++++++-
 jack-ppc64-long.patch          |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/jack-audio-connection-kit.spec b/jack-audio-connection-kit.spec
index 666ad0c..32dfb23 100644
--- a/jack-audio-connection-kit.spec
+++ b/jack-audio-connection-kit.spec
@@ -4,7 +4,7 @@
 Summary:       The Jack Audio Connection Kit
 Name:          jack-audio-connection-kit
 Version:       1.9.8
-Release:       4%{?dist}
+Release:       5%{?dist}
 # The entire source (~500 files) is a mixture of these three licenses
 License:       GPLv2 and GPLv2+ and LGPLv2+
 Group:         System Environment/Daemons
@@ -20,6 +20,8 @@ Patch1:        jack-doxygen-output-dir-fix.patch
 # We don't want the internal API documentation
 Patch2:        jack-apidoc-only.patch
 Patch4:        jack-realtime-compat.patch
+# Fix ppc64 mpd startup issue RHBZ#799552
+Patch6:        jack-ppc64-long.patch
 # uc_regs no longer available on ppc64
 Patch7:        jack-audio-connection-kit-ppc-uc_regs.patch 
 
@@ -89,6 +91,7 @@ pushd jack-%{version}
 %patch1 -p1 -b .outdir
 %patch2 -p1 -b .nointernalapi
 %patch4 -p1
+%patch6 -p1 -b .mpd
 %patch7 -p1 -b .uc_regs
 
 # Fix encoding issues
@@ -249,6 +252,9 @@ exit 0
 
 
 %changelog
+* Fri Mar 02 2012 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.9.8-5
+- Fix ppc64 mpd issue RHBZ#799552
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.8-4
 - Rebuilt for c++ ABI breakage
 
diff --git a/jack-ppc64-long.patch b/jack-ppc64-long.patch
new file mode 100644
index 0000000..cc7248b
--- /dev/null
+++ b/jack-ppc64-long.patch
@@ -0,0 +1,32 @@
+diff -up jack-1.9.8/linux/cycles.h\~ jack-1.9.8/linux/cycles.h
+--- jack-1.9.8/linux/cycles.h~	2011-12-19 12:54:27.000000000 +0100
++++ jack-1.9.8/linux/cycles.h	2012-03-02 23:57:29.200812059 +0100
+@@ -77,16 +77,24 @@ static inline cycles_t get_cycles(void)
+ {
+     cycles_t ret = 0;
+ 
++#ifdef __powerpc64__
++# define LONGT ".llong"
++#else
++# define LONGT ".long"
++#endif
++
+     __asm__ __volatile__(
+         "98:	mftb %0\n"
+         "99:\n"
+         ".section __ftr_fixup,\"a\"\n"
+         "	.long %1\n"
+         "	.long 0\n"
+-        "	.long 98b\n"
+-        "	.long 99b\n"
++        "	" LONGT " 98b\n"
++        "	" LONGT " 99b\n"
+         ".previous"
+     : "=r" (ret) : "i" (CPU_FTR_601));
++
++#undef LONGT
+     return ret;
+ }
+ 
+
+Diff finished.  Fri Mar  2 23:57:31 2012


More information about the scm-commits mailing list