[SCM] soundtouch/master: Revert ABI breakage on armel

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 762316711d4ffcb71e9e1f26144ed1ef1a009c95
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Sep 21 01:02:38 2013 +0200

    Revert ABI breakage on armel

diff --git a/debian/patches/dont-use-integers-if-softfp.patch b/debian/patches/dont-use-integers-if-softfp.patch
new file mode 100644
index 0000000..f30494b
--- /dev/null
+++ b/debian/patches/dont-use-integers-if-softfp.patch
@@ -0,0 +1,25 @@
+Description: Do not use integer samples when __SOFTFP__ is defined
+ On armel __SOFTFP__ is defined. Hence in 1.7.1 SAMPLETYPE changed from float to
+ short. Unfortunately, this changes some function signatures and thus breaks the
+ ABI.
+Author: Sebastian Ramacher <sramacher at debian.org>
+Bug-Debian: http://bugs.debian.org/723681
+Forwarded: not-needed
+Last-Update: 2013-09-19
+
+--- soundtouch-1.7.1.orig/include/STTypes.h
++++ soundtouch-1.7.1/include/STTypes.h
+@@ -78,13 +78,6 @@ namespace soundtouch
+     //#undef SOUNDTOUCH_INTEGER_SAMPLES
+     //#undef SOUNDTOUCH_FLOAT_SAMPLES
+ 
+-    #if (defined(__SOFTFP__))
+-        // For Android compilation: Force use of Integer samples in case that
+-        // compilation uses soft-floating point emulation - soft-fp is way too slow
+-        #undef  SOUNDTOUCH_FLOAT_SAMPLES
+-        #define SOUNDTOUCH_INTEGER_SAMPLES      1
+-    #endif
+-
+     #if !(SOUNDTOUCH_INTEGER_SAMPLES || SOUNDTOUCH_FLOAT_SAMPLES)
+        
+         /// Choose either 32bit floating point or 16bit integer sampletype
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2ec919f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+dont-use-integers-if-softfp.patch

-- 
soundtouch packaging