[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 4804795d5a82f1485c23a13ef9acd32d673f108b
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Sun Aug 1 19:44:36 2010 +0200

    Fix broken ifdef ordering in linux/cycles.h
    
    Upstream got it wrong, so we have to manually fix it for now.
    I'm going to forward it.

diff --git a/debian/patches/series b/debian/patches/series
index cb58b1d..cfc288b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 hppa-parallel.patch
 0001_jackrec-rename.patch
 1001_connect.patch
+sparc-kfreebsd.patch
diff --git a/debian/patches/sparc-kfreebsd.patch b/debian/patches/sparc-kfreebsd.patch
new file mode 100644
index 0000000..c7dd149
--- /dev/null
+++ b/debian/patches/sparc-kfreebsd.patch
@@ -0,0 +1,68 @@
+--- a/linux/cycles.h
++++ b/linux/cycles.h
+@@ -51,7 +51,7 @@
+     return (((unsigned long)hi)<<32) | ((unsigned long)lo);
+ }
+ 
+-#endif
++#endif /* __x86_64__ */
+ 
+ #ifdef __sparc_v9__
+ /* rd is V9 only */
+@@ -61,7 +61,7 @@
+ 	__asm__ __volatile__("rd %%tick, %0" : "=r"(res));
+ 	return res;
+ }
+-#endif
++#endif /* __sparc_v9__ */
+ 
+ #ifdef __PPC__
+ 
+@@ -92,7 +92,7 @@
+     return ret;
+ }
+ 
+-#endif
++#endif /* __PPC__ */
+ 
+ #ifdef __i386__
+ 
+@@ -111,9 +111,10 @@
+     return ret;
+ }
+ 
+-#endif
++#endif /* __i386__ */
+ 
+-#if defined(__FreeBSD_kernel__)
++/* everything else but x86, amd64 or ppc */
++#if !defined (__PPC__) && !defined (__x86_64__) && !defined (__i386__)
+ 
+ #warning No suitable get_cycles() implementation. Returning 0 instead
+ 
+@@ -124,10 +125,12 @@
+     return 0;
+ }
+ 
+-#endif
++#endif /* everything else but x86, amd64 or ppc */
+ 
+-/* everything else but x86, amd64 or ppc */
+-#if !defined (__PPC__) && !defined (__x86_64__) && !defined (__i386__)
++#endif /* __linux__ */
++
++
++#if defined(__FreeBSD_kernel__)
+ 
+ #warning No suitable get_cycles() implementation. Returning 0 instead
+ 
+@@ -138,8 +141,7 @@
+     return 0;
+ }
+ 
+-#endif
++#endif /* __FreeBSD_kernel__ */
+ 
+-#endif
+ 
+ #endif /* __jack_cycles_h__ */

-- 
jackd2 packaging