[SCM] soundtouch/master: Remove 04_remove_asm.patch since 02_remove_sse.patch already does this.
micove-guest at users.alioth.debian.org
micove-guest at users.alioth.debian.org
Sun Mar 6 13:33:40 UTC 2011
The following commit has been merged in the master branch:
commit 2e93f5ae00262ead2c0021dba9d71321e44de4eb
Author: Miguel Colon <debian.micove at gmail.com>
Date: Sun Mar 6 08:17:23 2011 -0500
Remove 04_remove_asm.patch since 02_remove_sse.patch already does this.
cpu_detect_x86_gcc.cpp only gets compiled by gcc so !(__GNUC__) is always
false but 02_remove_sse.patch makes !(ALLOW_X86_OPTIMIZATIONS) always true.
diff --git a/debian/patches/04_remove_asm.patch b/debian/patches/04_remove_asm.patch
deleted file mode 100644
index 5b14dc9..0000000
--- a/debian/patches/04_remove_asm.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Disabled assembler code.
- Some fixes committed upstream since 2004. Next version (1.5.1) fixes new issues
- so keep disabled for now.
-Forwarded: no
-Bug-Debian: http://bugs.debian.org/267986
-Last-Update: 2010-12-26
---- a/source/SoundTouch/cpu_detect_x86_gcc.cpp
-+++ b/source/SoundTouch/cpu_detect_x86_gcc.cpp
-@@ -68,7 +68,7 @@
- /// Checks which instruction set extensions are supported by the CPU.
- uint detectCPUextensions(void)
- {
--#if (!(ALLOW_X86_OPTIMIZATIONS) || !(__GNUC__))
-+#if 1 // (!(ALLOW_X86_OPTIMIZATIONS) || !(__GNUC__))
-
- return 0; // always disable extensions on non-x86 platforms.
-
diff --git a/debian/patches/series b/debian/patches/series
index 9fc5674..824f612 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
01_upstream_fixes.patch
02_remove_sse.patch
-04_remove_asm.patch
08_nostrip.patch
09_WavFile.patch
--
soundtouch packaging
More information about the pkg-multimedia-commits
mailing list