[jack-audio-connection-kit] powerpc64 doesn't have uc_regs anymore

[Karsten Hopp]

commit 7dfaca28f51f278a6ed266c298041251fb30728d
Author: Karsten Hopp <karsten at redhat.com>
Date:   Fri Mar 11 22:15:57 2011 +0100

    powerpc64 doesn't have uc_regs anymore

 jack-audio-connection-kit-ppc-uc_regs.patch |   15 +++++++++++++++
 jack-audio-connection-kit.spec              |    6 ++++++
 2 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/jack-audio-connection-kit-ppc-uc_regs.patch b/jack-audio-connection-kit-ppc-uc_regs.patch
new file mode 100644
index 0000000..2565820
--- /dev/null
+++ b/jack-audio-connection-kit-ppc-uc_regs.patch
@@ -0,0 +1,15 @@
+diff -up jack-1.9.6/dbus/sigsegv.c.uc_regs jack-1.9.6/dbus/sigsegv.c
+--- jack-1.9.6/dbus/sigsegv.c.uc_regs	2010-08-30 10:24:16.000000000 +0000
++++ jack-1.9.6/dbus/sigsegv.c	2011-03-11 20:40:46.000000000 +0000
+@@ -101,8 +101,10 @@ static void signal_segv(int signum, sigi
+ #if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__)
+     for(i = 0; i < NGREG; i++)
+         jack_error("reg[%02d]       = 0x" REGFORMAT, i, 
+-#if defined(__powerpc__)
++#if defined(__powerpc__) && !defined(__powerpc64__)
+                 ucontext->uc_mcontext.uc_regs[i]
++#elif defined(__powerpc__) && defined(__powerpc64__)
++                ucontext->uc_mcontext.gp_regs[i]
+ #elif defined(__sparc__) && defined(__arch64__)
+                 ucontext->uc_mcontext.mc_gregs[i]
+ #else
diff --git a/jack-audio-connection-kit.spec b/jack-audio-connection-kit.spec
index fc206cc..ac341a0 100644
--- a/jack-audio-connection-kit.spec
+++ b/jack-audio-connection-kit.spec
@@ -23,6 +23,8 @@ Patch4:        jack-realtime-compat.patch
 Patch5:        jack-celt08.patch
 # compile with CELT 0.11 API
 Patch6:        jack-1.9.6-celt011.patch
+# uc_regs no longer available on ppc64
+Patch7:        jack-audio-connection-kit-ppc-uc_regs.patch 
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -85,6 +87,7 @@ Small example clients that use the Jack Audio Connection Kit.
 %if 0%{?fedora} > 14
 %patch6 -p1 -b .celt11
 %endif
+%patch7 -p1 -b .uc_regs
 
 # Fix encoding issues
 for file in ChangeLog README TODO; do
@@ -226,6 +229,9 @@ exit 0
 
 
 %changelog
+* Fri Mar 11 2011 Karsten Hopp <karsten at redhat.com> 1.9.6-6
+- powerpc64 doesn't have uc_regs anymore
+
 * Sat Feb 19 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 1.9.6-6
 - Rawhide: Patch for CELT 0.11 API change because of current broken deps.