[SCM] Debian packaging for jack-audio-connection-kit branch, master, updated. debian/1.9.5.dfsg-3-8-g416c970

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Sun May 2 22:18:10 UTC 2010


The following commit has been merged in the master branch:
commit 3fd0cecf3110807a4ed6893ee92305a39ee02ad9
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Sun May 2 23:45:02 2010 +0200

    No get_cycles on everything but the known platforms.
    
    Provide a quick and dirty workaround and forward everything to upstream.

diff --git a/debian/patches/get_cycles b/debian/patches/get_cycles
new file mode 100644
index 0000000..6be5933
--- /dev/null
+++ b/debian/patches/get_cycles
@@ -0,0 +1,23 @@
+--- a/linux/cycles.h
++++ b/linux/cycles.h
+@@ -103,6 +103,20 @@
+ 
+ #endif
+ 
++/* everything else but x86, amd64 or ppc */
++#if !defined (__PPC__) && !defined (__x86_64__) && !defined (__i386__)
++
++#warning No suitable get_cycles() implementation. Returning 0 instead
++
++typedef unsigned long long cycles_t;
++
++static inline cycles_t get_cycles(void)
++{
++    return 0;
++}
++
++#endif
++
+ #endif
+ 
+ #endif /* __jack_cycles_h__ */
diff --git a/debian/patches/series b/debian/patches/series
index 14df1a4..a8b0be5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 0000_sync_upstream_VCS.patch
 atomic
+get_cycles
 0001_jackrec-rename.patch
 0002_manpages.patch
 1001_connect.patch

-- 
Debian packaging for jack-audio-connection-kit



More information about the pkg-multimedia-commits mailing list