[SCM] jackd2 packaging branch, master, updated. debian/1.9.5.dfsg-17-12-gb6dcecd

[adiknoth-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 43bc7546ec79070b47061b3154d161f212a98979
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Sun Aug 1 20:02:10 2010 +0200

    Fix sparcv9 get_cycles() fix.
    
    Obviously, I forgot to exclude the newly provided sparcv9 target from
    the generic get_cycles() fallback.

diff --git a/debian/patches/sparc-kfreebsd.patch b/debian/patches/sparc-kfreebsd.patch
index c7dd149..2438062 100644
--- a/debian/patches/sparc-kfreebsd.patch
+++ b/debian/patches/sparc-kfreebsd.patch
@@ -35,8 +35,8 @@
 +#endif /* __i386__ */
  
 -#if defined(__FreeBSD_kernel__)
-+/* everything else but x86, amd64 or ppc */
-+#if !defined (__PPC__) && !defined (__x86_64__) && !defined (__i386__)
++/* everything else but x86, amd64, sparcv9 or ppc */
++#if !defined (__PPC__) && !defined (__x86_64__) && !defined (__i386__) && !defined (__sparc_v9__)
  
  #warning No suitable get_cycles() implementation. Returning 0 instead
  
@@ -45,12 +45,12 @@
  }
  
 -#endif
-+#endif /* everything else but x86, amd64 or ppc */
++#endif /* everything else but x86, amd64, sparcv9 or ppc */
++
++#endif /* __linux__ */
  
 -/* everything else but x86, amd64 or ppc */
 -#if !defined (__PPC__) && !defined (__x86_64__) && !defined (__i386__)
-+#endif /* __linux__ */
-+
 +
 +#if defined(__FreeBSD_kernel__)
  

-- 
jackd2 packaging