[SCM] soundtouch/master: Drop all patches since they got merged upstream.

micove-guest at users.alioth.debian.org micove-guest at users.alioth.debian.org
Thu Jul 2 06:17:59 UTC 2015


The following commit has been merged in the master branch:
commit 5d7f677e0386135fdca352fc26e53edbfcae69e2
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Thu Jul 2 01:03:30 2015 -0400

    Drop all patches since they got merged upstream.

diff --git a/debian/patches/dont-use-integers-if-softfp.patch b/debian/patches/dont-use-integers-if-softfp.patch
deleted file mode 100644
index c1c75d7..0000000
--- a/debian/patches/dont-use-integers-if-softfp.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-
---- a/include/STTypes.h
-+++ b/include/STTypes.h
-@@ -89,13 +89,6 @@
-     /// runtime performance so recommendation is to keep this off.
-     // #define USE_MULTICH_ALWAYS
- 
--    #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/fix-fp-rounding-error.patch b/debian/patches/fix-fp-rounding-error.patch
deleted file mode 100644
index 4f98f5f..0000000
--- a/debian/patches/fix-fp-rounding-error.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Chow Loong Jin <hyperair at debian.org>
-Date: Tue, 10 Dec 2013 11:56:20 +0800
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1193667
-Subject: Fix rounding error in PeakFinder::getPeakCenter
- Avoid recalculating cutLevel and groundLevel when all of them are equal to
- peakLevel, as this can result in floating point rounding differences that can
- cause cutLevel to exceed peakLevel, resulting in an assertion error in
- PeakFinder::findCrossingLevel.
-diff --git a/source/SoundTouch/PeakFinder.cpp b/source/SoundTouch/PeakFinder.cpp
-index dbc44e7..8d7199f 100644
---- a/source/SoundTouch/PeakFinder.cpp
-+++ b/source/SoundTouch/PeakFinder.cpp
-@@ -192,11 +192,21 @@ double PeakFinder::getPeakCenter(const float *data, int peakpos) const
-     gp1 = findGround(data, peakpos, -1);
-     gp2 = findGround(data, peakpos, 1);
- 
--    groundLevel = 0.5f * (data[gp1] + data[gp2]);
-     peakLevel = data[peakpos];
- 
--    // calculate 70%-level of the peak
--    cutLevel = 0.70f * peakLevel + 0.30f * groundLevel;
-+    if (gp1 == gp2) {
-+        // avoid rounding errors when all are equal
-+        assert(gp1 == peakpos);
-+
-+        cutLevel = groundLevel = peakLevel;
-+    } else {
-+        // get average of the ground levels
-+        groundLevel = 0.5f * (data[gp1] + data[gp2]);
-+
-+        // calculate 70%-level of the peak
-+        cutLevel = 0.70f * peakLevel + 0.30f * groundLevel;
-+    }
-+
-     // find mid-level crossings
-     crosspos1 = findCrossingLevel(data, cutLevel, peakpos, -1);
-     crosspos2 = findCrossingLevel(data, cutLevel, peakpos, 1);
--- 
-1.8.3.2
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5b8f59f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-dont-use-integers-if-softfp.patch
-fix-fp-rounding-error.patch

-- 
soundtouch packaging



More information about the pkg-multimedia-commits mailing list